diff --git a/highlighters/brackets/brackets-highlighter.zsh b/highlighters/brackets/brackets-highlighter.zsh
index ce52309..2a5f396 100644
--- a/highlighters/brackets/brackets-highlighter.zsh
+++ b/highlighters/brackets/brackets-highlighter.zsh
@@ -38,13 +38,13 @@
 : ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
 
 # Whether the brackets highlighter should be called or not.
-_zsh_highlight_brackets_highlighter_predicate()
+_zsh_highlight_highlighter_brackets_predicate()
 {
   _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
 }
 
 # Brackets highlighting function.
-_zsh_highlight_brackets_highlighter()
+_zsh_highlight_highlighter_brackets_paint()
 {
   local char style
   local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
diff --git a/highlighters/cursor/cursor-highlighter.zsh b/highlighters/cursor/cursor-highlighter.zsh
index aa70f55..6806aa2 100644
--- a/highlighters/cursor/cursor-highlighter.zsh
+++ b/highlighters/cursor/cursor-highlighter.zsh
@@ -32,7 +32,7 @@
 : ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
 
 # Whether the cursor highlighter should be called or not.
-_zsh_highlight_cursor_highlighter_predicate()
+_zsh_highlight_highlighter_cursor_predicate()
 {
   # accept-* may trigger removal of cursor highlighting
   [[ $WIDGET == accept-* ]] ||
@@ -40,7 +40,7 @@ _zsh_highlight_cursor_highlighter_predicate()
 }
 
 # Cursor highlighting function.
-_zsh_highlight_cursor_highlighter()
+_zsh_highlight_highlighter_cursor_paint()
 {
   [[ $WIDGET == accept-* ]] && return
   
diff --git a/highlighters/line/line-highlighter.zsh b/highlighters/line/line-highlighter.zsh
index 2da55ea..f922dc9 100644
--- a/highlighters/line/line-highlighter.zsh
+++ b/highlighters/line/line-highlighter.zsh
@@ -32,13 +32,13 @@
 : ${ZSH_HIGHLIGHT_STYLES[line]:=}
 
 # Whether the root highlighter should be called or not.
-_zsh_highlight_line_highlighter_predicate()
+_zsh_highlight_highlighter_line_predicate()
 {
   _zsh_highlight_buffer_modified
 }
 
 # root highlighting function.
-_zsh_highlight_line_highlighter()
+_zsh_highlight_highlighter_line_paint()
 {
   _zsh_highlight_add_highlight 0 $#BUFFER line
 }
diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index abe4d38..f790a2a 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -60,7 +60,7 @@
 : ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
 
 # Whether the highlighter should be called or not.
-_zsh_highlight_main_highlighter_predicate()
+_zsh_highlight_highlighter_main_predicate()
 {
   # accept-* may trigger removal of path_prefix highlighting
   [[ $WIDGET == accept-* ]] ||
@@ -150,7 +150,7 @@ _zsh_highlight_main__resolve_alias() {
 }
 
 # Main syntax highlighting function.
-_zsh_highlight_main_highlighter()
+_zsh_highlight_highlighter_main_paint()
 {
   ## Before we even 'emulate -L', we must test a few options that would reset.
   if [[ -o interactive_comments ]]; then
@@ -166,7 +166,7 @@ _zsh_highlight_main_highlighter()
 
   # At the PS3 prompt and in vared, highlight nothing.
   #
-  # (We can't check this in _zsh_highlight_main_highlighter_predicate because
+  # (We can't check this in _zsh_highlight_highlighter_main_predicate because
   # if the predicate returns false, the previous value of region_highlight
   # would be reused.)
   if [[ $CONTEXT == (select|vared) ]]; then
diff --git a/highlighters/pattern/pattern-highlighter.zsh b/highlighters/pattern/pattern-highlighter.zsh
index 4e2eabd..054eff7 100644
--- a/highlighters/pattern/pattern-highlighter.zsh
+++ b/highlighters/pattern/pattern-highlighter.zsh
@@ -32,13 +32,13 @@
 typeset -gA ZSH_HIGHLIGHT_PATTERNS
 
 # Whether the pattern highlighter should be called or not.
-_zsh_highlight_pattern_highlighter_predicate()
+_zsh_highlight_highlighter_pattern_predicate()
 {
   _zsh_highlight_buffer_modified
 }
 
 # Pattern syntax highlighting function.
-_zsh_highlight_pattern_highlighter()
+_zsh_highlight_highlighter_pattern_paint()
 {
   setopt localoptions extendedglob
   local pattern
diff --git a/highlighters/root/root-highlighter.zsh b/highlighters/root/root-highlighter.zsh
index ede9769..3718c44 100644
--- a/highlighters/root/root-highlighter.zsh
+++ b/highlighters/root/root-highlighter.zsh
@@ -32,13 +32,13 @@
 : ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
 
 # Whether the root highlighter should be called or not.
-_zsh_highlight_root_highlighter_predicate()
+_zsh_highlight_highlighter_root_predicate()
 {
   _zsh_highlight_buffer_modified
 }
 
 # root highlighting function.
-_zsh_highlight_root_highlighter()
+_zsh_highlight_highlighter_root_paint()
 {
   if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
 }