diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt
index a6444b6b7a9..b38fefc2ba8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt
@@ -67,9 +67,9 @@ abstract class AbstractKotlinTarget(
     override val publishable: Boolean
         get() = true
 
-    override var publishableSources: Boolean = true
+    override var isSourcesPublishable: Boolean = true
     override fun withSourcesJar(publish: Boolean) {
-        publishableSources = publish
+        isSourcesPublishable = publish
     }
 
     @InternalKotlinGradlePluginApi
@@ -146,7 +146,7 @@ abstract class AbstractKotlinTarget(
         // We want to create task anyway, even if sources are not going to be published by KGP
         // So users or other plugins can still use it
         val sourcesJarTask = sourcesJarTask(producingCompilation, componentName, artifactNameAppendix)
-        if (!publishableSources) return null
+        if (!isSourcesPublishable) return null
 
         // If sourcesElements configuration not found, don't create artifact.
         // This can happen in pure JVM plugin where source publication is delegated to Java Gradle Plugin.
@@ -161,7 +161,7 @@ abstract class AbstractKotlinTarget(
             dependencyConfigurationName = sourcesElementsConfigurationName,
             overrideConfigurationAttributes = overrideConfigurationAttributes,
             includeIntoProjectStructureMetadata = false,
-            publishOnlyIf = { publishableSources }
+            publishOnlyIf = { isSourcesPublishable }
         )
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt
index 8bceaad25a0..58b147333b4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent
 import org.jetbrains.kotlin.tooling.core.HasMutableExtras
 
 internal interface InternalKotlinTarget : KotlinTarget, HasMutableExtras {
-    var publishableSources: Boolean
+    var isSourcesPublishable: Boolean
     val kotlinComponents: Set<KotlinTargetComponent>
     fun onPublicationCreated(publication: MavenPublication)
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt
index 8803ed2a08c..3c6826a538e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt
@@ -84,13 +84,13 @@ abstract class KotlinSoftwareComponent(
             }
 
             val sourcesElements = metadataTarget.sourcesElementsConfigurationName
-            if (metadataTarget.publishableSources) {
+            if (metadataTarget.isSourcesPublishable) {
                 addSourcesJarArtifactToConfiguration(sourcesElements)
                 this += DefaultKotlinUsageContext(
                     compilation = metadataTarget.compilations.getByName(MAIN_COMPILATION_NAME),
                     dependencyConfigurationName = sourcesElements,
                     includeIntoProjectStructureMetadata = false,
-                    publishOnlyIf = { metadataTarget.publishableSources }
+                    publishOnlyIf = { metadataTarget.isSourcesPublishable }
                 )
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/Publishing.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/Publishing.kt
index 3dc3131607f..3613a2cb66f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/Publishing.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/Publishing.kt
@@ -72,7 +72,6 @@ private fun createTargetPublications(project: Project, publishing: PublishingExt
                 project.whenEvaluated { kotlinTarget.createMavenPublications(publishing.publications) }
             else
                 kotlinTarget.createMavenPublications(publishing.publications)
-                // project.whenEvaluated { kotlinTarget.createMavenPublications(publishing.publications) }
         }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt
index c9823baad40..864d78c22d9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt
@@ -58,10 +58,10 @@ internal class ExternalKotlinTargetImpl internal constructor(
         artifactsTaskLocator.locate(this)
     }
 
-    override var publishableSources: Boolean = true
+    override var isSourcesPublishable: Boolean = true
 
     override fun withSourcesJar(publish: Boolean) {
-        publishableSources = publish
+        isSourcesPublishable = publish
     }
 
     override val artifactsTaskName: String
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt
index 7aba86ed77f..b95a162a796 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt
@@ -153,7 +153,7 @@ class MppPublicationTest {
         kotlin.withSourcesJar(publish = false)
 
         for (target in kotlin.targets) {
-            assertFalse(target.internal.publishableSources)
+            assertFalse(target.internal.isSourcesPublishable)
         }
     }
 
@@ -165,9 +165,9 @@ class MppPublicationTest {
 
         for (target in kotlin.targets) {
             if (target.name == "linux") {
-                assertFalse(target.internal.publishableSources)
+                assertFalse(target.internal.isSourcesPublishable)
             } else {
-                assertTrue(target.internal.publishableSources)
+                assertTrue(target.internal.isSourcesPublishable)
             }
         }
     }