diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 1fa00a0c885..705fde4d7bd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -528,11 +528,11 @@ open class GradleUtils(val scriptHandler: ScriptHandler, val project: ProjectInt
 }
 
 private fun Project.setAptDirsForSourceSet(kotlinTask: AbstractCompile, sourceSetName: String): File {
-    val aptOutputDir = File(getBuildDir(), "generated/source/kotlinApt")
+    val aptOutputDir = File(getBuildDir(), "generated/source/kapt")
     val aptOutputDirForVariant = File(aptOutputDir, sourceSetName)
     kotlinTask.setProperty("kotlinAptOutputDir", aptOutputDirForVariant)
 
-    val aptWorkingDir = File(getBuildDir(), "tmp/kotlinApt")
+    val aptWorkingDir = File(getBuildDir(), "tmp/kapt")
     val aptWorkingDirForVariant = File(aptWorkingDir, sourceSetName)
     kotlinTask.setProperty("kotlinAptWorkingDir", aptWorkingDirForVariant)