diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
index dbb1ca00dbd..433e447cd23 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
@@ -10,21 +10,21 @@ pill {
 }
 
 dependencies {
-    api(project(":kotlin-gradle-plugin-model"))
+    commonApi(project(":kotlin-gradle-plugin-model"))
 
-    compileOnly(project(":compiler"))
-    compileOnly(project(":kotlin-sam-with-receiver-compiler-plugin"))
-
-    testApi(commonDependency("junit"))
+    commonCompileOnly(project(":compiler"))
+    commonCompileOnly(project(":kotlin-sam-with-receiver-compiler-plugin"))
 
     embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false }
+
+    testImplementation(commonDependency("junit"))
 }
 
 gradlePlugin {
     plugins {
         create("samWithReceiver") {
             id = "org.jetbrains.kotlin.plugin.sam.with.receiver"
-            displayName = ""
+            displayName = "Kotlin Sam-with-receiver compiler plugin"
             description = displayName
             implementationClass = "org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin"
         }
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverExtension.kt b/libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverExtension.kt
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverExtension.kt
rename to libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverExtension.kt
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt b/libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt
rename to libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/SamWithReceiverModelBuilder.kt b/libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/SamWithReceiverModelBuilder.kt
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/SamWithReceiverModelBuilder.kt
rename to libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/SamWithReceiverModelBuilder.kt
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt b/libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt
rename to libraries/tools/kotlin-sam-with-receiver/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/kotlin-sam-with-receiver.properties b/libraries/tools/kotlin-sam-with-receiver/src/common/resources/META-INF/gradle-plugins/kotlin-sam-with-receiver.properties
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/kotlin-sam-with-receiver.properties
rename to libraries/tools/kotlin-sam-with-receiver/src/common/resources/META-INF/gradle-plugins/kotlin-sam-with-receiver.properties
diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/libraries/tools/kotlin-sam-with-receiver/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
similarity index 100%
rename from libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
rename to libraries/tools/kotlin-sam-with-receiver/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin