diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java
index eefa502100d4..f265112a60f4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java
@@ -27,6 +27,7 @@ import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.file.JavaDirectoryServiceImpl;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
@@ -55,13 +56,7 @@ public class MoveClassToSeparateFileFix implements IntentionAction {
     PsiDirectory dir = file.getContainingDirectory();
     if (dir == null) return false;
     try {
-      String name = myClass.getName();
-      if (myClass.isInterface()) {
-        JavaDirectoryService.getInstance().checkCreateInterface(dir, name);
-      }
-      else {
-        JavaDirectoryService.getInstance().checkCreateClass(dir, name);
-      }
+      JavaDirectoryServiceImpl.checkCreateClassOrInterface(dir, myClass.getName());
     }
     catch (IncorrectOperationException e) {
       return false;
diff --git a/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java b/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
index b6034b3bb5b4..56556548f0e4 100644
--- a/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
+++ b/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.impl.file.JavaDirectoryServiceImpl;
 import com.intellij.util.IncorrectOperationException;
 
 import java.util.Properties;
@@ -50,13 +51,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
       CodeStyleManager.getInstance(project).reformat(psiJavaFile);
     }
     String className = createdClass.getName();
-    String fileName = className + "." + extension;
-    if(createdClass.isInterface()){
-      JavaDirectoryService.getInstance().checkCreateInterface(directory, className);
-    }
-    else{
-      JavaDirectoryService.getInstance().checkCreateClass(directory, className);
-    }
+    JavaDirectoryServiceImpl.checkCreateClassOrInterface(directory, className);
 
     final LanguageLevel ll = JavaDirectoryService.getInstance().getLanguageLevel(directory);
     if (ll.compareTo(LanguageLevel.JDK_1_5) < 0) {
@@ -69,7 +64,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
       }
     }
 
-    psiJavaFile = (PsiJavaFile)psiJavaFile.setName(fileName);
+    psiJavaFile = (PsiJavaFile)psiJavaFile.setName(className + "." + extension);
     PsiElement addedElement = directory.add(psiJavaFile);
     if (addedElement instanceof PsiJavaFile) {
       psiJavaFile = (PsiJavaFile)addedElement;
diff --git a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
index 8b90ac321c85..06157ae16c76 100644
--- a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
@@ -170,13 +170,6 @@ public class JavaDirectoryServiceImpl extends JavaDirectoryService {
     checkCreateClassOrInterface(dir, name);
   }
 
-  public void checkCreateInterface(@NotNull PsiDirectory dir, @NotNull String name) throws IncorrectOperationException {
-    checkCreateClassOrInterface(dir, name);
-  }
-
-  /**
-   * @not_implemented
-   */
   public static void checkCreateClassOrInterface(@NotNull PsiDirectory directory, String name) throws IncorrectOperationException {
     PsiUtil.checkIsIdentifier(directory.getManager(), name);
 
diff --git a/java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java b/java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java
index e36baea4222a..098d60d49896 100644
--- a/java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java
+++ b/java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java
@@ -95,16 +95,6 @@ public abstract class JavaDirectoryService {
   @NotNull
   public abstract PsiClass createInterface(@NotNull PsiDirectory dir, @NotNull String name) throws IncorrectOperationException;
 
-  /**
-   * Checks if it's possible to create an interface with the specified name in the directory,
-   * and throws an exception if the creation is not possible. Does not actually modify
-   * anything.
-   *
-   * @param name the name of the interface to check creation possibility (not including the file extension).
-   * @throws IncorrectOperationException if the creation is not possible.
-   */
-  public abstract void checkCreateInterface(@NotNull PsiDirectory dir, @NotNull String name) throws IncorrectOperationException;
-
   /**
    * Creates an enumeration class with the specified name in the directory.
    *