diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/after.py.template b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/after.py.template
similarity index 100%
rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/after.py.template
rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/after.py.template
diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/before.py.template b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/before.py.template
similarity index 100%
rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/before.py.template
rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/before.py.template
diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/description.html b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/description.html
similarity index 100%
rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/description.html
rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/description.html
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index a2b5c41eb4f0..18e470efbdc5 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -312,7 +312,7 @@
     </intentionAction>
 
     <intentionAction>
-      <className>com.jetbrains.python.codeInsight.intentions.PyConvertTypeCommentToVariableAnnotation</className>
+      <className>com.jetbrains.python.codeInsight.intentions.PyConvertTypeCommentToVariableAnnotationIntention</className>
       <category>Python</category>
     </intentionAction>
 
diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java
similarity index 97%
rename from python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java
rename to python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java
index 9bb6485bc425..785c7bb0445d 100644
--- a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java
+++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java
@@ -16,7 +16,6 @@
 package com.jetbrains.python.codeInsight.intentions;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -37,12 +36,12 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
-import static com.jetbrains.python.psi.PyUtil.as;
-import static com.jetbrains.python.psi.PyUtil.rehighlightOpenEditors;
-
-public class PyConvertTypeCommentToVariableAnnotation extends PyBaseIntentionAction {
+public class PyConvertTypeCommentToVariableAnnotationIntention extends PyBaseIntentionAction {
   @Override
   public void doInvoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
     final PsiComment typeComment = findCommentUnderCaret(editor, file);