diff --git a/build.gradle.kts b/build.gradle.kts
index 859ec883cd0..b77922c4724 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -306,7 +306,7 @@ tasks {
 
     "android-tests" {
         dependsOn("dist")
-        dependsOn(":plugins:android-extensions-idea:test",
+        dependsOn(":plugins:android-extensions-ide:test",
                   ":idea:idea-android:test",
                   ":kotlin-annotation-processing:test",
                   ":compiler:android-tests:test")
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index c7b94b922c5..1644a76e7c4 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     compile(projectTests(":idea:idea-android"))
     compile(projectTests(":jps-plugin"))
     compile(projectTests(":plugins:plugins-tests"))
-    compile(projectTests(":plugins:android-extensions-idea"))
+    compile(projectTests(":plugins:android-extensions-ide"))
     compile(projectTests(":kotlin-annotation-processing"))
     compile(projectTests(":plugins:uast-kotlin"))
     compile(projectTests(":js:js.tests"))
diff --git a/gradle/project-schema.json b/gradle/project-schema.json
index be8b84c9662..2bf512b6a47 100644
--- a/gradle/project-schema.json
+++ b/gradle/project-schema.json
@@ -3534,7 +3534,7 @@
             "signing": "org.gradle.plugins.signing.SigningExtension"
         }
     },
-    ":plugins:android-extensions-idea": {
+    ":plugins:android-extensions-ide": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
             "java": "org.gradle.api.plugins.JavaPluginConvention"
diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts
index 70278bf02bd..a72e6a0bd2d 100644
--- a/idea-runner/build.gradle.kts
+++ b/idea-runner/build.gradle.kts
@@ -23,7 +23,7 @@ val runIde by task<JavaExec> {
 
     workingDir = File(rootDir, "ideaSDK", "bin")
 
-    val pluginPath = File(rootDir, "dist", "artifacts", "Kotlin")
+    val ideaPluginDir: File by rootProject.extra
 
     jvmArgs(
             "-Xmx1250m",
@@ -37,7 +37,7 @@ val runIde by task<JavaExec> {
             "-Dapple.laf.useScreenMenuBar=true",
             "-Dapple.awt.graphics.UseQuartz=true",
             "-Dsun.io.useCanonCaches=false",
-            "-Dplugin.path=${pluginPath.absolutePath}",
+            "-Dplugin.path=${ideaPluginDir.absolutePath}",
             "-Dkotlin.internal.mode.enabled=true",
             "-Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar"
     )
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 43242a0a57c..bfddaf1df74 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
 
     // deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
     testCompile(project(":android-extensions-compiler"))
-    testCompile(project(":plugins:android-extensions-idea")) { isTransitive = false }
+    testCompile(project(":plugins:android-extensions-ide")) { isTransitive = false }
     testCompile(project(":allopen-ide-plugin")) { isTransitive = false }
     testCompile(project(":kotlin-allopen-compiler-plugin"))
     testCompile(project(":noarg-ide-plugin")) { isTransitive = false }
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index 58abc3782b0..2d41224b058 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     testCompile(ideaSdkDeps("gson"))
     testCompile(commonDep("junit:junit"))
 
-    testRuntime(project(":plugins:android-extensions-idea"))
+    testRuntime(project(":plugins:android-extensions-ide"))
     testRuntime(project(":sam-with-receiver-ide-plugin"))
     testRuntime(project(":noarg-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index db7e35aa446..b91c38f074c 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 
     testRuntime(project(":idea:idea-jvm"))
     testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-idea"))
+    testRuntime(project(":plugins:android-extensions-ide"))
     testRuntime(project(":plugins:lint"))
     testRuntime(project(":sam-with-receiver-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 66ea0a75f8b..c5cf7063439 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 
     testRuntime(project(":idea:idea-jvm"))
     testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-idea"))
+    testRuntime(project(":plugins:android-extensions-ide"))
     testRuntime(project(":plugins:lint"))
     testRuntime(project(":sam-with-receiver-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 16d03e85b13..e1e06bfed0a 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -388,7 +388,7 @@
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinBuiltInFileTypeFactory"/>
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinModuleFileFactory"/>
 
-    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar;android-extensions-ide.jar;android-extensions-compiler.jar"/>
+    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-stdlib.jar;kotlin-reflect.jar;kotlin-plugin.jar;android-extensions-ide.jar;android-extensions-compiler.jar"/>
     <compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
     <jps.plugin />
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index baae7b9b908..23a1f3362a3 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testCompile(project(":compiler.tests-common"))
     testRuntime(project(":idea:idea-jvm"))
     testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-idea"))
+    testRuntime(project(":plugins:android-extensions-ide"))
     testRuntime(project(":sam-with-receiver-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
     testRuntime(project(":noarg-ide-plugin"))
diff --git a/plugins/plugins-tests/build.gradle.kts b/plugins/plugins-tests/build.gradle.kts
index f1a7984e32f..7bce509bdc1 100644
--- a/plugins/plugins-tests/build.gradle.kts
+++ b/plugins/plugins-tests/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler.tests-common"))
     testCompile(project(":android-extensions-compiler"))
-    testCompile(project(":plugins:android-extensions-idea"))
+    testCompile(project(":plugins:android-extensions-ide"))
     testCompile(project(":allopen-ide-plugin")) { isTransitive = false }
     testCompile(project(":kotlin-allopen-compiler-plugin"))
     testCompile(project(":noarg-ide-plugin")) { isTransitive = false }
diff --git a/settings.gradle b/settings.gradle
index b16a29efb84..3d92e8751be 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -69,7 +69,7 @@ include ":kotlin-build-common",
         ":j2k",
         ":plugins:lint",
         ":android-extensions-compiler",
-        ":plugins:android-extensions-idea",
+        ":plugins:android-extensions-ide",
         ":plugins:android-extensions-jps",
         ":kotlin-allopen-compiler-plugin",
         ":allopen-ide-plugin",
@@ -159,7 +159,7 @@ project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as
 project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File
 project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File
 project(':android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File
-project(':plugins:android-extensions-idea').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
+project(':plugins:android-extensions-ide').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
 project(':plugins:android-extensions-jps').projectDir = "$rootDir/plugins/android-extensions/android-extensions-jps" as File
 project(':android-lint').projectDir = "$rootDir/prepare/android-lint" as File
 project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index b957ec54285..78e2fb706c3 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
     testCompile(preloadedDeps("kotlinx-coroutines-core"))
 
     testRuntime(projectDist(":kotlin-compiler"))
-    testRuntime(project(":plugins:android-extensions-idea")) { isTransitive = false }
+    testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }
     testRuntime(project(":android-extensions-compiler")) { isTransitive = false }
     testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
     testRuntime(project(":idea:idea-android")) { isTransitive = false }