diff --git a/build.xml b/build.xml
index 858e5c7df76e..1513c211b1a1 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
     </condition>
     <exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
       <arg value="--no-daemon"/>
-      <arg value="setupKotlin"/>
+      <arg value="setupKotlinPlugin"/>
     </exec>
     <propertyset id="intellij.build.properties">
       <propertyref name="build.number"/>
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 61e9df8bbe21..74f6e59fc8ea 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -110,7 +110,7 @@ binding.setVariable("loadProject", {
     bundledKotlinPath = "$home/community/build/dependencies/build/kotlin/Kotlin/kotlinc"
   }
   if (!new File(bundledKotlinPath, "lib/kotlin-runtime.jar").exists()) {
-    projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
+    projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
     return
   }
   setPathVariable("KOTLIN_BUNDLED", bundledKotlinPath)
@@ -159,7 +159,7 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
     kotlinPluginLibPath = "$home/community/build/dependencies/build/kotlin/Kotlin/lib"
   }
   if (!new File(kotlinPluginLibPath, "kotlin-runtime.jar").exists()) {
-    projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module " +
+    projectBuilder.error("Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module " +
                          "to download Kotlin JARs")
     return false
   }
diff --git a/build/update.xml b/build/update.xml
index 2521eeec04dd..14919e3352e4 100644
--- a/build/update.xml
+++ b/build/update.xml
@@ -30,7 +30,7 @@
       </condition>
       <exec executable="${gradle.executable}" dir="${project.home}/build/dependencies" failonerror="true">
         <arg value="--no-daemon"/>
-        <arg value="setupKotlin"/>
+        <arg value="setupKotlinPlugin"/>
       </exec>
       <java failonerror="true" classname="org.apache.tools.ant.Main" fork="true">
         <jvmarg line="-Xms64m -Xmx512m"/>
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
index a201cc319c51..3ea79731081a 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.groovy
@@ -146,7 +146,7 @@ class CompilationContextImpl implements CompilationContext {
     }
     else {
       messages.error(
-        "Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlin` in dependencies module to download Kotlin JARs")
+        "Could not find Kotlin JARs at $kotlinPluginLibPath: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
     }
   }