diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index c8203486d59..30c5736ef14 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -31,7 +31,8 @@ configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle
index 1c96aff858b..51526ca91e4 100644
--- a/libraries/kotlin.test/junit5/build.gradle
+++ b/libraries/kotlin.test/junit5/build.gradle
@@ -41,7 +41,8 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 }
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index a0c3f31a358..651c29bb822 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -45,8 +45,8 @@ configureJavadocJar()
 
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
-                                      "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                                      "-module-name", project.archivesBaseName, ]
+                                      "-Xopt-in=kotlin.contracts.ExperimentalContracts"]
+    kotlinOptions.moduleName = project.archivesBaseName
 }
 
 compileTestKotlin {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index 68a5a3e371c..968b937bef9 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -34,7 +34,8 @@ configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index 389ec0c47fb..c9526386db7 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -47,8 +47,8 @@ compileKotlin {
                             "-Xnormalize-constructor-calls=enable",
                             "-Xno-optimized-callable-references",
                             "-Xno-kotlin-nothing-value-exception",
-                            "-Xopt-in=kotlin.RequiresOptIn",
-                            "-module-name", "kotlin-reflection"]
+                            "-Xopt-in=kotlin.RequiresOptIn"]
+        moduleName = "kotlin-reflection"
     }
 }
 
diff --git a/libraries/stdlib/coroutines-experimental/build.gradle.kts b/libraries/stdlib/coroutines-experimental/build.gradle.kts
index 0ebeb1b702e..98c75f39c5c 100644
--- a/libraries/stdlib/coroutines-experimental/build.gradle.kts
+++ b/libraries/stdlib/coroutines-experimental/build.gradle.kts
@@ -51,9 +51,9 @@ tasks {
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
                 "-Xcoroutines=enable",
                 "-XXLanguage:-ReleaseCoroutines",
-                "-Xno-use-ir",
-                "-module-name", "kotlin-coroutines-experimental-compat"
+                "-Xno-use-ir"
             )
+            moduleName = "kotlin-coroutines-experimental-compat"
         }
     }
     val compileTestKotlin by existing(KotlinCompile::class) {
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 95f7960d19a..1e56622188d 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -76,10 +76,10 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name,
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts",
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index 12149e33a69..e59fbc30e3b 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -70,8 +70,8 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 compileTestKotlin {
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 109f7762bce..4bdac657e5a 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -63,13 +63,12 @@ tasks.withType<KotlinCompile> {
     dependsOn(copySources)
     kotlinOptions {
         freeCompilerArgs += listOf(
-            "-module-name",
-            "kotlin-stdlib",
             "-Xallow-kotlin-package",
             "-Xmulti-platform",
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=kotlin.contracts.ExperimentalContracts"
         )
+        moduleName = "kotlin-stdlib"
     }
 }
 
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index e7b046ae6a1..ce0bd49df03 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -117,12 +117,12 @@ compileKotlin {
                 "-Xallow-result-return-type",
                 "-Xmultifile-parts-inherit",
                 "-Xnormalize-constructor-calls=enable",
-                "-module-name", "kotlin-stdlib",
                 "-Xopt-in=kotlin.RequiresOptIn",
                 "-Xopt-in=kotlin.ExperimentalMultiplatform",
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
                 "-Xinline-classes"
         ]
+        moduleName = "kotlin-stdlib"
     }
 }
 
diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts
index a506bc64543..297e3f9c1fb 100644
--- a/libraries/tools/kotlin-annotations-android/build.gradle.kts
+++ b/libraries/tools/kotlin-annotations-android/build.gradle.kts
@@ -16,10 +16,8 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += listOf(
-            "-Xallow-kotlin-package",
-            "-module-name", project.name
-    )
+    kotlinOptions.freeCompilerArgs += listOf("-Xallow-kotlin-package")
+    kotlinOptions.moduleName = project.name
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index f05b9fd44f3..42e2c3bdfed 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -29,8 +29,8 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 configureJvmIrBackend(project)
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 9704249ac00..6f9c169593d 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -36,8 +36,8 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xnormalize-constructor-calls=enable",
-            "-module-name", project.name
     ]
+    kotlinOptions.moduleName = project.name
 }
 
 configureJvmIrBackend(project)