diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 74071df45af..185b8c61b1c 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -170,7 +170,7 @@
     <lang.unwrapDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.unwrap.KotlinUnwrapDescriptor"/>
     <quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
     <refactoring.helper implementation="org.jetbrains.jet.plugin.codeInsight.KotlinShortenReferencesRefactoringHelper"/>
-    <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler"/>
+    <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.KotlinMoveFilesOrDirectoriesHandler"/>
     <moveFileHandler implementation="org.jetbrains.jet.plugin.refactoring.move.MoveKotlinFileHandler" />
     <refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
     <refactoring.changeSignatureUsageProcessor implementation="org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureUsageProcessor"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
index 2d90c54b4ef..5482f45085e 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.copy.CopyFilesOrDirectoriesHandler;
 import com.intellij.refactoring.copy.CopyHandlerDelegateBase;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler;
+import org.jetbrains.jet.plugin.refactoring.move.KotlinMoveFilesOrDirectoriesHandler;
 
 import java.util.ArrayList;
 
@@ -38,7 +38,7 @@ public class JetCopyClassHandler extends CopyHandlerDelegateBase {
 
     private static PsiElement replaceElement(PsiElement element) {
         if (element instanceof JetClassOrObject &&
-            JetMoveFilesOrDirectoriesHandler.isMovableClass((JetClassOrObject) element)) {
+            KotlinMoveFilesOrDirectoriesHandler.isMovableClass((JetClassOrObject) element)) {
             return element.getContainingFile();
         }
         else {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/JetMoveFilesOrDirectoriesHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/refactoring/move/JetMoveFilesOrDirectoriesHandler.java
rename to idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java
index 1f3a732e9d9..adb2b8a212d 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/JetMoveFilesOrDirectoriesHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JetMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHandler {
+public class KotlinMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHandler {
     public static boolean isMovableClass(JetClassOrObject clazz) {
         if (!(clazz.getParent() instanceof JetFile)) return false;
         JetFile file = (JetFile) clazz.getContainingFile();