diff --git a/Readme.md b/Readme.md
index 3b73e0f..dd4e65f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -91,7 +91,7 @@ The following options were not available in the original Solarized:
   Solarized's cursor style (default: `0`). By default, the cursor is orange/red
   in light themes, and blue in dark themes (but please note that your terminal
   may override the cursor's color).
-- `g:solarized_enable_extra_hi_groups`: set to `1` to enable Solarized
+- `g:solarized_extra_hi_groups`: set to `1` to enable Solarized
   filetype-specific syntax highlighting groups (default is `0`). Please be aware
   that there is [a long standing
   issue](https://github.com/altercation/solarized/issues/102) with extra
diff --git a/colors/solarized8.vim b/colors/solarized8.vim
index b1640df..fd9e2e7 100644
--- a/colors/solarized8.vim
+++ b/colors/solarized8.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sat Nov 11 14:16:08 2017
+" Last Updated: Sat Nov 11 14:26:08 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -175,7 +175,7 @@ if !get(g:, 'solarized_use16', 0)
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-    if get(g:, 'solarized_enable_extra_hi_groups', 0)
+    if get(g:, 'solarized_extra_hi_groups', 0)
       hi! link vimVar Identifier
       hi! link vimFunc Function
       hi! link vimUserFunc Function
@@ -550,7 +550,7 @@ if !get(g:, 'solarized_use16', 0)
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -897,7 +897,7 @@ if &background ==# 'dark'
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -1254,7 +1254,7 @@ hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-if get(g:, 'solarized_enable_extra_hi_groups', 0)
+if get(g:, 'solarized_extra_hi_groups', 0)
   hi! link vimVar Identifier
   hi! link vimFunc Function
   hi! link vimUserFunc Function
diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim
index dfa182f..5b86c8e 100644
--- a/colors/solarized8_flat.vim
+++ b/colors/solarized8_flat.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sat Nov 11 14:16:11 2017
+" Last Updated: Sat Nov 11 14:26:11 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -169,7 +169,7 @@ if !get(g:, 'solarized_use16', 0)
     hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi! link lCursor Cursor
     hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
-    if get(g:, 'solarized_enable_extra_hi_groups', 0)
+    if get(g:, 'solarized_extra_hi_groups', 0)
       hi! link vimVar Identifier
       hi! link vimFunc Function
       hi! link vimUserFunc Function
@@ -538,7 +538,7 @@ if !get(g:, 'solarized_use16', 0)
   hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -879,7 +879,7 @@ if &background ==# 'dark'
   hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -1230,7 +1230,7 @@ hi! link Typedef Type
 hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
 hi! link lCursor Cursor
 hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
-if get(g:, 'solarized_enable_extra_hi_groups', 0)
+if get(g:, 'solarized_extra_hi_groups', 0)
   hi! link vimVar Identifier
   hi! link vimFunc Function
   hi! link vimUserFunc Function
diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim
index e04bf21..f8ab0f5 100644
--- a/colors/solarized8_high.vim
+++ b/colors/solarized8_high.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sat Nov 11 14:16:15 2017
+" Last Updated: Sat Nov 11 14:26:16 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -175,7 +175,7 @@ if !get(g:, 'solarized_use16', 0)
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-    if get(g:, 'solarized_enable_extra_hi_groups', 0)
+    if get(g:, 'solarized_extra_hi_groups', 0)
       hi! link vimVar Identifier
       hi! link vimFunc Function
       hi! link vimUserFunc Function
@@ -550,7 +550,7 @@ if !get(g:, 'solarized_use16', 0)
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -897,7 +897,7 @@ if &background ==# 'dark'
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -1254,7 +1254,7 @@ hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-if get(g:, 'solarized_enable_extra_hi_groups', 0)
+if get(g:, 'solarized_extra_hi_groups', 0)
   hi! link vimVar Identifier
   hi! link vimFunc Function
   hi! link vimUserFunc Function
diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim
index ff8741b..f823aff 100644
--- a/colors/solarized8_low.vim
+++ b/colors/solarized8_low.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sat Nov 11 14:16:18 2017
+" Last Updated: Sat Nov 11 14:26:20 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -175,7 +175,7 @@ if !get(g:, 'solarized_use16', 0)
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-    if get(g:, 'solarized_enable_extra_hi_groups', 0)
+    if get(g:, 'solarized_extra_hi_groups', 0)
       hi! link vimVar Identifier
       hi! link vimFunc Function
       hi! link vimUserFunc Function
@@ -550,7 +550,7 @@ if !get(g:, 'solarized_use16', 0)
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=162 ctermbg=230 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -897,7 +897,7 @@ if &background ==# 'dark'
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-  if get(g:, 'solarized_enable_extra_hi_groups', 0)
+  if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
     hi! link vimUserFunc Function
@@ -1254,7 +1254,7 @@ hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi VisualMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi CommandMode ctermfg=5 ctermbg=15 guifg=#d33682 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
-if get(g:, 'solarized_enable_extra_hi_groups', 0)
+if get(g:, 'solarized_extra_hi_groups', 0)
   hi! link vimVar Identifier
   hi! link vimFunc Function
   hi! link vimUserFunc Function
diff --git a/templates/_extra.colortemplate b/templates/_extra.colortemplate
index b64a480..fdd5f49 100644
--- a/templates/_extra.colortemplate
+++ b/templates/_extra.colortemplate
@@ -1,7 +1,7 @@
 # vim: ft=colortemplate fdm=marker
 # Filetype specific highlight groups {{{
 verbatim
-if get(g:, '@optionprefix_enable_extra_hi_groups', 0)
+if get(g:, '@optionprefix_extra_hi_groups', 0)
 endverbatim
 # vim {{{
 vimVar            -> Identifier