diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index fef24b790e5..2a3986fbb05 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))
     compile(project(":plugins:android-extensions-compiler"))
-    compile(project(":kotlin-scripting-idea-plugin"))
+    compile(project(":kotlin-scripting-idea"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle
index 4d9bbb28ea5..2ec6648c5da 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     runtime project(path: ':kotlin-compiler-runner', configuration: 'runtimeJar')
     runtime project(':kotlin-reflect')
     runtime project(':kotlin-scripting-common')
-    runtime project(':kotlin-scripting-compiler-plugin')
+    runtime project(':kotlin-scripting-compiler')
     runtime project(':kotlin-scripting-jvm')
 
     // com.android.tools.build:gradle has ~50 unneeded transitive dependencies
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index 216f3e39d1c..112139208f0 100644
--- a/libraries/tools/kotlin-maven-plugin/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-scripting-compiler-plugin</artifactId>
+            <artifactId>kotlin-scripting-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/plugins/scripting/scripting-gradle/build.gradle.kts b/plugins/scripting/scripting-gradle/build.gradle.kts
index e1d5db6d77a..7f00907efdc 100644
--- a/plugins/scripting/scripting-gradle/build.gradle.kts
+++ b/plugins/scripting/scripting-gradle/build.gradle.kts
@@ -13,8 +13,8 @@ val packedJars by configurations.creating
 
 dependencies {
     compile(project(":kotlin-gradle-plugin-api"))
-    compileOnly(project(":kotlin-scripting-compiler-plugin"))
-    packedJars(project(":kotlin-scripting-compiler-plugin")) { isTransitive = false }
+    compileOnly(project(":kotlin-scripting-compiler"))
+    packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
 }
diff --git a/plugins/scripting/scripting-gradle/plugin-marker/build.gradle b/plugins/scripting/scripting-gradle/plugin-marker/build.gradle
index 630ec691435..1f04f9e6d6a 100644
--- a/plugins/scripting/scripting-gradle/plugin-marker/build.gradle
+++ b/plugins/scripting/scripting-gradle/plugin-marker/build.gradle
@@ -1,3 +1,3 @@
 apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
 
-pluginMarkerProject('kotlin-scripting-gradle-plugin')
+pluginMarkerProject('kotlin-scripting-gradle')
diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts
index c965b9c539f..3de83d9333b 100644
--- a/plugins/scripting/scripting-idea/build.gradle.kts
+++ b/plugins/scripting/scripting-idea/build.gradle.kts
@@ -4,7 +4,7 @@ description = "Kotlin Scripting IDEA Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-scripting-compiler-plugin"))
+    compile(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {
diff --git a/settings.gradle b/settings.gradle
index c1675fa5f7e..b34eb020a5e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -153,9 +153,9 @@ include ":kotlin-build-common",
         ":kotlin-scripting-common",
         ":kotlin-scripting-jvm",
         ":kotlin-scripting-jvm-host",
-        ":kotlin-scripting-compiler-plugin",
-        ":kotlin-scripting-idea-plugin",
-        ":kotlin-scripting-gradle-plugin",
+        ":kotlin-scripting-compiler",
+        ":kotlin-scripting-idea",
+        ":kotlin-scripting-gradle",
         ":examples:scripting-jvm-simple-script",
         ":examples:scripting-jvm-maven-deps",
         ":pill:generate-all-tests",
@@ -165,7 +165,7 @@ include ":kotlin-build-common",
         ':kotlin-gradle-plugin:plugin-marker',
         ':kotlin-allopen:plugin-marker',
         ':kotlin-noarg:plugin-marker',
-        ':kotlin-scripting-gradle-plugin:plugin-marker',
+        ':kotlin-scripting-gradle:plugin-marker',
         ":test-instrumenter"
 
 def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
@@ -255,9 +255,9 @@ project(':kotlin-annotations-android').projectDir = "$rootDir/libraries/tools/ko
 project(':kotlin-scripting-common').projectDir = "$rootDir/libraries/scripting/common" as File
 project(':kotlin-scripting-jvm').projectDir = "$rootDir/libraries/scripting/jvm" as File
 project(':kotlin-scripting-jvm-host').projectDir = "$rootDir/libraries/scripting/jvm-host" as File
-project(':kotlin-scripting-compiler-plugin').projectDir = "$rootDir/plugins/scripting/scripting-cli" as File
-project(':kotlin-scripting-idea-plugin').projectDir = "$rootDir/plugins/scripting/scripting-idea" as File
-project(':kotlin-scripting-gradle-plugin').projectDir = "$rootDir/plugins/scripting/scripting-gradle" as File
+project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-cli" as File
+project(':kotlin-scripting-idea').projectDir = "$rootDir/plugins/scripting/scripting-idea" as File
+project(':kotlin-scripting-gradle').projectDir = "$rootDir/plugins/scripting/scripting-gradle" as File
 project(':examples:scripting-jvm-simple-script').projectDir = "$rootDir/libraries/examples/scripting/jvm-simple-script" as File
 project(':examples:scripting-jvm-maven-deps').projectDir = "$rootDir/libraries/examples/scripting/jvm-maven-deps" as File
 project(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate-all-tests" as File
@@ -266,5 +266,5 @@ project(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate
 project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-gradle-plugin/plugin-marker")
 project(':kotlin-allopen:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-allopen/plugin-marker")
 project(':kotlin-noarg:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-noarg/plugin-marker")
-project(':kotlin-scripting-gradle-plugin:plugin-marker').projectDir = file("$rootDir/plugins/scripting/scripting-gradle/plugin-marker")
+project(':kotlin-scripting-gradle:plugin-marker').projectDir = file("$rootDir/plugins/scripting/scripting-gradle/plugin-marker")