diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 6336f65447c..40b5ddf7548 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -46,6 +46,8 @@ val testDistProjects = listOf(
         ":kotlin-stdlib",
         ":kotlin-stdlib-jre7",
         ":kotlin-stdlib-jre8",
+        ":kotlin-stdlib-jdk7",
+        ":kotlin-stdlib-jdk8",
         ":kotlin-stdlib-js",
         ":kotlin-reflect",
         ":kotlin-test:kotlin-test-jvm",
diff --git a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected b/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected
index a9eb220ec49..bb97331e287 100644
--- a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected
+++ b/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected
@@ -3,8 +3,8 @@ Buildfile: [TestData]/build.xml
 
 build:
   [kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/test.jar]
-  [kotlinc] [CompilerLib]/kotlin-stdlib-jre7.jar: warning: kotlin-stdlib-jre7 is deprecated. Please use kotlin-stdlib-jdk7 instead
-  [kotlinc] [CompilerLib]/kotlin-stdlib-jre8.jar: warning: kotlin-stdlib-jre8 is deprecated. Please use kotlin-stdlib-jdk8 instead
+  [kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre7.jar: warning: kotlin-stdlib-jre7 is deprecated. Please use kotlin-stdlib-jdk7 instead
+  [kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre8.jar: warning: kotlin-stdlib-jre8 is deprecated. Please use kotlin-stdlib-jdk8 instead
 
 BUILD SUCCESSFUL
 Total time: [time]
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java
index cb3d216988d..cff8fd83d4b 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java
@@ -42,8 +42,8 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase {
                 "-Dkotlin.lib=" + KotlinIntegrationTestBase.getCompilerLib(),
                 "-Dkotlin.runtime.jar=" + ForTestCompileRuntime.runtimeJarForTests().getAbsolutePath(),
                 "-Dkotlin.reflect.jar=" + ForTestCompileRuntime.reflectJarForTests().getAbsolutePath(),
-                "-Dkotlin.stdlib.jre7.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jre7.jar").getAbsolutePath(),
-                "-Dkotlin.stdlib.jre8.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jre8.jar").getAbsolutePath(),
+                "-Dkotlin.stdlib.jre7.jar=" + new File("dist/kotlin-stdlib-jre7.jar").getAbsolutePath(),
+                "-Dkotlin.stdlib.jre8.jar=" + new File("dist/kotlin-stdlib-jre8.jar").getAbsolutePath(),
                 "-Dkotlin.stdlib.jdk7.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk7.jar").getAbsolutePath(),
                 "-Dkotlin.stdlib.jdk8.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk8.jar").getAbsolutePath(),
                 "-Dtest.data=" + testDataDir,
diff --git a/libraries/stdlib/samples/build.gradle b/libraries/stdlib/samples/build.gradle
index 27bccc28aa1..05cbcdb63ca 100644
--- a/libraries/stdlib/samples/build.gradle
+++ b/libraries/stdlib/samples/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    compile project(':kotlin-stdlib-jre8')
+    compile project(':kotlin-stdlib-jdk8')
     testCompile project(':kotlin-test:kotlin-test-junit')
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
index e0b74faa10e..417ad523560 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     testRuntime (project(path: ':kotlin-gradle-plugin-test-utils-embeddable', configuration: 'runtimeJar'))
 
     testCompile project(path: ':examples:annotation-processor-example')
-    testCompile project(':kotlin-stdlib-jre8')
+    testCompile project(':kotlin-stdlib-jdk8')
     testCompile project(':kotlin-reflect')
     testCompile project(':kotlin-android-extensions')
 
@@ -55,7 +55,7 @@ test.dependsOn(":kotlin-allopen:install",
                ":kotlin-annotation-processing-gradle:install",
                ":kotlin-test:kotlin-test-jvm:install",
                ":kotlin-gradle-subplugin-example:install",
-               ":kotlin-stdlib-jre8:install",
+               ":kotlin-stdlib-jdk8:install",
                ":examples:annotation-processor-example:install",
                ":kotlin-scripting-common:install",
                ":kotlin-scripting-jvm:install",
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt18799/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt18799/app/build.gradle
index c54b3463c4d..e634ff94502 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt18799/app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt18799/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'kotlin'
 apply plugin: 'kotlin-kapt'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     
     compile 'com.google.dagger:dagger:2.9'
     kapt 'com.google.dagger:dagger-compiler:2.9'
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/allopenPluginsDsl/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/allopenPluginsDsl/build.gradle
index 83f6b157d04..26c7f5587ee 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/allopenPluginsDsl/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/allopenPluginsDsl/build.gradle
@@ -13,6 +13,6 @@ allOpen {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testCompile "junit:junit:4.12"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle
index a76f042324c..25453af6be8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testCompile "junit:junit:4.12"
 }
 
diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml
index 6a503b40654..44e79fac1af 100644
--- a/libraries/tools/kotlin-maven-plugin-test/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml
@@ -130,8 +130,6 @@
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-js:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version}</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-stdlib-jre7:${project.version}</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-stdlib-jre8:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-reflect:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-test-common:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-test:${project.version}</artifact>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml
index ccb709aa14d..d7cda93d4fd 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/pom.xml
@@ -29,16 +29,6 @@
             <artifactId>kotlin-stdlib-common</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre7</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk7</artifactId>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
index f63b9d71244..60db6424443 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
@@ -23,8 +23,6 @@ import java.util.jar.Manifest
 val LIBRARIES = listOf(
         "kotlin-stdlib",
         "kotlin-stdlib-common",
-        "kotlin-stdlib-jre7",
-        "kotlin-stdlib-jre8",
         "kotlin-stdlib-jdk7",
         "kotlin-stdlib-jdk8",
         "kotlin-reflect",