diff --git a/python/python-psi-impl/resources/intellij.python.psi.impl.xml b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
index 5fd7db96ac50..9607e1d50e04 100644
--- a/python/python-psi-impl/resources/intellij.python.psi.impl.xml
+++ b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
@@ -167,7 +167,7 @@
     <inlineActionHandler implementation="com.jetbrains.python.refactoring.inline.PyInlineLocalHandler"/>
     <inlineActionHandler implementation="com.jetbrains.python.refactoring.inline.PyInlineFunctionHandler"/>
 
-    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyAnnotatingVisitor"/>
+    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PySyntaxAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyDocStringAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyDefinitionsAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyGeneratorInArgumentListAnnotator"/>
@@ -179,8 +179,8 @@
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyLocalVariableAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyTypeParameterListAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyCompositeAnnotator"/>
-    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyHighlightingAnnotatorVisitor"/>
-    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyBuiltinAnnotatorVisitor"/>
+    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyFunctionHighlightingAnnotator"/>
+    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyBuiltinAnnotator"/>
     <annotator language="Python" implementationClass="com.jetbrains.python.validation.UnsupportedFeatures"/>
 
     <localInspection language="Python" shortName="PyUnusedLocalInspection" suppressId="PyUnusedLocal" bundle="messages.PyPsiBundle" key="INSP.NAME.unused" groupKey="INSP.GROUP.python" enabledByDefault="true" level="WEAK WARNING" implementationClass="com.jetbrains.python.inspections.unusedLocal.PyUnusedLocalInspection"/>
diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotatorVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotator.java
similarity index 98%
rename from python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotatorVisitor.java
rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotator.java
index 8b86eedc359b..3454e7376524 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotatorVisitor.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotator.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Marks built-in names.
  */
-public class PyBuiltinAnnotatorVisitor extends PyAnnotatorBase {
+public class PyBuiltinAnnotator extends PyAnnotatorBase {
   @Override
   protected void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) {
     element.accept(new MyVisitor(holder));
diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/PyHighlightingAnnotatorVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyFunctionHighlightingAnnotator.java
similarity index 98%
rename from python/python-psi-impl/src/com/jetbrains/python/validation/PyHighlightingAnnotatorVisitor.java
rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyFunctionHighlightingAnnotator.java
index 6590c0bebcf9..eaa328ff0ba3 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/validation/PyHighlightingAnnotatorVisitor.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyFunctionHighlightingAnnotator.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
 import static com.jetbrains.python.psi.PyUtil.as;
 
 
-public class PyHighlightingAnnotatorVisitor extends PyAnnotatorBase {
+public class PyFunctionHighlightingAnnotator extends PyAnnotatorBase {
   @Override
   protected void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) {
     element.accept(new MyVisitor(holder));
diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/PyAnnotatingVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PySyntaxAnnotator.java
similarity index 92%
rename from python/python-psi-impl/src/com/jetbrains/python/validation/PyAnnotatingVisitor.java
rename to python/python-psi-impl/src/com/jetbrains/python/validation/PySyntaxAnnotator.java
index f0a4658f0d2a..43bf80116fcf 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/validation/PyAnnotatingVisitor.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PySyntaxAnnotator.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 
-public final class PyAnnotatingVisitor extends PyAnnotatorBase implements DumbAware {
+public final class PySyntaxAnnotator extends PyAnnotatorBase implements DumbAware {
   @Override
   public void annotate(@NotNull PsiElement psiElement, @NotNull PyAnnotationHolder holder) {
     List<@NotNull PsiElementVisitor> visitors = List.of(
diff --git a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
index 540080a2a505..ee82b643d0ae 100644
--- a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
+++ b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
@@ -8,7 +8,7 @@ import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferenc
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.PythonVisitorFilter;
 import com.jetbrains.python.validation.PyDocStringAnnotator;
-import com.jetbrains.python.validation.PyHighlightingAnnotatorVisitor;
+import com.jetbrains.python.validation.PyFunctionHighlightingAnnotator;
 import com.jetbrains.python.validation.PyParameterListAnnotatorVisitor;
 import com.jetbrains.python.validation.ReturnAnnotator;
 import org.jetbrains.annotations.NotNull;
@@ -35,7 +35,7 @@ public final class PyDocstringVisitorFilter implements PythonVisitorFilter {
       return false;
     }
     //annotators
-    if (visitorClass == PyDocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyHighlightingAnnotatorVisitor.class)
+    if (visitorClass == PyDocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyFunctionHighlightingAnnotator.class)
       return false;
     // doctest in separate file
     final PsiFile topLevelFile = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file);