diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bddfa99211786b..d50cb81205ebb9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2221,7 +2221,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'completefuzzycollect'* *'cfc'*
 'completefuzzycollect' 'cfc'	string	(default: empty)
 				global
-	DEPRECATED: This option is no longer used; changing it has no effect.
+	DEPRECATED: This option is no longer used.  Setting it will give an
+	error.  Use 'completeopt' instead.
 	When 'completeopt' contains "fuzzy", Vim will internally use the
 	equivalent of:
 		"keyword,files,whole_line"
@@ -10302,19 +10303,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'wincolor'* *'wcr'*
 'wincolor' 'wcr' string (default empty)
 			local to window
-	DEPRECATED: Use 'winhighlight' if possible, this option uses
-	'winhighlight' internally by setting it to: >vim
-	    set winhighlight=!(:HighlightGroup
-<	If this option is set and 'winhighlight' is changed, then it will not
-	update the option value.  For example, if 'wincolor' is set to "A" and
-	then 'winhighlight' is to an empty value, then 'wincolor' will still
-	remain as "A".  Additionally, the existing value in 'winhighlight' will
-	be discarded when this option is set.
-
-	Highlight group name to use for this window instead of the Normal
-	color |hl-Normal|.  For other |highlight-groups|, see 'winhighlight'.
-	Note that it is not recommended to set this and 'winhighlight' at the
-	same time.
+	DEPRECATED: Setting this option will give an error.
+	Use 'winhighlight' instead.  For example: >vim
+	    set winhighlight=Normal:MyHighlightGroup
+<
 
 						*'window'* *'wi'*
 'window' 'wi'		number  (default screen height - 1)
diff --git a/src/errors.h b/src/errors.h
index d780fb4207ea6d..7896133d0f4fc3 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3810,3 +3810,5 @@ EXTERN char e_cannot_listen_on_port[]
 EXTERN char e_gethostbyname_in_channel_listen[]
 	INIT(= N_("E1574: gethostbyname(): cannot resolve hostname in channel_listen()"));
 #endif
+EXTERN char e_option_is_deprecated_use_str_instead[]
+	INIT(= N_("E1575: Option is deprecated, use '%s' instead"));
diff --git a/src/optionstr.c b/src/optionstr.c
index 8fefcb035326c0..e368cd3732402a 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1791,11 +1791,19 @@ expand_set_completeopt(optexpand_T *args, int *numMatches, char_u ***matches)
  * The 'completefuzzycollect' option is changed.
  */
     char *
-did_set_completefuzzycollect(optset_T *args UNUSED)
+did_set_completefuzzycollect(optset_T *args)
 {
-    if (opt_strings_flags(p_cfc, p_cfc_values, &cfc_flags, TRUE) != OK)
-	return e_invalid_argument;
-    return NULL;
+    char_u **varp = (char_u **)args->os_varp;
+
+    // Allow setting to empty (resetting).
+    if (*varp == NULL || **varp == NUL)
+	return NULL;
+
+    // This option is deprecated.  Return error; the caller will restore
+    // the old value.
+    vim_snprintf(args->os_errbuf, args->os_errbuflen,
+	    _(e_option_is_deprecated_use_str_instead), "completeopt");
+    return args->os_errbuf;
 }
 
     int
@@ -5083,10 +5091,22 @@ expand_set_winaltkeys(optexpand_T *args, int *numMatches, char_u ***matches)
  * The 'wincolor' option is changed.
  */
     char *
-did_set_wincolor(optset_T *args UNUSED)
+did_set_wincolor(optset_T *args)
 {
-    update_wincolor(curwin, args->os_newval.string);
-    return NULL;
+    char_u **varp = (char_u **)args->os_varp;
+
+    // Allow setting to empty (resetting).
+    if (*varp == NULL || **varp == NUL)
+    {
+	update_wincolor(curwin, *varp);
+	return NULL;
+    }
+
+    // This option is deprecated.  Return error; the caller will restore
+    // the old value.
+    vim_snprintf(args->os_errbuf, args->os_errbuflen,
+	    _(e_option_is_deprecated_use_str_instead), "winhighlight");
+    return args->os_errbuf;
 }
 
 /*
diff --git a/src/testdir/dumps/Test_conceal_cul_wcr_02.dump b/src/testdir/dumps/Test_conceal_cul_wcr_02.dump
index 668e1af84fbb36..b51e3f8356ef8b 100644
--- a/src/testdir/dumps/Test_conceal_cul_wcr_02.dump
+++ b/src/testdir/dumps/Test_conceal_cul_wcr_02.dump
@@ -1,4 +1,4 @@
 |o+8#ffffff16#e000002|n|e| |o|n|e| |o|n|e| @1|o|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n>e| @7
 @1|o|n|e| |o|n|e| |o|n|e| @27
 |~+0#4040ff13&| @38
-|:+0#0000000#ffffff0|s|e|t| |w|i|n|c|o|l|o|r|=|E|r@1|o|r|M|s|g|1|,|4|0| @9|A|l@1| 
+|:+0#0000000#ffffff0|s|e|t| |w|i|n|h|i|g|h|l|i|g|h|t|=|N|o|r|m|1|,|4|0| @9|A|l@1| 
diff --git a/src/testdir/dumps/Test_conceal_cul_wcr_rl_02.dump b/src/testdir/dumps/Test_conceal_cul_wcr_rl_02.dump
index 21809e9408975a..4fdfb9503a5bda 100644
--- a/src/testdir/dumps/Test_conceal_cul_wcr_rl_02.dump
+++ b/src/testdir/dumps/Test_conceal_cul_wcr_rl_02.dump
@@ -1,4 +1,4 @@
 | +8#ffffff16#e000002@7>e|n|o| |e|n|o| |e|n|o| |e|n|o| |e|n|o| @1|e|n|o| |e|n|o| |e|n|o
 | @27|e|n|o| |e|n|o| |e|n|o| 
 | +0#4040ff13&@38|~
-|:+0#0000000#ffffff0|s|e|t| |w|i|n|c|o|l|o|r|=|E|r@1|o|r|M|s|g|1|,|4|0| @9|A|l@1| 
+|:+0#0000000#ffffff0|s|e|t| |w|i|n|h|i|g|h|l|i|g|h|t|=|N|o|r|m|1|,|4|0| @9|A|l@1| 
diff --git a/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol.dump b/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol.dump
index 3633ffe5401e27..229e1e0ded0405 100644
--- a/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol.dump
+++ b/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol.dump
@@ -12,4 +12,4 @@
 | +0#00e0003#5fd7ff255@36||+1#0000000#ffffff0|1+0&&@1| @34
 | +0#00e0003#5fd7ff255@36||+1#0000000#ffffff0|1+0&&|2| @34
 |!+0#ffffff16#00e0003|c|a|t| |[|r|u|n@1|i|n|g|]| @23|[+1#0000000#ffffff0|N|o| |N|a|m|e|]| |[|+|]| @23
-|:+0&&|s|e|t| |w|i|n|c|o|l|o|r|=|M|y|W|i|n|C|o|l| @52
+|:+0&&|s|e|t| |w|i|n|h|i|g|h|l|i|g|h|t|=|N|o|r|m|a|l|:|M|y|W|i|n|C|o|l| @41
diff --git a/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol2.dump b/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol2.dump
index ce69e3b4dfbef4..1caa09ca64fb3c 100644
--- a/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol2.dump
+++ b/src/testdir/dumps/Test_terminal_wincolor_split_MyWinCol2.dump
@@ -12,4 +12,4 @@
 | +0#00e0003#5fd7ff255@36||+1#0000000#ffffff0|4+0&&| @35
 | +0#00e0003#5fd7ff255@36||+1#0000000#ffffff0|5+0&&| @35
 |!+0#ffffff16#00e0003|c|a|t| |[|r|u|n@1|i|n|g|]| @23|[+1#0000000#ffffff0|N|o| |N|a|m|e|]| |[|+|]| @23
-|:+0&&|s|e|t| |w|i|n|c|o|l|o|r|=|M|y|W|i|n|C|o|l|2| @51
+|:+0&&|s|e|t| |w|i|n|h|i|g|h|l|i|g|h|t|=|N|o|r|m|a|l|:|M|y|W|i|n|C|o|l|2| @40
diff --git a/src/testdir/test_conceal.vim b/src/testdir/test_conceal.vim
index 360e600b472bc7..de26f6a7325b2a 100644
--- a/src/testdir/test_conceal.vim
+++ b/src/testdir/test_conceal.vim
@@ -169,9 +169,9 @@ func Test_conceal_with_cursorcolumn()
   call StopVimInTerminal(buf)
 endfunc
 
-" Check that 'cursorline' and 'wincolor' apply to the whole line in presence
+" Check that 'cursorline' and 'winhighlight' apply to the whole line in presence
 " of wrapped lines containing concealed text.
-func Test_conceal_wrapped_cursorline_wincolor()
+func Test_conceal_wrapped_cursorline_winhighlight()
   CheckScreendump
 
   let code =<< trim [CODE]
@@ -185,7 +185,7 @@ func Test_conceal_wrapped_cursorline_wincolor()
   let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr', {'rows': 4, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_01', {})
 
-  call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
+  call term_sendkeys(buf, ":set winhighlight=Normal:ErrorMsg\n")
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_02', {})
 
   call term_sendkeys(buf, ":set nocursorline\n")
@@ -195,8 +195,8 @@ func Test_conceal_wrapped_cursorline_wincolor()
   call StopVimInTerminal(buf)
 endfunc
 
-" Same as Test_conceal_wrapped_cursorline_wincolor(), but with 'rightleft'.
-func Test_conceal_wrapped_cursorline_wincolor_rightleft()
+" Same as Test_conceal_wrapped_cursorline_winhighlight(), but with 'rightleft'.
+func Test_conceal_wrapped_cursorline_winhighlight_rightleft()
   CheckFeature rightleft
   CheckScreendump
 
@@ -211,7 +211,7 @@ func Test_conceal_wrapped_cursorline_wincolor_rightleft()
   let buf = RunVimInTerminal('-S XTest_conceal_cul_wcr_rl', {'rows': 4, 'cols': 40})
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_01', {})
 
-  call term_sendkeys(buf, ":set wincolor=ErrorMsg\n")
+  call term_sendkeys(buf, ":set winhighlight=Normal:ErrorMsg\n")
   call VerifyScreenDump(buf, 'Test_conceal_cul_wcr_rl_02', {})
 
   call term_sendkeys(buf, ":set nocursorline\n")
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 0cb6b5b102039f..eb98c51109f998 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -646,7 +646,7 @@ func Test_cursorcolumn_callback()
   call StopVimInTerminal(buf)
 endfunc
 
-func Test_wincolor()
+func Test_winhighlight()
   CheckScreendump
   " make sure the width is enough for the test
   set columns=80
@@ -654,7 +654,7 @@ func Test_wincolor()
   let lines =<< trim END
 	set cursorline cursorcolumn rnu
 	call setline(1, ["","1111111111","22222222222","3 here 3","","the cat is out of the bag"])
-	set wincolor=Pmenu
+	set winhighlight=Normal:Pmenu
 	hi CatLine guifg=green ctermfg=green
 	hi Reverse gui=reverse cterm=reverse
 	syn match CatLine /^the.*/
@@ -675,13 +675,13 @@ func Test_wincolor()
   call StopVimInTerminal(buf)
 endfunc
 
-func Test_wincolor_listchars()
+func Test_winhighlight_listchars()
   CheckScreendump
   CheckFeature conceal
 
   let lines =<< trim END
 	call setline(1, ["one","\t\tsome random text enough long to show 'extends' and 'precedes' includingnbsps, preceding tabs and trailing spaces    ","three"])
-	set wincolor=Todo
+	set winhighlight=Normal:Todo
 	set nowrap cole=1 cocu+=n
 	set list lcs=eol:$,tab:>-,space:.,trail:_,extends:>,precedes:<,conceal:*,nbsp:#
 	call matchadd('Conceal', 'text')
@@ -1355,8 +1355,8 @@ func Test_hlset()
   call assert_true(hlget('hlg11')[0].cleared)
 endfunc
 
-" Test for the 'winhighlight' option
-func Test_winhighlight()
+" Test for the 'winhighlight' option with Normal highlight
+func Test_winhighlight_normal()
   CheckScreendump
 
   let lines =<< trim END
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 8097a3f04a4039..cf4f2c4af96778 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -540,7 +540,7 @@ func Test_set_completion_string_values()
   endif
   call assert_equal('.', getcompletion('set complete=', 'cmdline')[1])
   call assert_equal('menu', getcompletion('set completeopt=', 'cmdline')[1])
-  call assert_equal('keyword', getcompletion('set completefuzzycollect=', 'cmdline')[0])
+  call assert_fails("set completefuzzycollect=keyword", 'E1575:')
   if exists('+completeslash')
     call assert_equal('backslash', getcompletion('set completeslash=', 'cmdline')[1])
   endif
@@ -621,7 +621,7 @@ func Test_set_completion_string_values()
   call assert_equal(['WinLeave', 'WinResized', 'WinScrolled'], getcompletion('set eiw=', 'cmdline')[-3:-1])
   call assert_equal('latin1', getcompletion('set fileencodings=', 'cmdline')[1])
   call assert_equal('top', getcompletion('set printoptions=', 'cmdline')[0])
-  call assert_equal('SpecialKey', getcompletion('set wincolor=', 'cmdline')[0])
+  call assert_fails("set wincolor=SpecialKey", 'E1575:')
 
   call assert_equal('SpecialKey', getcompletion('set winhighlight=', 'cmdline')[0])
   call assert_equal('SpecialKey', getcompletion('set winhighlight=SpecialKey:', 'cmdline')[0])
@@ -1279,7 +1279,7 @@ def Test_split_copy_options()
     ['scrollbind', true, false],
     ['smoothscroll', true, false],
     ['virtualedit', '"block"', '"' .. &virtualedit .. '"'],
-    ['wincolor', '"Search"', '"' .. &wincolor .. '"'],
+    ['winhighlight', '"Normal:Search"', '"' .. &winhighlight .. '"'],
     ['wrap', false, true],
   ]
   if has('linebreak')
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 41cd6f0d0f76b2..af82ba8bd5f9d9 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -16,7 +16,7 @@ func Test_simple_popup()
 	call prop_type_add('comment', #{highlight: 'Comment'})
 	let winid = popup_create('hello there', #{line: 3, col: 11, minwidth: 20, highlight: 'PopupColor1'})
 	let winid2 = popup_create(['another one', 'another two', 'another three'], #{line: 3, col: 25, minwidth: 20})
-	call setwinvar(winid2, '&wincolor', 'PopupColor2')
+	call setwinvar(winid2, '&winhighlight', 'Normal:PopupColor2')
   END
   call writefile(lines, 'XtestPopup', 'D')
   let buf = RunVimInTerminal('-S XtestPopup', #{rows: 10})
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index 7cf727e49cd643..d9c862b3dbbf7c 100644
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -114,11 +114,11 @@ func Test_terminal_color_group()
   \ ], "term_highlight: 'MyTermCol',", [])
 endfunc
 
-func Test_terminal_color_wincolor()
+func Test_terminal_color_winhighlight()
   call Terminal_color("MyWinCol", [
   \ "highlight MyWinCol ctermfg=red ctermbg=darkyellow",
   \ ], "", [
-  \ 'set wincolor=MyWinCol',
+  \ 'set winhighlight=Normal:MyWinCol',
   \ ])
 endfunc
 
@@ -129,16 +129,16 @@ func Test_terminal_color_group_over_Terminal()
   \ ], "term_highlight: 'MyTermCol',", [])
 endfunc
 
-func Test_terminal_color_wincolor_over_group()
+func Test_terminal_color_winhighlight_over_group()
   call Terminal_color("MyWinCol_over_group", [
   \ "highlight MyTermCol ctermfg=darkgreen ctermbg=lightblue",
   \ "highlight MyWinCol ctermfg=red ctermbg=darkyellow",
   \ ], "term_highlight: 'MyTermCol',", [
-  \ 'set wincolor=MyWinCol',
+  \ 'set winhighlight=Normal:MyWinCol',
   \ ])
 endfunc
 
-func Test_terminal_color_wincolor_split()
+func Test_terminal_color_winhighlight_split()
   CheckScreendump
   CheckRunVimInTerminal
   CheckUnix
@@ -162,11 +162,11 @@ func Test_terminal_color_wincolor_split()
   call TermWait(buf, 50)
 
   call term_sendkeys(buf, "\<C-W>:split\<CR>")
-  call term_sendkeys(buf, "\<C-W>:set wincolor=MyWinCol\<CR>")
+  call term_sendkeys(buf, "\<C-W>:set winhighlight=Normal:MyWinCol\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_wincolor_split_MyWinCol', {})
 
   call term_sendkeys(buf, "\<C-W>b:2sb\<CR>")
-  call term_sendkeys(buf, "\<C-W>:set wincolor=MyWinCol2\<CR>")
+  call term_sendkeys(buf, "\<C-W>:set winhighlight=Normal:MyWinCol2\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_wincolor_split_MyWinCol2', {})
 
   call term_sendkeys(buf, "\<C-D>")
@@ -186,11 +186,11 @@ func Test_terminal_color_transp_group()
   \ ], "term_highlight: 'MyTermCol',", [])
 endfunc
 
-func Test_terminal_color_transp_wincolor()
+func Test_terminal_color_transp_winhighlight()
   call Terminal_color("transp_MyWinCol", [
   \ "highlight MyWinCol ctermfg=red",
   \ ], "", [
-  \ 'set wincolor=MyWinCol',
+  \ 'set winhighlight=Normal:MyWinCol',
   \ ])
 endfunc
 
@@ -210,13 +210,13 @@ func Test_terminal_color_gui_group()
   \ ], "term_highlight: 'MyTermCol',", [])
 endfunc
 
-func Test_terminal_color_gui_wincolor()
+func Test_terminal_color_gui_winhighlight()
   CheckFeature termguicolors
   call Terminal_color("gui_MyWinCol", [
   \ "set termguicolors",
   \ "highlight MyWinCol guifg=#fe1122 guibg=#818100",
   \ ], "", [
-  \ 'set wincolor=MyWinCol',
+  \ 'set winhighlight=Normal:MyWinCol',
   \ ])
 endfunc
 
@@ -236,13 +236,13 @@ func Test_terminal_color_gui_transp_group()
   \ ], "term_highlight: 'MyTermCol',", [])
 endfunc
 
-func Test_terminal_color_gui_transp_wincolor()
+func Test_terminal_color_gui_transp_winhighlight()
   CheckFeature termguicolors
   call Terminal_color("gui_transp_MyWinCol", [
   \ "set termguicolors",
   \ "highlight MyWinCol guifg=#fe1122",
   \ ], "", [
-  \ 'set wincolor=MyWinCol',
+  \ 'set winhighlight=Normal:MyWinCol',
   \ ])
 endfunc
 
@@ -265,7 +265,7 @@ func Test_terminal_in_popup()
 	\ "  let s:buf = term_start('" .. cmd .. " Xtext', #{hidden: 1, term_finish: 'close'})",
 	\ '  let g:winid = popup_create(s:buf, #{minwidth: 45, minheight: 7, border: [], drag: 1, resize: 1})',
 	\ '  if a:setColor',
-	\ '    call win_execute(g:winid, "set wincolor=PopTerm")',
+	\ '    call win_execute(g:winid, "set winhighlight=Normal:PopTerm")',
 	\ '  endif',
 	\ 'endfunc',
 	\ 'func HidePopup()',
@@ -406,11 +406,11 @@ func Test_terminal_in_popup_color_group()
   \ ], "term_highlight: 'MyTermCol',", [], "")
 endfunc
 
-func Test_terminal_in_popup_color_wincolor()
+func Test_terminal_in_popup_color_winhighlight()
   call Terminal_in_popup_color("MyWinCol", [
   \ "highlight MyWinCol ctermfg=red ctermbg=darkyellow",
   \ ], "", [
-  \ 'call setwinvar(g:winid, "&wincolor", "MyWinCol")',
+  \ 'call setwinvar(g:winid, "&winhighlight", "Normal:MyWinCol")',
   \ ], "")
 endfunc
 
@@ -427,12 +427,12 @@ func Test_terminal_in_popup_color_group_over_Terminal()
   \ ], "term_highlight: 'MyTermCol',", [], "")
 endfunc
 
-func Test_terminal_in_popup_color_wincolor_over_group()
+func Test_terminal_in_popup_color_winhighlight_over_group()
   call Terminal_in_popup_color("MyWinCol_over_group", [
   \ "highlight MyTermCol ctermfg=darkgreen ctermbg=lightblue",
   \ "highlight MyWinCol ctermfg=red ctermbg=darkyellow",
   \ ], "term_highlight: 'MyTermCol',", [
-  \ 'call setwinvar(g:winid, "&wincolor", "MyWinCol")',
+  \ 'call setwinvar(g:winid, "&winhighlight", "Normal:MyWinCol")',
   \ ], "")
 endfunc
 
@@ -448,11 +448,11 @@ func Test_terminal_in_popup_color_transp_group()
   \ ], "term_highlight: 'MyTermCol',", [], "")
 endfunc
 
-func Test_terminal_in_popup_color_transp_wincolor()
+func Test_terminal_in_popup_color_transp_winhighlight()
   call Terminal_in_popup_color("transp_MyWinCol", [
   \ "highlight MyWinCol ctermfg=red",
   \ ], "", [
-  \ 'call setwinvar(g:winid, "&wincolor", "MyWinCol")',
+  \ 'call setwinvar(g:winid, "&winhighlight", "Normal:MyWinCol")',
   \ ], "")
 endfunc
 
@@ -478,13 +478,13 @@ func Test_terminal_in_popup_color_gui_group()
   \ ], "term_highlight: 'MyTermCol',", [], "")
 endfunc
 
-func Test_terminal_in_popup_color_gui_wincolor()
+func Test_terminal_in_popup_color_gui_winhighlight()
   CheckFeature termguicolors
   call Terminal_in_popup_color("gui_MyWinCol", [
   \ "set termguicolors",
   \ "highlight MyWinCol guifg=#fe1122 guibg=#818100",
   \ ], "", [
-  \ 'call setwinvar(g:winid, "&wincolor", "MyWinCol")',
+  \ 'call setwinvar(g:winid, "&winhighlight", "Normal:MyWinCol")',
   \ ], "")
 endfunc
 
@@ -512,13 +512,13 @@ func Test_terminal_in_popup_color_gui_transp_group()
   \ ], "term_highlight: 'MyTermCol',", [], "")
 endfunc
 
-func Test_terminal_in_popup_color_gui_transp_wincolor()
+func Test_terminal_in_popup_color_gui_transp_winhighlight()
   CheckFeature termguicolors
   call Terminal_in_popup_color("gui_transp_MyWinCol", [
   \ "set termguicolors",
   \ "highlight MyWinCol guifg=#fe1122",
   \ ], "", [
-  \ 'call setwinvar(g:winid, "&wincolor", "MyWinCol")',
+  \ 'call setwinvar(g:winid, "&winhighlight", "Normal:MyWinCol")',
   \ ], "")
 endfunc
 
@@ -558,11 +558,11 @@ func Test_issue_5607()
   let job = term_getjob(bufnr())
   call WaitForAssert({-> assert_equal("dead", job_status(job))})
 
-  let old_wincolor = &wincolor
+  let old_winhighlight = &winhighlight
   try
-    set wincolor=
+    set winhighlight=
   finally
-    let &wincolor = old_wincolor
+    let &winhighlight = old_winhighlight
     bw!
   endtry
 endfunc
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index f8323019bd5e21..70b23bd55e0729 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -4823,7 +4823,7 @@ func Test_textprop_backspace_fo_aw()
   call prop_type_delete('test')
 endfunc
 
-func Test_textprop_with_wincolor()
+func Test_textprop_with_winhighlight()
   CheckScreendump
   CheckRunVimInTerminal
 
@@ -4837,7 +4837,7 @@ func Test_textprop_with_wincolor()
           \ text_align: 'after', text_padding_left: 3})
     call prop_add(1, 0, #{type: 'belowprop', text: 'BELOW',
           \ text_align: 'below', text_padding_left: 3})
-    set wincolor=DiffChange wrap
+    set winhighlight=Normal:DiffChange wrap
   END
   call writefile(lines, 'XtextPropWincolor', 'D')
   let buf = RunVimInTerminal('-S XtextPropWincolor', #{rows: 8, cols: 60})
diff --git a/src/testdir/util/gen_opt_test.vim b/src/testdir/util/gen_opt_test.vim
index c2c5191daa3dfc..2b04d02da9d54e 100644
--- a/src/testdir/util/gen_opt_test.vim
+++ b/src/testdir/util/gen_opt_test.vim
@@ -159,9 +159,8 @@ let test_values = {
       \		's', 's/tmp/dir\\\ with\\\ space/*',
       \		'w,b,k/tmp/dir\\\ with\\\ space/*,s'],
       \		['xxx']],
-      \ 'completefuzzycollect': [['', 'keyword', 'files', 'whole_line',
-      \		'keyword,whole_line', 'files,whole_line', 'keyword,files,whole_line'],
-      \		['xxx', 'keyword,,,whole_line,']],
+      \ 'completefuzzycollect': [[''],
+      \		['keyword', 'xxx']],
       \ 'completeitemalign': [['abbr,kind,menu', 'menu,abbr,kind'],
       \		['', 'xxx', 'abbr', 'abbr,menu', 'abbr,menu,kind,abbr',
       \		'abbr1234,kind,menu']],
@@ -360,6 +359,8 @@ let test_values = {
       \		['xxx', 'a4', 'full,full,full,full,full']],
       \ 'wildoptions': [['', 'tagfile', 'pum', 'fuzzy'], ['xxx']],
       \ 'winaltkeys': [['no', 'yes', 'menu'], ['', 'xxx']],
+      \ 'wincolor': [[''],
+      \		['Normal', 'xxx']],
       \ 'winhighlight': [['Search:Errormsg,Comment:String', 'Search:Comment', ''],
       \		['xxx', ',', 'Search:Comment,', 'Search:Errormsg,Comment:String,',
       \		':', 'Search:,', 'Search:']],