diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 27238355e53..1177c9c66e8 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -249,7 +249,7 @@
     <typedHandler implementation="org.jetbrains.jet.plugin.editor.KotlinTypedHandler"/>
     <backspaceHandlerDelegate implementation="org.jetbrains.jet.plugin.editor.KotlinBackspaceHandler"/>
 
-    <copyPastePostProcessor implementation="org.jetbrains.jet.plugin.conversion.copy.JavaCopyPastePostProcessor"/>
+    <copyPastePostProcessor implementation="org.jetbrains.jet.plugin.conversion.copy.ConvertJavaCopyPastePostProcessor"/>
     <lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.JetQuickDocumentationProvider" order="first"/>
     <documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
     <configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
rename to idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index 571437d73b8..a52ed74af2d 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -31,10 +31,9 @@ import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.plugin.editor.JetEditorOptions
 import java.awt.datatransfer.Transferable
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CodeStyleManager
 
-public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTransferableData> {
+public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTransferableData> {
 
     override fun extractTransferableData(content: Transferable?): TextBlockTransferableData? {
         try {
@@ -179,6 +178,6 @@ public class JavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBlockTran
     }
 
     class object {
-        private val LOG = Logger.getInstance("#org.jetbrains.jet.plugin.conversion.copy.JavaCopyPastePostProcessor")!!
+        private val LOG = Logger.getInstance("#org.jetbrains.jet.plugin.conversion.copy.ConvertJavaCopyPastePostProcessor")!!
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/CopiedCode.java b/idea/src/org/jetbrains/jet/plugin/conversion/copy/CopiedCode.java
index de2d7ad9733..5110b40a78c 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/CopiedCode.java
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/CopiedCode.java
@@ -25,7 +25,8 @@ import java.awt.datatransfer.DataFlavor;
 
 class CopiedCode implements TextBlockTransferableData {
     @NotNull
-    public static final DataFlavor DATA_FLAVOR = new DataFlavor(JavaCopyPastePostProcessor.class, "class: JavaCopyPastePostProcessor");
+    public static final DataFlavor DATA_FLAVOR = new DataFlavor(ConvertJavaCopyPastePostProcessor.class,
+                                                                "class: ConvertJavaCopyPastePostProcessor");
     private final PsiJavaFile file;
     private final int[] startOffsets;
     private final int[] endOffsets;