diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java
index a68141295fb..3fdb0901ef1 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.FqNameUnsafe;
 import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct;
-import org.jetbrains.kotlin.resolve.jvm.JavaPsiFacadeImpl;
+import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -43,7 +43,7 @@ public class JavaClassFinderImpl implements JavaClassFinder {
     private GlobalSearchScope baseScope;
 
     private GlobalSearchScope javaSearchScope;
-    private JavaPsiFacadeImpl javaFacade;
+    private KotlinJavaPsiFacade javaFacade;
 
     @Inject
     public void setProject(@NotNull Project project) {
@@ -75,7 +75,7 @@ public class JavaClassFinderImpl implements JavaClassFinder {
                 return project;
             }
         };
-        javaFacade = new JavaPsiFacadeImpl(project, javaSearchScope);
+        javaFacade = new KotlinJavaPsiFacade(project, javaSearchScope);
     }
 
     @Nullable
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
similarity index 98%
rename from compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java
rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
index 288dedd79e7..2928b06d965 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
@@ -46,13 +46,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 
-public class JavaPsiFacadeImpl {
+public class KotlinJavaPsiFacade {
     private volatile KotlinPsiElementFinderWrapper[] myElementFinders;
     private volatile SoftReference<ConcurrentMap<String, PsiPackage>> myPackageCache;
     private final Project Project;
     private final GlobalSearchScope searchScope;
 
-    public JavaPsiFacadeImpl(@NotNull Project project, @NotNull GlobalSearchScope searchScope) {
+    public KotlinJavaPsiFacade(@NotNull Project project, @NotNull GlobalSearchScope searchScope) {
         this.Project = project;
         this.searchScope = searchScope;
     }