diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
index a513c5dfc5f..ad648e2fc44 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
@@ -92,6 +92,11 @@ public class JavaBridgeConfiguration implements ModuleConfiguration {
     @NotNull
     @Override
     public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
+        return getKotlinAnalogsForJavaStandardClasses(classOrPackageName);
+    }
+
+    @NotNull
+    public static Collection<ClassDescriptor> getKotlinAnalogsForJavaStandardClasses(@NotNull FqNameUnsafe classOrPackageName) {
         if (classOrPackageName.isSafe()) {
             return JavaToKotlinTypesMap.getInstance().getAllKotlinAnalogs(classOrPackageName.toSafe());
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzeExhaust.java b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzeExhaust.java
index a23ecb2d4be..13466bd6c89 100644
--- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzeExhaust.java
+++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzeExhaust.java
@@ -46,7 +46,7 @@ public class AnalyzeExhaust {
 
         @NotNull
         @Override
-        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
+        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
             return Collections.emptyList();
         }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
index ff1aa9dbab5..605ae56d13e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
@@ -76,7 +76,7 @@ public class DefaultModuleConfiguration implements ModuleConfiguration {
 
     @NotNull
     @Override
-    public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
+    public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
         return Collections.emptyList();
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java
index 1972553e040..c7480d3372b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java
@@ -42,7 +42,7 @@ public interface ModuleConfiguration {
 
         @NotNull
         @Override
-        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
+        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
             return Collections.emptyList();
         }
 
@@ -61,5 +61,5 @@ public interface ModuleConfiguration {
     void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope);
 
     @NotNull
-    Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className);
+    Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName);
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java
index 0edfe822f3b..094845aafd4 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java
@@ -26,6 +26,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
+import org.jetbrains.jet.lang.resolve.java.JavaToKotlinTypesMap;
 import org.jetbrains.jet.test.util.NamespaceComparator;
 import org.jetbrains.jet.lang.DefaultModuleConfiguration;
 import org.jetbrains.jet.lang.ModuleConfiguration;
@@ -119,8 +121,8 @@ public class LazyResolveBuiltinClassesTest extends KotlinTestWithEnvironment {
 
         @NotNull
         @Override
-        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
-            return Collections.emptyList();
+        public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
+            return JavaBridgeConfiguration.getKotlinAnalogsForJavaStandardClasses(classOrPackageName);
         }
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
index 471ca5b8b15..7ac7eb5ff8c 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
@@ -34,9 +34,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.*;
-import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
-import org.jetbrains.jet.lang.resolve.java.JavaPackageScope;
-import org.jetbrains.jet.lang.resolve.java.PsiClassFinder;
+import org.jetbrains.jet.lang.resolve.java.*;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -120,8 +118,8 @@ public class LazyResolveTestUtil {
 
             @NotNull
             @Override
-            public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
-                return Collections.emptyList();
+            public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
+                return JavaBridgeConfiguration.getKotlinAnalogsForJavaStandardClasses(classOrPackageName);
             }
         };
 
diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
index 7ed29761dae..a6c78c52100 100644
--- a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
+++ b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
@@ -108,7 +108,7 @@ public final class JsConfiguration implements ModuleConfiguration {
 
     @NotNull
     @Override
-    public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe className) {
+    public Collection<ClassDescriptor> getKotlinAnalogs(@NotNull FqNameUnsafe classOrPackageName) {
         return Collections.emptyList();
     }
 }