diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
index fd8339d0b52..51721588769 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
@@ -80,7 +80,7 @@ private fun syncKotlinAndAndroidSourceDirs(
 
     The Kotlin source set would win in this scenario.
      */
-    if (disambiguationClassifier == null || !androidSourceSet.name.startsWith(disambiguationClassifier)) {
+    if (!androidSourceSet.name.startsWith(disambiguationClassifier)) {
         kotlinSourceSet.kotlin.srcDir("src/${androidSourceSet.name}/kotlin")
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
index 497037715fc..1e961ce2baa 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
@@ -20,12 +20,11 @@ import org.jetbrains.kotlin.gradle.utils.setProperty
 import javax.inject.Inject
 
 abstract class KotlinAndroidTarget @Inject constructor(
-    override val targetName: String,
+    final override val targetName: String,
     project: Project
 ) : AbstractKotlinTarget(project) {
 
-    override var disambiguationClassifier: String? = null
-        internal set
+    final override val disambiguationClassifier: String = targetName
 
     override val platformType: KotlinPlatformType
         get() = KotlinPlatformType.androidJvm
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTargetPreset.kt
index fcfda8ce8e8..83fc29d27c5 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTargetPreset.kt
@@ -26,7 +26,6 @@ abstract class KotlinAndroidTargetPreset @Inject constructor(
             name,
             project
         ).apply {
-            disambiguationClassifier = name
             preset = this@KotlinAndroidTargetPreset
             targetUnderConstruction = this
         }