diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 9c4f5d98f92a..9ff893cd65fa 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -1197,7 +1197,7 @@
                             implementationClass="com.intellij.codeInsight.completion.NullSmartCompletionContributor"/>
     <completion.contributor language="JAVA" id="javadoc" order="last, before javaLegacy, before wordCompletion"
                             implementationClass="com.intellij.codeInsight.completion.JavaDocCompletionContributor"/>
-    <completion.contributor language="any" id="javaClassName" order="last, before default"
+    <completion.contributor language="JVM" id="javaClassName" order="last, before default"
                             implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor"/>
     <completion.contributor language="JAVA" id="javaMemberName" order="before javaOverride"
                             implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor"/>
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
index 04b112615061..72245c946b4c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
@@ -8,7 +8,6 @@ import com.intellij.lang.LangBundle;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.patterns.ElementPattern;
@@ -67,10 +66,6 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
 
   private static boolean mayContainClassName(CompletionParameters parameters) {
     PsiElement position = parameters.getPosition();
-    PsiFile file = position.getContainingFile();
-    if (file instanceof PsiPlainTextFile || file.getFileType() instanceof CustomSyntaxTableFileType) {
-      return true;
-    }
     if (SkipAutopopupInStrings.isInStringLiteral(position)) {
       return true;
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java b/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java
index 1d75590a3ad1..10400e6e30e7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java
@@ -16,8 +16,6 @@
 package com.intellij.codeInsight.completion;
 
 import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.lang.StdLanguages;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
@@ -31,9 +29,7 @@ public class XmlBasicToClassNameDelegator extends CompletionContributor {
   public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull final CompletionResultSet result) {
     PsiElement position = parameters.getPosition();
     PsiFile file = position.getContainingFile();
-    if (parameters.getCompletionType() != CompletionType.BASIC ||
-        !JavaCompletionContributor.mayStartClassName(result) ||
-        !file.getLanguage().isKindOf(StdLanguages.XML)) {
+    if (parameters.getCompletionType() != CompletionType.BASIC || !JavaCompletionContributor.mayStartClassName(result)) {
       return;
     }
 
@@ -45,14 +41,13 @@ public class XmlBasicToClassNameDelegator extends CompletionContributor {
 
     if (empty && JavaClassReferenceCompletionContributor.findJavaClassReference(file, parameters.getOffset()) != null ||
         parameters.isExtendedCompletion()) {
-      CompletionService.getCompletionService().getVariantsFromContributors(parameters.delegateToClassName(), null, completionResult -> {
-        LookupElement lookupElement = completionResult.getLookupElement();
+      JavaClassNameCompletionContributor.addAllClasses(parameters, true, result.getPrefixMatcher(), lookupElement -> {
         JavaPsiClassReferenceElement classElement = lookupElement.as(JavaPsiClassReferenceElement.CLASS_CONDITION_KEY);
         if (classElement != null) {
           classElement.setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE);
         }
         lookupElement.putUserData(XmlCompletionContributor.WORD_COMPLETION_COMPATIBLE, Boolean.TRUE); //todo think of a less dirty interaction
-        result.passResult(completionResult);
+        result.addElement(lookupElement);
       });
     }
   }
diff --git a/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile.txt b/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile.txt
deleted file mode 100644
index d64e015fd832..000000000000
--- a/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile.txt
+++ /dev/null
@@ -1 +0,0 @@
-abc = StrinBui<caret>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile_after.txt b/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile_after.txt
deleted file mode 100644
index 9a2f68198f96..000000000000
--- a/java/java-tests/testData/codeInsight/completion/className/InPlainTextFile_after.txt
+++ /dev/null
@@ -1 +0,0 @@
-abc = java.lang.StringBuilder<caret>
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ClassNameCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ClassNameCompletionTest.java
index d007a4689b47..7939ca6bd4fe 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ClassNameCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ClassNameCompletionTest.java
@@ -126,11 +126,6 @@ public class ClassNameCompletionTest extends LightFixtureCompletionTestCase {
 
   public void testBracesAfterNew() { doTest(); }
 
-  public void testInPlainTextFile() {
-    configureByFile(getTestName(false) + ".txt");
-    checkResultByFile(getTestName(false) + "_after.txt");
-  }
-
   public void testInPropertiesFile() {
     myFixture.configureByText("a.properties", "abc = StrinBui<caret>");
     complete();
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 50f5d10e609f..1051adcb9e07 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -589,8 +589,8 @@ action.HippieBackwardCompletion.text=Cyclic _Expand Word (Backward)
 action.HippieBackwardCompletion.description=Cyclic Expand word (Backward)
 action.SmartTypeCompletion.text=_SmartType
 action.SmartTypeCompletion.description=Complete code basing on expected type
-action.ClassNameCompletion.text=Class _Name Completion
-action.ClassNameCompletion.description=Complete class name and add import for it
+action.ClassNameCompletion.text=Second Basic Completion
+action.ClassNameCompletion.description=Same as pressing shortcut for Basic Completion twice (may be used to complete non-imported class name)
 action.InsertLiveTemplate.text=Insert Live _Template...
 action.InsertLiveTemplate.description=Show popup list of live templates starting with the specified prefix
 action.ExpandLiveTemplateByTab.text=Expand Live Template by Tab