From 38221a7967fb8afa17fc97af6ddb499d2bf2b433 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 23 Apr 2021 10:28:44 +0700
Subject: [PATCH] [kotlin] replace kotlinc.kotlin-stdlib-jdk8 with
 kotlin-stdlib-jdk8

^KTIJ-10035

GitOrigin-RevId: 93f6f0e9c0d24459068ae65b4d1263df5e617390
---
 plugins/kotlin/common/kotlin.common.iml                         | 2 +-
 .../allopen/kotlin.compiler-plugins.allopen.iml                 | 2 +-
 ...otlin.compiler-plugins.annotation-based-compiler-support.iml | 2 +-
 .../compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml      | 2 +-
 .../kotlin.compiler-plugins.kotlinx-serialization.iml           | 2 +-
 .../compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml    | 2 +-
 .../parcelize/kotlin.compiler-plugins.parcelize.iml             | 2 +-
 .../kotlin.compiler-plugins.sam-with-receiver.iml               | 2 +-
 .../kotlin.compiler-plugins.scripting-ide-services.iml          | 2 +-
 .../scripting/kotlin.compiler-plugins.scripting.iml             | 2 +-
 plugins/kotlin/completion/kotlin.completion.iml                 | 2 +-
 plugins/kotlin/core/kotlin.core.iml                             | 2 +-
 .../kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml   | 2 +-
 plugins/kotlin/fir/kotlin.fir.iml                               | 2 +-
 plugins/kotlin/formatter/kotlin.formatter.iml                   | 2 +-
 plugins/kotlin/frontend-api/kotlin.fir.frontend-api.iml         | 2 +-
 plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml         | 2 +-
 .../frontend-independent/kotlin.fir.frontend-independent.iml    | 2 +-
 plugins/kotlin/generators/kotlin.generators.iml                 | 2 +-
 plugins/kotlin/git/kotlin.git.iml                               | 2 +-
 plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml | 2 +-
 .../kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml | 2 +-
 .../gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml      | 2 +-
 plugins/kotlin/idea/kotlin.idea.iml                             | 2 +-
 plugins/kotlin/idea/tests/kotlin.idea.tests.iml                 | 2 +-
 plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml                     | 2 +-
 plugins/kotlin/j2k/new/kotlin.j2k.new.iml                       | 2 +-
 plugins/kotlin/j2k/new/tests/kotlin.j2k.new.tests.iml           | 2 +-
 plugins/kotlin/j2k/old/kotlin.j2k.old.iml                       | 2 +-
 plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml           | 2 +-
 plugins/kotlin/j2k/services/kotlin.j2k.services.iml             | 2 +-
 plugins/kotlin/jps/jps-common/kotlin.jps-common.iml             | 2 +-
 plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml             | 2 +-
 plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml   | 2 +-
 .../jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml  | 2 +-
 plugins/kotlin/jvm-debugger/eval4j/kotlin.eval4j.iml            | 2 +-
 .../jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml  | 2 +-
 .../jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml      | 2 +-
 plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml   | 2 +-
 plugins/kotlin/jvm-debugger/util/kotlin.jvm-debugger.util.iml   | 2 +-
 plugins/kotlin/jvm/kotlin.jvm.iml                               | 2 +-
 .../kotlin.util.compiler-classpath.iml                          | 2 +-
 .../kotlin/line-indent-provider/kotlin.line-indent-provider.iml | 2 +-
 plugins/kotlin/maven/kotlin.maven.iml                           | 2 +-
 plugins/kotlin/native/kotlin.native.iml                         | 2 +-
 plugins/kotlin/performance-tests/kotlin.performance-tests.iml   | 2 +-
 plugins/kotlin/project-wizard/cli/kotlin.project-wizard.cli.iml | 2 +-
 .../kotlin/project-wizard/core/kotlin.project-wizard.core.iml   | 2 +-
 .../kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml   | 2 +-
 plugins/kotlin/repl/kotlin.repl.iml                             | 2 +-
 plugins/kotlin/scripting-support/kotlin.scripting-support.iml   | 2 +-
 plugins/kotlin/scripting/kotlin.scripting.iml                   | 2 +-
 plugins/kotlin/test-framework/kotlin.test-framework.iml         | 2 +-
 .../uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml      | 2 +-
 plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml     | 2 +-
 .../compiler-dependencies/kotlin.util.compiler-dependencies.iml | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/plugins/kotlin/common/kotlin.common.iml b/plugins/kotlin/common/kotlin.common.iml
index 40b0dca27b8c..6c6acca252cc 100644
--- a/plugins/kotlin/common/kotlin.common.iml
+++ b/plugins/kotlin/common/kotlin.common.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml b/plugins/kotlin/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml
index 05eb81083d59..2191b49ffdee 100644
--- a/plugins/kotlin/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml
+++ b/plugins/kotlin/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.allopen-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml b/plugins/kotlin/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml
index 8b94bbef2bef..b8acba56f9e5 100644
--- a/plugins/kotlin/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml
+++ b/plugins/kotlin/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.jps-common" />
diff --git a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
index d319cbcca7ff..44402d6a483e 100644
--- a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
+++ b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.jps-common" />
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml
index 972d40b36e6f..4d552960429f 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
diff --git a/plugins/kotlin/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml b/plugins/kotlin/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml
index 1ae560348c1e..6c09cded3fbd 100644
--- a/plugins/kotlin/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml
+++ b/plugins/kotlin/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.noarg-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/compiler-plugins/parcelize/kotlin.compiler-plugins.parcelize.iml b/plugins/kotlin/compiler-plugins/parcelize/kotlin.compiler-plugins.parcelize.iml
index 80e418f730bf..f84e82abdfe2 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/kotlin.compiler-plugins.parcelize.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/kotlin.compiler-plugins.parcelize.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.parcelize-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
diff --git a/plugins/kotlin/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml b/plugins/kotlin/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml
index 84fa306910d4..120722dea6fb 100644
--- a/plugins/kotlin/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml
+++ b/plugins/kotlin/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.sam-with-receiver-compiler-plugin" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
diff --git a/plugins/kotlin/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml b/plugins/kotlin/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml
index 5ad291834cf3..8160b648e79b 100644
--- a/plugins/kotlin/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml
+++ b/plugins/kotlin/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
diff --git a/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml b/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
index d3b519816bed..e3d4088718ac 100644
--- a/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
+++ b/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
diff --git a/plugins/kotlin/completion/kotlin.completion.iml b/plugins/kotlin/completion/kotlin.completion.iml
index 37569385b08a..12eefa04f61c 100644
--- a/plugins/kotlin/completion/kotlin.completion.iml
+++ b/plugins/kotlin/completion/kotlin.completion.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module-library">
diff --git a/plugins/kotlin/core/kotlin.core.iml b/plugins/kotlin/core/kotlin.core.iml
index ad39ccbefaaa..23e59d2440c9 100644
--- a/plugins/kotlin/core/kotlin.core.iml
+++ b/plugins/kotlin/core/kotlin.core.iml
@@ -27,7 +27,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="javaslang" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
diff --git a/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml b/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml
index 699b888c5bf0..903a9ac3d13a 100644
--- a/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml
+++ b/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml
@@ -19,7 +19,7 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" scope="TEST" name="gson" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-fir" scope="TEST" />
diff --git a/plugins/kotlin/fir/kotlin.fir.iml b/plugins/kotlin/fir/kotlin.fir.iml
index 2704a2afd4ef..b535d913cea4 100644
--- a/plugins/kotlin/fir/kotlin.fir.iml
+++ b/plugins/kotlin/fir/kotlin.fir.iml
@@ -19,7 +19,7 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" scope="TEST" name="gson" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/formatter/kotlin.formatter.iml b/plugins/kotlin/formatter/kotlin.formatter.iml
index 64f39247eea7..edc183192f7d 100644
--- a/plugins/kotlin/formatter/kotlin.formatter.iml
+++ b/plugins/kotlin/formatter/kotlin.formatter.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/plugins/kotlin/frontend-api/kotlin.fir.frontend-api.iml b/plugins/kotlin/frontend-api/kotlin.fir.frontend-api.iml
index 84a32828ee67..c2b28de9fc67 100644
--- a/plugins/kotlin/frontend-api/kotlin.fir.frontend-api.iml
+++ b/plugins/kotlin/frontend-api/kotlin.fir.frontend-api.iml
@@ -19,7 +19,7 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.java.psi" />
diff --git a/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml b/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml
index 8b80c1fc3e71..726fba62868d 100644
--- a/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml
+++ b/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml
@@ -19,7 +19,7 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
diff --git a/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml b/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml
index 0f61d92874bc..e73cdc3d713e 100644
--- a/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml
+++ b/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/plugins/kotlin/generators/kotlin.generators.iml b/plugins/kotlin/generators/kotlin.generators.iml
index ac708f2186da..84752e1f71c9 100644
--- a/plugins/kotlin/generators/kotlin.generators.iml
+++ b/plugins/kotlin/generators/kotlin.generators.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-build-common-tests" level="project" />
diff --git a/plugins/kotlin/git/kotlin.git.iml b/plugins/kotlin/git/kotlin.git.iml
index 1a4fe9a1591d..f25047396621 100644
--- a/plugins/kotlin/git/kotlin.git.iml
+++ b/plugins/kotlin/git/kotlin.git.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="intellij.vcs.git" />
diff --git a/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml b/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
index d928e5c27d08..a602a10178b4 100644
--- a/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
+++ b/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="Gradle" level="project" />
diff --git a/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml b/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
index a19e879ed873..7bdf2925ceca 100644
--- a/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
+++ b/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml b/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
index 1f69baa20974..e418acd62a5e 100644
--- a/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
+++ b/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index f8dcf8875d56..8fe4d86dfcae 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -34,7 +34,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="completion-ranking-kotlin" level="project" />
diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
index a0a5ba36bf54..6aec7aaa8173 100644
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -13,7 +13,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="javaslang" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.android-extensions-compiler-plugin" level="project" />
diff --git a/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml b/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml
index f4039c0fef38..f641ca4d2f45 100644
--- a/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml
+++ b/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/j2k/new/kotlin.j2k.new.iml b/plugins/kotlin/j2k/new/kotlin.j2k.new.iml
index 806a356b841d..aabb59e63e6f 100644
--- a/plugins/kotlin/j2k/new/kotlin.j2k.new.iml
+++ b/plugins/kotlin/j2k/new/kotlin.j2k.new.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
diff --git a/plugins/kotlin/j2k/new/tests/kotlin.j2k.new.tests.iml b/plugins/kotlin/j2k/new/tests/kotlin.j2k.new.tests.iml
index db0af2a2b2ea..83e4707042e8 100644
--- a/plugins/kotlin/j2k/new/tests/kotlin.j2k.new.tests.iml
+++ b/plugins/kotlin/j2k/new/tests/kotlin.j2k.new.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.j2k.old.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.j2k.services" scope="TEST" />
diff --git a/plugins/kotlin/j2k/old/kotlin.j2k.old.iml b/plugins/kotlin/j2k/old/kotlin.j2k.old.iml
index 2331282248ca..6a4ff8697934 100644
--- a/plugins/kotlin/j2k/old/kotlin.j2k.old.iml
+++ b/plugins/kotlin/j2k/old/kotlin.j2k.old.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
diff --git a/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml b/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml
index 1a5c5f19addf..da1bc9311c5a 100644
--- a/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml
+++ b/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.j2k.idea" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.j2k.old" scope="TEST" />
diff --git a/plugins/kotlin/j2k/services/kotlin.j2k.services.iml b/plugins/kotlin/j2k/services/kotlin.j2k.services.iml
index b93f5b7667d1..0cfb536497fe 100644
--- a/plugins/kotlin/j2k/services/kotlin.j2k.services.iml
+++ b/plugins/kotlin/j2k/services/kotlin.j2k.services.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="javaslang" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
diff --git a/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml b/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
index af3f0eb2fe13..d8fdb893712a 100644
--- a/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
+++ b/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
diff --git a/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml b/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
index ba4da17aca02..140ba8bfce50 100644
--- a/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
+++ b/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" name="Trove4j" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
index a078f265ec5a..b240022f63b6 100644
--- a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
+++ b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
index c3478b85980e..7f3c1166e7c2 100644
--- a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
+++ b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="maven-resolver-provider" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/eval4j/kotlin.eval4j.iml b/plugins/kotlin/jvm-debugger/eval4j/kotlin.eval4j.iml
index 44e9fcccb205..2819c15a2d1b 100644
--- a/plugins/kotlin/jvm-debugger/eval4j/kotlin.eval4j.iml
+++ b/plugins/kotlin/jvm-debugger/eval4j/kotlin.eval4j.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml
index b30b6a1b63fe..458e45e51e8a 100644
--- a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml
+++ b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml b/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
index a1b77dbc518a..95d3f45abd35 100644
--- a/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
+++ b/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
index 630d1faeadcf..614e8e1fff5d 100644
--- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
+++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="ASM" level="project" />
diff --git a/plugins/kotlin/jvm-debugger/util/kotlin.jvm-debugger.util.iml b/plugins/kotlin/jvm-debugger/util/kotlin.jvm-debugger.util.iml
index 6efc0b899923..a9d1b72d6829 100644
--- a/plugins/kotlin/jvm-debugger/util/kotlin.jvm-debugger.util.iml
+++ b/plugins/kotlin/jvm-debugger/util/kotlin.jvm-debugger.util.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/jvm/kotlin.jvm.iml b/plugins/kotlin/jvm/kotlin.jvm.iml
index 73e03cc6659e..ea3b9b5d26bc 100644
--- a/plugins/kotlin/jvm/kotlin.jvm.iml
+++ b/plugins/kotlin/jvm/kotlin.jvm.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
diff --git a/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml b/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml
index b2819859f424..6cef7d46ebaf 100644
--- a/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml
+++ b/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
diff --git a/plugins/kotlin/line-indent-provider/kotlin.line-indent-provider.iml b/plugins/kotlin/line-indent-provider/kotlin.line-indent-provider.iml
index 37f6c580596b..03dc180363d1 100644
--- a/plugins/kotlin/line-indent-provider/kotlin.line-indent-provider.iml
+++ b/plugins/kotlin/line-indent-provider/kotlin.line-indent-provider.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
   </component>
diff --git a/plugins/kotlin/maven/kotlin.maven.iml b/plugins/kotlin/maven/kotlin.maven.iml
index 0aacc2153269..835fc83376bd 100644
--- a/plugins/kotlin/maven/kotlin.maven.iml
+++ b/plugins/kotlin/maven/kotlin.maven.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/native/kotlin.native.iml b/plugins/kotlin/native/kotlin.native.iml
index e42a5d793d4e..b934bf978e59 100644
--- a/plugins/kotlin/native/kotlin.native.iml
+++ b/plugins/kotlin/native/kotlin.native.iml
@@ -24,7 +24,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
diff --git a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
index ee5f92f9face..3077394018fe 100644
--- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
+++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test-junit" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/project-wizard/cli/kotlin.project-wizard.cli.iml b/plugins/kotlin/project-wizard/cli/kotlin.project-wizard.cli.iml
index a80d14d9b547..0c7addff1712 100644
--- a/plugins/kotlin/project-wizard/cli/kotlin.project-wizard.cli.iml
+++ b/plugins/kotlin/project-wizard/cli/kotlin.project-wizard.cli.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable-jvm" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml b/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
index 7b66db31cc23..088c80edb2ad 100644
--- a/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
+++ b/plugins/kotlin/project-wizard/core/kotlin.project-wizard.core.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable-jvm" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
diff --git a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
index 514ab4b82465..0a1b49e99d94 100644
--- a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
+++ b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
@@ -23,7 +23,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable-jvm" level="project" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/repl/kotlin.repl.iml b/plugins/kotlin/repl/kotlin.repl.iml
index 95029a46e942..d83ee849f97c 100644
--- a/plugins/kotlin/repl/kotlin.repl.iml
+++ b/plugins/kotlin/repl/kotlin.repl.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-script-util" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
diff --git a/plugins/kotlin/scripting-support/kotlin.scripting-support.iml b/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
index 9bb845d19702..a8ec34560927 100644
--- a/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
+++ b/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/scripting/kotlin.scripting.iml b/plugins/kotlin/scripting/kotlin.scripting.iml
index 1fee5162544a..c0f4c95ee00a 100644
--- a/plugins/kotlin/scripting/kotlin.scripting.iml
+++ b/plugins/kotlin/scripting/kotlin.scripting.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
   </component>
diff --git a/plugins/kotlin/test-framework/kotlin.test-framework.iml b/plugins/kotlin/test-framework/kotlin.test-framework.iml
index 0d1d3669cf63..12361b72b36b 100644
--- a/plugins/kotlin/test-framework/kotlin.test-framework.iml
+++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml
@@ -21,7 +21,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler" level="project" />
diff --git a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
index 2f19abef152d..2dc6b886c721 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
@@ -23,7 +23,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
diff --git a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
index 48e0886daee2..1cc9fc0df7ad 100644
--- a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
+++ b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
@@ -22,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
diff --git a/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml b/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
index 43a7b1b7cf8e..d00086542862 100644
--- a/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
+++ b/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
@@ -22,7 +22,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-stdlib-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
     <orderEntry type="library" name="kotlinc.noarg-compiler-plugin" level="project" />
     <orderEntry type="library" name="kotlinc.parcelize-compiler-plugin" level="project" />