diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
index a41a2f587e9..86f62b87d75 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
@@ -711,24 +711,13 @@ public final class StaticContext {
         if (currentModule == module) {
             return currentModuleAsImported;
         }
-        String moduleName = suggestModuleName(module);
+        String moduleName = JsDescriptorUtils.getModuleName(module);
 
         if (UNKNOWN_EXTERNAL_MODULE_NAME.equals(moduleName)) return null;
 
         return getImportedModule(moduleName, null);
     }
 
-    @NotNull
-    private static String suggestModuleName(@NotNull ModuleDescriptor module) {
-        if (module == module.getBuiltIns().getBuiltInsModule()) {
-            return Namer.KOTLIN_LOWER_NAME;
-        }
-        else {
-            String moduleName = module.getName().asString();
-            return moduleName.substring(1, moduleName.length() - 1);
-        }
-    }
-
     @NotNull
     public JsImportedModule getImportedModule(@NotNull String baseName, @Nullable DeclarationDescriptor descriptor) {
         String plainName = descriptor != null && config.getModuleKind() == ModuleKind.UMD ? getPlainId(descriptor) : null;
@@ -835,9 +824,7 @@ public final class StaticContext {
 
     @Nullable
     public JsExpression exportModuleForInline(@NotNull ModuleDescriptor declaration) {
-        if (getCurrentModule().getBuiltIns().getBuiltInsModule() == declaration) return null;
-
-        String moduleName = suggestModuleName(declaration);
+        String moduleName = JsDescriptorUtils.getModuleName(declaration);
         if (moduleName.equals(Namer.KOTLIN_LOWER_NAME)) return null;
 
         JsImportedModule importedModule = getJsImportedModule(declaration);
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
index 8e11fc61653..a86d3fa2772 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
@@ -149,11 +149,16 @@ public final class JsDescriptorUtils {
 
     @NotNull
     public static String getModuleName(@NotNull DeclarationDescriptor descriptor) {
-        ModuleDescriptor moduleDescriptor = DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor));
-        if (DescriptorUtils.getContainingModule(descriptor) == moduleDescriptor.getBuiltIns().getBuiltInsModule()) {
+        return getModuleName(DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor)));
+    }
+
+    @NotNull
+    public static String getModuleName(@NotNull ModuleDescriptor module) {
+        if (module.getName().equals(KotlinBuiltIns.BUILTINS_MODULE_NAME)) {
             return Namer.KOTLIN_LOWER_NAME;
         }
-        String moduleName = moduleDescriptor.getName().asString();
+
+        String moduleName = module.getName().asString();
         return moduleName.substring(1, moduleName.length() - 1);
     }