diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportConstantFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportConstantFix.java
index 5404c1fa3e79..2f5229b06fc9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportConstantFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportConstantFix.java
@@ -58,7 +58,7 @@ public class StaticImportConstantFix extends StaticImportMemberFix<PsiField> {
     final PsiJavaCodeReferenceElement element = myRef.getElement();
     String name = element != null ? element.getReferenceName() : null;
     if (name == null) return Collections.emptyList();
-    final MyStaticMembersProcessor<PsiField> processor = new MyStaticMembersProcessor<PsiField>(element) {
+    final StaticMembersProcessor<PsiField> processor = new StaticMembersProcessor<PsiField>(element) {
       @Override
       protected boolean isApplicable(PsiField field, PsiElement place) {
         final PsiType expectedType = getExpectedType();
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java
index 2c59ddb63126..6aa8006ebd28 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java
@@ -23,6 +23,7 @@ import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.hint.QuestionAction;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.HintAction;
+import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.command.CommandProcessor;
@@ -67,7 +68,7 @@ public abstract class StaticImportMemberFix<T extends PsiMember> implements Inte
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     return PsiUtil.isLanguageLevel5OrHigher(file)
-           && file instanceof PsiJavaFile
+           && file.getLanguage().isKindOf(JavaLanguage.INSTANCE)
            && getElement() != null
            && getElement().isValid()
            && getQualifierExpression() == null
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java
index ca02a63a6e85..2cce7fe835cb 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java
@@ -62,7 +62,7 @@ public class StaticImportMethodFix extends StaticImportMemberFix<PsiMethod> {
     PsiReferenceExpression reference = element == null ? null : element.getMethodExpression();
     String name = reference == null ? null : reference.getReferenceName();
     if (name == null) return Collections.emptyList();
-    final MyStaticMembersProcessor<PsiMethod> processor = new MyStaticMethodProcessor(project, element);
+    final StaticMembersProcessor<PsiMethod> processor = new MyStaticMethodProcessor(project, element);
     cache.processMethodsWithName(name, element.getResolveScope(), processor);
     return processor.getMembersToImport(applicableOnly);
   }
@@ -97,7 +97,7 @@ public class StaticImportMethodFix extends StaticImportMemberFix<PsiMethod> {
     return methodCallExpression != null ? methodCallExpression.resolveMethod() : null;
   }
 
-  private static class MyStaticMethodProcessor extends MyStaticMembersProcessor<PsiMethod> {
+  private static class MyStaticMethodProcessor extends StaticMembersProcessor<PsiMethod> {
 
     private MyStaticMethodProcessor(Project project, PsiMethodCallExpression place) {
       super(place);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MyStaticMembersProcessor.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
similarity index 98%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MyStaticMembersProcessor.java
rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
index 58767bf612e0..520ae6ab2540 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MyStaticMembersProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-abstract class MyStaticMembersProcessor<T extends PsiMember> implements Processor<T> {
+abstract class StaticMembersProcessor<T extends PsiMember> implements Processor<T> {
   private final MultiMap<PsiClass, T> myDeprecated = new LinkedMultiMap<PsiClass, T>();
   private final MultiMap<PsiClass, T> mySuggestions = new LinkedMultiMap<PsiClass, T>();
 
@@ -38,7 +38,7 @@ abstract class MyStaticMembersProcessor<T extends PsiMember> implements Processo
   private final PsiElement myPlace;
   private PsiType myExpectedType;
 
-  protected MyStaticMembersProcessor(PsiElement place) {
+  protected StaticMembersProcessor(PsiElement place) {
     myPlace = place;
     myExpectedType = PsiType.NULL;
   }