diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index ba115e786e8..8c9c9355cbb 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
     testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":kotlin-script-util"))
     testCompileOnly(project(":kotlin-reflect-api"))
     otherCompilerModules.forEach {
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 36dd23be2c5..31dd83f0d83 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))
     testCompile(project(":core:deserialization"))
@@ -42,7 +42,7 @@ dependencies {
     testCompileOnly(project(":plugins:android-extensions-compiler"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":compiler:tests-common-jvm6"))
-    testCompile(project(":kotlin-scripting-compiler-impl"))
+    testCompile(project(":kotlin-scripting-compiler-impl-unshaded"))
     testCompile(commonDep("junit:junit"))
     testCompile(androidDxJar()) { isTransitive = false }
     testCompile(commonDep("com.android.tools:r8"))
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 9af9d409746..9423e70bf3f 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(projectTests(":generators:test-generator"))
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
index 4bdae5d0340..e229885a816 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
@@ -70,11 +70,11 @@ object PathUtil {
     const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar"
     const val KOTLIN_DAEMON_NAME = "kotlin-daemon"
     const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar"
-    const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler"
+    const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler-unshaded"
     const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar"
     const val KOTLINX_COROUTINES_CORE_NAME = "kotlinx-coroutines-core"
     const val KOTLINX_COROUTINES_CORE_JAR = "$KOTLINX_COROUTINES_CORE_NAME.jar"
-    const val KOTLIN_SCRIPTING_COMPILER_IMPL_NAME = "kotlin-scripting-compiler-impl"
+    const val KOTLIN_SCRIPTING_COMPILER_IMPL_NAME = "kotlin-scripting-compiler-impl-unshaded"
     const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "$KOTLIN_SCRIPTING_COMPILER_IMPL_NAME.jar"
     const val JS_ENGINES_NAME = "js.engines"
     const val JS_ENGINES_JAR = "$JS_ENGINES_NAME.jar"
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 72c32049adf..bebb7a0fd52 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -136,7 +136,7 @@ dependencies {
     testRuntime(project(":kotlin-noarg-compiler-plugin"))
     testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
     testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-compiler-impl"))
+    testRuntime(project(":kotlin-scripting-compiler-impl-unshaded"))
     testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
     testRuntime(project(":kotlinx-serialization-compiler-plugin"))
     testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 4ce1268fdb8..4e2850ab572 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     compile(project(":idea:idea-jps-common"))
     compile(project(":kotlin-util-klib-metadata"))
     compile(project(":plugins:android-extensions-compiler"))
-    compile(project(":kotlin-scripting-compiler-impl"))
+    compile(project(":kotlin-scripting-compiler-impl-unshaded"))
     compile(project(":compiler:fir:raw-fir:psi2fir"))
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:resolve"))
diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index 9bb8fc4d97f..6ad7fc90494 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
     testRuntime(project(":kotlin-noarg-compiler-plugin"))
     testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
     testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-compiler-impl"))
+    testRuntime(project(":kotlin-scripting-compiler-impl-unshaded"))
     testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
     testRuntime(project(":kotlinx-serialization-compiler-plugin"))
     testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts
index 8ea0e1daebb..6b232b33069 100644
--- a/idea/scripting-support/build.gradle.kts
+++ b/idea/scripting-support/build.gradle.kts
@@ -21,8 +21,8 @@ dependencies {
     testRuntime(project(":kotlin-noarg-compiler-plugin"))
     testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
     testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-compiler"))
-    testRuntime(project(":kotlin-scripting-compiler-impl"))
+    testRuntime(project(":kotlin-scripting-compiler-unshaded"))
+    testRuntime(project(":kotlin-scripting-compiler-impl-unshaded"))
     testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
     testRuntime(project(":kotlinx-serialization-compiler-plugin"))
     testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
index 5b5926a1a25..2b99409465e 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testRuntime(project(":kotlin-reflect"))
     compilerClasspath(project(":kotlin-compiler-embeddable"))
-    compilerClasspath(project(":kotlin-scripting-compiler-embeddable"))
+    compilerClasspath(project(":kotlin-scripting-compiler"))
     compilerClasspath(project(":kotlin-reflect"))
     compilerClasspath(kotlinStdlib())
     compilerClasspath(project(":kotlin-script-runtime"))
diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
index 3e49cfde6fe..6fcad8b7192 100644
--- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
@@ -16,14 +16,14 @@ dependencies {
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-compiler-embeddable"))
     compile(project(":kotlin-script-util"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
     testRuntime(project(":kotlin-reflect"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build)
-    testRuntime(project(":kotlin-scripting-compiler-embeddable"))
+    testRuntime(project(":kotlin-scripting-compiler"))
 }
 
 projectTest()
diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
index 25f0f29f485..280e2f8d3c8 100644
--- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 
 dependencies {
     compile(project(":examples:scripting-jvm-simple-script"))
-    compileOnly(project(":kotlin-scripting-jvm-host"))
+    compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler-embeddable"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
-    testRuntimeOnly(project(":kotlin-scripting-jvm-host-embeddable"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler"))
+    testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
     testCompile(commonDep("junit"))
diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
index 39c0a3d312a..b60c74f6129 100644
--- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -5,14 +5,14 @@ plugins {
 
 dependencies {
     compile(project(":examples:scripting-jvm-maven-deps"))
-    compile(project(":kotlin-scripting-jvm-host"))
+    compile(project(":kotlin-scripting-jvm-host-unshaded"))
     compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":compiler:util"))
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
 
     testCompile(commonDep("junit"))
 }
diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
index 0387a92d162..ea717428af1 100644
--- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
 
 dependencies {
     compile(project(":examples:scripting-jvm-simple-script"))
-    compile(project(":kotlin-scripting-jvm-host"))
+    compile(project(":kotlin-scripting-jvm-host-unshaded"))
     compile(project(":kotlin-script-util"))
     testRuntimeOnly(project(":kotlin-compiler"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testCompile(commonDep("junit"))
 }
diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts
index 9788cccf700..720cfd6f7ef 100644
--- a/libraries/scripting/js-test/build.gradle.kts
+++ b/libraries/scripting/js-test/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 
     testCompile(project(":kotlin-scripting-js"))
     testCompile(project(":compiler:plugin-api"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:backend.js"))
     testCompile(project(":js:js.engines"))
diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts
index 5cf02a12683..3827a3433c3 100644
--- a/libraries/scripting/jsr223-embeddable/build.gradle.kts
+++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts
@@ -9,14 +9,14 @@ plugins { java }
 val packedJars by configurations.creating
 
 dependencies {
-    packedJars(project(":kotlin-scripting-jsr223")) { isTransitive = false }
+    packedJars(project(":kotlin-scripting-jsr223-unshaded")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
     runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
-    runtime(project(":kotlin-scripting-jvm-host-embeddable"))
+    runtime(project(":kotlin-scripting-jvm-host"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts
index 4e851b93f72..5ed4b6f89de 100644
--- a/libraries/scripting/jsr223-test/build.gradle.kts
+++ b/libraries/scripting/jsr223-test/build.gradle.kts
@@ -9,16 +9,16 @@ val embeddableTestRuntime by configurations.creating
 
 dependencies {
     testCompile(commonDep("junit"))
-    testCompileOnly(project(":kotlin-scripting-jvm-host"))
+    testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":core:util.runtime"))
     
-    testRuntimeOnly(project(":kotlin-scripting-jsr223"))
+    testRuntimeOnly(project(":kotlin-scripting-jsr223-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
     
     embeddableTestRuntime(commonDep("junit"))
-    embeddableTestRuntime(project(":kotlin-scripting-jsr223-embeddable"))
+    embeddableTestRuntime(project(":kotlin-scripting-jsr223"))
     embeddableTestRuntime(testSourceSet.output)
 }
 
diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts
index 916036ae4f4..dc5bf2175e9 100644
--- a/libraries/scripting/jsr223/build.gradle.kts
+++ b/libraries/scripting/jsr223/build.gradle.kts
@@ -12,8 +12,8 @@ dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-jvm-host"))
-    compile(project(":kotlin-scripting-compiler"))
+    compile(project(":kotlin-scripting-jvm-host-unshaded"))
+    compile(project(":kotlin-scripting-compiler-unshaded"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep())
diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts
index 9a94196ee43..f9d32a92b77 100644
--- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts
+++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts
@@ -5,13 +5,13 @@ description = "Kotlin Scripting JVM host (for using with embeddable compiler)"
 plugins { java }
 
 dependencies {
-    embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
+    embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
     runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts
index 44c8d1d7b4d..201e95fb669 100644
--- a/libraries/scripting/jvm-host-test/build.gradle.kts
+++ b/libraries/scripting/jvm-host-test/build.gradle.kts
@@ -19,16 +19,16 @@ dependencies {
         allTestsRuntime(intellijDep()) { includeJars("openapi") }
     }
     allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
-    testCompile(project(":kotlin-scripting-jvm-host"))
+    testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     
-    embeddableTestRuntime(project(":kotlin-scripting-jvm-host-embeddable"))
+    embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
     embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
     embeddableTestRuntime(project(":kotlin-test:kotlin-test-junit"))
     embeddableTestRuntime(projectTests(":compiler:tests-common")) { isTransitive = false }
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index 1003ac5aa60..15965b590a1 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -13,12 +13,12 @@ dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compileOnly(project(":kotlin-scripting-compiler"))
+    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     publishedRuntime(project(":kotlin-compiler"))
-    publishedRuntime(project(":kotlin-scripting-compiler"))
+    publishedRuntime(project(":kotlin-scripting-compiler-unshaded"))
     publishedRuntime(project(":kotlin-reflect"))
     publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
 }
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
index 25c49129c84..17b81a13b9e 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
@@ -26,10 +26,10 @@ internal const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
 internal const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
 internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"
 internal const val TROVE4J_JAR = "trove4j.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler-embeddable.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl-embeddable.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler-unshaded.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl-unshaded.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl.jar"
 internal const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar"
 internal const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.jar"
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index f7030e6d4c2..2d69a429dda 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -126,8 +126,8 @@ tasks.withType<Test> {
         ":kotlin-script-runtime:install",
         ":kotlin-scripting-common:install",
         ":kotlin-scripting-jvm:install",
-        ":kotlin-scripting-compiler-embeddable:install",
-        ":kotlin-scripting-compiler-impl-embeddable:install",
+        ":kotlin-scripting-compiler:install",
+        ":kotlin-scripting-compiler-impl:install",
         ":kotlin-test-js-runner:install",
         ":kotlin-source-map-loader:install"
     )
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index fa3307ebb40..5568ea3e58d 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
     compileOnly(project(":kotlin-compiler-runner"))
     compileOnly(project(":kotlin-annotation-processing"))
     compileOnly(project(":kotlin-annotation-processing-gradle"))
-    compileOnly(project(":kotlin-scripting-compiler"))
+    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
     compileOnly(project(":kotlin-gradle-statistics"))
     embedded(project(":kotlin-gradle-statistics"))
 
@@ -64,8 +64,8 @@ dependencies {
     runtime(projectRuntimeJar(":kotlin-annotation-processing-gradle"))
     runtime(projectRuntimeJar(":kotlin-android-extensions"))
     runtime(projectRuntimeJar(":kotlin-compiler-runner"))
-    runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable"))
-    runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable"))
+    runtime(projectRuntimeJar(":kotlin-scripting-compiler"))
+    runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl"))
     runtime(project(":kotlin-reflect"))
 
     jarContents(compileOnly(intellijDep()) {
diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
index 340ba3f81a6..6c5763841a3 100644
--- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
@@ -8,9 +8,9 @@ plugins {
 dependencies {
     testCompile(project(":kotlin-main-kts"))
     testCompileOnly(project(":compiler:cli"))
-    testCompileOnly(project(":kotlin-scripting-jvm-host"))
+    testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompile(commonDep("junit"))
-    testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
+    testCompile(projectTests(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts
index 19dc6208446..367de0214b1 100644
--- a/libraries/tools/kotlin-main-kts/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts/build.gradle.kts
@@ -27,15 +27,15 @@ val embedded by configurations
 dependencies {
     compileOnly("org.apache.ivy:ivy:2.5.0")
     compileOnly(project(":compiler:cli-common"))
-    compileOnly(project(":kotlin-scripting-jvm-host"))
+    compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     compileOnly(project(":kotlin-scripting-dependencies"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-jvm-host-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
+    runtime(project(":kotlin-scripting-jvm-host"))
     runtime(project(":kotlin-reflect"))
     embedded(project(":kotlin-scripting-common")) { isTransitive = false }
     embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
-    embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
+    embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
     embedded(project(":kotlin-scripting-dependencies")) { isTransitive = false }
     embedded("org.apache.ivy:ivy:2.5.0")
     embedded(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index 299ecf4d3a7..9d594909c0b 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</artifactId>
+            <artifactId>kotlin-scripting-compiler-unshaded</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index a0b9c52858a..131ad92465b 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":daemon-common"))
-    compileOnly(project(":kotlin-scripting-compiler"))
+    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
@@ -22,7 +22,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testRuntime(project(":kotlin-reflect"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     testRuntime("org.sonatype.aether:aether-api:1.13.1")
diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
index 59a9c621be6..049c13d4a7b 100644
--- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
@@ -43,9 +43,9 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
             ":kotlin-daemon-embeddable",
             ":kotlin-compiler-embeddable",
             ":kotlin-android-extensions",
-            ":kotlin-scripting-compiler-embeddable",
-            ":kotlin-scripting-compiler-impl-embeddable",
-            ":kotlin-scripting-jvm-host-embeddable"
+            ":kotlin-scripting-compiler",
+            ":kotlin-scripting-compiler-impl",
+            ":kotlin-scripting-jvm-host"
         )
 
         private val MAPPED_LIBRARIES = mapOf(
diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
index 7a439389614..82319768543 100644
--- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
@@ -6,8 +6,8 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
 
 val packedJars by configurations.creating
 dependencies {
-    packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
-    runtime(project(":kotlin-scripting-compiler-impl-embeddable"))
+    packedJars(project(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
+    runtime(project(":kotlin-scripting-compiler-impl"))
     runtime(kotlinStdlib())
 }
 
diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
index 4a564c34027..f0f68f13869 100644
--- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
@@ -6,7 +6,7 @@ description = "Kotlin Compiler Infrastructure for Scripting for embeddable compi
 
 val packedJars by configurations.creating
 dependencies {
-    packedJars(project(":kotlin-scripting-compiler-impl")) { isTransitive = false }
+    packedJars(project(":kotlin-scripting-compiler-impl-unshaded")) { isTransitive = false }
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(kotlinStdlib())
diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts
index 34fbab96f6d..327059e74dd 100644
--- a/plugins/scripting/scripting-compiler/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     compile(project(":kotlin-scripting-js"))
     compile(project(":kotlin-util-klib"))
     compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-compiler-impl"))
+    compile(project(":kotlin-scripting-compiler-impl-unshaded"))
     compile(kotlinStdlib())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
diff --git a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
index 925b8a36922..c3ef452fb93 100644
--- a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
@@ -3,14 +3,14 @@ description = "Kotlin Scripting Compiler extension providing code completion and
 plugins { java }
 
 dependencies {
-    embedded(project(":kotlin-scripting-ide-services")) { isTransitive = false }
+    embedded(project(":kotlin-scripting-ide-services-unshaded")) { isTransitive = false }
     embedded(project(":idea:ide-common")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
     runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {
diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
index df01199bffa..9b6a32f5410 100644
--- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
@@ -14,15 +14,15 @@ val embeddableTestRuntime by configurations.creating {
 
 dependencies {
     allTestsRuntime(commonDep("junit"))
-    testCompile(project(":kotlin-scripting-ide-services"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-ide-services-unshaded"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":compiler:cli-common"))
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     testRuntimeOnly(project(":idea:ide-common")) { isTransitive = false }
 
-    embeddableTestRuntime(project(":kotlin-scripting-ide-services-embeddable"))
+    embeddableTestRuntime(project(":kotlin-scripting-ide-services"))
     embeddableTestRuntime(project(":kotlin-compiler-embeddable"))
     embeddableTestRuntime(testSourceSet.output)
 }
diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts
index 312519a5a6a..1f6d11de767 100644
--- a/plugins/scripting/scripting-ide-services/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services/build.gradle.kts
@@ -16,12 +16,12 @@ dependencies {
     compileOnly(project(":idea:ide-common"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compileOnly(project(":kotlin-scripting-compiler"))
+    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     publishedRuntime(project(":kotlin-compiler"))
-    publishedRuntime(project(":kotlin-scripting-compiler"))
+    publishedRuntime(project(":kotlin-scripting-compiler-unshaded"))
     publishedRuntime(project(":kotlin-reflect"))
     publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
 }
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index f0ec0b7c825..3c87f65cac8 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompilerClasspath(project(":kotlin-compiler"))
-    testCompilerClasspath(project(":kotlin-scripting-compiler"))
+    testCompilerClasspath(project(":kotlin-scripting-compiler-unshaded"))
     testCompilerClasspath(project(":kotlin-daemon"))
     testCompilationClasspath(kotlinStdlib())
     testCompilationClasspath(project(":kotlin-script-runtime"))
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 15b2a506fd3..1a42ae9ec3b 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -93,8 +93,8 @@ val distLibraryProjects = listOfNotNull(
     ":kotlin-runner",
     ":kotlin-script-runtime",
     ":kotlin-scripting-common",
-    ":kotlin-scripting-compiler",
-    ":kotlin-scripting-compiler-impl",
+    ":kotlin-scripting-compiler-unshaded",
+    ":kotlin-scripting-compiler-impl-unshaded",
     ":kotlin-scripting-jvm",
     ":kotlin-scripting-js",
     ":js:js.engines",
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 0b7e2df0b1c..3cabe8f5f5c 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -115,7 +115,7 @@ val libraryProjects = listOf(
     ":kotlin-script-runtime",
     ":kotlin-script-util",
     ":kotlin-scripting-common",
-    ":kotlin-scripting-compiler-impl",
+    ":kotlin-scripting-compiler-impl-unshaded",
     ":kotlin-scripting-intellij",
     ":kotlin-scripting-jvm",
     ":kotlin-util-io",
diff --git a/settings.gradle b/settings.gradle
index cdc0df76d7d..37e4d085ed1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -262,22 +262,22 @@ include ":kotlin-build-common",
         ':kotlin-scripting-js',
         ':kotlin-scripting-js-test',
         ":kotlin-scripting-jvm",
-        ":kotlin-scripting-jvm-host",
+        ":kotlin-scripting-jvm-host-unshaded",
         ":kotlin-scripting-jvm-host-test",
-        ":kotlin-scripting-jvm-host-embeddable",
+        ":kotlin-scripting-jvm-host",
         ":kotlin-scripting-intellij",
+        ":kotlin-scripting-compiler-unshaded",
         ":kotlin-scripting-compiler",
-        ":kotlin-scripting-compiler-embeddable",
+        ":kotlin-scripting-compiler-impl-unshaded",
         ":kotlin-scripting-compiler-impl",
-        ":kotlin-scripting-compiler-impl-embeddable",
-        ":kotlin-scripting-ide-services",
+        ":kotlin-scripting-ide-services-unshaded",
         ":kotlin-scripting-ide-services-test",
-        ":kotlin-scripting-ide-services-embeddable",
+        ":kotlin-scripting-ide-services",
         ":kotlin-scripting-dependencies",
         ":kotlin-scripting-dependencies-maven",
-        ":kotlin-scripting-jsr223",
+        ":kotlin-scripting-jsr223-unshaded",
         ":kotlin-scripting-jsr223-test",
-        ":kotlin-scripting-jsr223-embeddable",
+        ":kotlin-scripting-jsr223",
         ":kotlin-scripting-idea",
         ":kotlin-main-kts",
         ":kotlin-main-kts-test",
@@ -479,22 +479,22 @@ project(':kotlin-scripting-common').projectDir = "$rootDir/libraries/scripting/c
 project(':kotlin-scripting-js').projectDir = "$rootDir/libraries/scripting/js" as File
 project(':kotlin-scripting-js-test').projectDir = "$rootDir/libraries/scripting/js-test" 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-jvm-host-unshaded').projectDir = "$rootDir/libraries/scripting/jvm-host" as File
 project(':kotlin-scripting-jvm-host-test').projectDir = "$rootDir/libraries/scripting/jvm-host-test" as File
-project(':kotlin-scripting-jvm-host-embeddable').projectDir = "$rootDir/libraries/scripting/jvm-host-embeddable" as File
+project(':kotlin-scripting-jvm-host').projectDir = "$rootDir/libraries/scripting/jvm-host-embeddable" as File
 project(':kotlin-scripting-dependencies').projectDir = "$rootDir/libraries/scripting/dependencies" as File
 project(':kotlin-scripting-dependencies-maven').projectDir = "$rootDir/libraries/scripting/dependencies-maven" as File
-project(':kotlin-scripting-jsr223').projectDir = "$rootDir/libraries/scripting/jsr223" as File
+project(':kotlin-scripting-jsr223-unshaded').projectDir = "$rootDir/libraries/scripting/jsr223" as File
 project(':kotlin-scripting-jsr223-test').projectDir = "$rootDir/libraries/scripting/jsr223-test" as File
-project(':kotlin-scripting-jsr223-embeddable').projectDir = "$rootDir/libraries/scripting/jsr223-embeddable" as File
+project(':kotlin-scripting-jsr223').projectDir = "$rootDir/libraries/scripting/jsr223-embeddable" as File
 project(':kotlin-scripting-intellij').projectDir = "$rootDir/libraries/scripting/intellij" as File
-project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File
-project(':kotlin-scripting-compiler-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-compiler-embeddable" as File
-project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File
-project(':kotlin-scripting-compiler-impl-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl-embeddable" as File
-project(':kotlin-scripting-ide-services').projectDir = "$rootDir/plugins/scripting/scripting-ide-services" as File
+project(':kotlin-scripting-compiler-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File
+project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler-embeddable" as File
+project(':kotlin-scripting-compiler-impl-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File
+project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl-embeddable" as File
+project(':kotlin-scripting-ide-services-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-ide-services" as File
 project(':kotlin-scripting-ide-services-test').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-test" as File
-project(':kotlin-scripting-ide-services-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-embeddable" as File
+project(':kotlin-scripting-ide-services').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-embeddable" as File
 project(':kotlin-scripting-idea').projectDir = "$rootDir/plugins/scripting/scripting-idea" as File
 project(':kotlin-main-kts').projectDir = "$rootDir/libraries/tools/kotlin-main-kts" as File
 project(':kotlin-main-kts-test').projectDir = "$rootDir/libraries/tools/kotlin-main-kts-test" as File