diff --git a/ant/build.gradle.kts b/ant/build.gradle.kts
index fa992f51094..a35c92c97b0 100644
--- a/ant/build.gradle.kts
+++ b/ant/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    api(commonDep("org.apache.ant", "ant"))
+    api(commonDependency("org.apache.ant", "ant"))
     api(project(":kotlin-preloader"))
     api(kotlinStdlib())
 }
diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index 372b4f87d42..4f05d49b1ef 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
     testCompileOnly(project(":compiler:cli-common"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(protobufFull())
     testApi(kotlinStdlib())
     testImplementation(project(":kotlin-reflect"))
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 4b576e4a635..65377962295 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -45,22 +45,22 @@ val Project.internalBootstrapRepo: String? get() =
         else -> null
     }
 
-fun Project.commonDep(coord: String): String {
+fun Project.commonDependency(coord: String): String {
     val parts = coord.split(':')
     return when (parts.size) {
-        1 -> "$coord:$coord:${commonVer(coord, coord)}"
-        2 -> "${parts[0]}:${parts[1]}:${commonVer(parts[0], parts[1])}"
+        1 -> "$coord:$coord:${commonDependencyVersion(coord, coord)}"
+        2 -> "${parts[0]}:${parts[1]}:${commonDependencyVersion(parts[0], parts[1])}"
         3 -> coord
         else -> throw IllegalArgumentException("Illegal maven coordinates: $coord")
     }
 }
 
-fun Project.commonDep(group: String, artifact: String, vararg suffixesAndClassifiers: String): String {
+fun Project.commonDependency(group: String, artifact: String, vararg suffixesAndClassifiers: String): String {
     val (classifiers, artifactSuffixes) = suffixesAndClassifiers.partition { it.startsWith(':') }
-    return "$group:$artifact${artifactSuffixes.joinToString("")}:${commonVer(group, artifact)}${classifiers.joinToString("")}"
+    return "$group:$artifact${artifactSuffixes.joinToString("")}:${commonDependencyVersion(group, artifact)}${classifiers.joinToString("")}"
 }
 
-fun Project.commonVer(group: String, artifact: String) =
+fun Project.commonDependencyVersion(group: String, artifact: String) =
     when {
         rootProject.extra.has("versions.$artifact") -> rootProject.extra["versions.$artifact"]
         rootProject.extra.has("versions.$group") -> rootProject.extra["versions.$group"]
@@ -209,7 +209,7 @@ fun Project.testApiJUnit5(
     jupiterParams: Boolean = false
 ) {
     with(dependencies) {
-        val platformVersion = commonVer("org.junit", "junit-bom")
+        val platformVersion = commonDependencyVersion("org.junit", "junit-bom")
         testApi(platform("org.junit:junit-bom:$platformVersion"))
         testApi("org.junit.jupiter:junit-jupiter")
         if (vintageEngine) {
@@ -220,7 +220,7 @@ fun Project.testApiJUnit5(
             testApi("org.junit.jupiter:junit-jupiter-params:$platformVersion")
         }
 
-        val componentsVersion = commonVer("org.junit.platform", "")
+        val componentsVersion = commonDependencyVersion("org.junit.platform", "")
 
         val components = mutableListOf(
             "org.junit.platform:junit-platform-commons",
@@ -244,7 +244,7 @@ fun Project.testApiJUnit5(
         }
 
         // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes
-        add("testRuntimeOnly", commonDep("junit:junit"))
+        add("testRuntimeOnly", commonDependency("junit:junit"))
     }
 }
 
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 20f5ccba45d..7bf01685295 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -18,13 +18,13 @@ dependencies {
     testApi(kotlinStdlib())
     testApi(project(":kotlin-reflect"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(projectTests(":compiler:test-infrastructure"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(projectTests(":compiler:tests-compiler-utils"))
     testApi(projectTests(":compiler:tests-common-new"))
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
     testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
@@ -36,7 +36,7 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
 
-    testApi("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}")
+    testApi("org.junit.platform:junit-platform-launcher:${commonDependencyVersion("org.junit.platform", "")}")
 }
 
 sourceSets {
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 46d130c3ecf..fc4f3e38d14 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     
     testApi(kotlinStdlib())
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))
@@ -52,7 +52,7 @@ dependencies {
     testImplementation(project(":kotlin-reflect"))
     testImplementation(toolsJar())
 
-    antLauncherJar(commonDep("org.apache.ant", "ant"))
+    antLauncherJar(commonDependency("org.apache.ant", "ant"))
     antLauncherJar(toolsJar())
 }
 
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index cc57522d7ae..b22f8ab7df2 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
     api(project(":compiler:javac-wrapper"))
     api(project(":js:js.translator"))
     api(project(":native:frontend.native"))
-    api(commonDep("org.fusesource.jansi", "jansi"))
-    api(commonDep("org.jline", "jline"))
+    api(commonDependency("org.fusesource.jansi", "jansi"))
+    api(commonDependency("org.jline", "jline"))
     api(project(":compiler:fir:raw-fir:psi2fir"))
     api(project(":compiler:fir:resolve"))
     api(project(":compiler:fir:providers"))
@@ -45,7 +45,7 @@ dependencies {
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 }
 
 sourceSets {
diff --git a/compiler/compiler-runner-unshaded/build.gradle.kts b/compiler/compiler-runner-unshaded/build.gradle.kts
index e72c440205e..c8a24c76558 100644
--- a/compiler/compiler-runner-unshaded/build.gradle.kts
+++ b/compiler/compiler-runner-unshaded/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 dependencies {
     api(project(":kotlin-build-common"))
     api(project(":kotlin-daemon-client"))
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":kotlin-preloader"))
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index a864f169c60..1a1dc9571bb 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     api(project(":kotlin-build-common"))
     api(project(":kotlin-daemon-client"))
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     runtimeOnly(project(":kotlin-compiler-embeddable"))
 }
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index 954dbc51ddb..2ec86eec503 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -5,14 +5,14 @@ plugins {
 
 dependencies {
     api(project(":core:util.runtime"))
-    api(commonDep("javax.inject"))
+    api(commonDependency("javax.inject"))
     compileOnly(kotlinStdlib())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testApi(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") }
 }
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index 68b8e96f388..a933747d183 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
 
 dependencies {
-    api(commonDep("org.fusesource.jansi", "jansi"))
-    api(commonDep("org.jline", "jline"))
+    api(commonDependency("org.fusesource.jansi", "jansi"))
+    api(commonDependency("org.jline", "jline"))
 
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":compiler:cli-js"))
@@ -22,7 +22,7 @@ dependencies {
     runtimeOnly(project(":kotlin-reflect"))
 
     embedded(project(":daemon-common")) { isTransitive = false }
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
 }
diff --git a/compiler/daemon/daemon-client-new/build.gradle.kts b/compiler/daemon/daemon-client-new/build.gradle.kts
index 23eb2c5d6dd..140466315e0 100644
--- a/compiler/daemon/daemon-client-new/build.gradle.kts
+++ b/compiler/daemon/daemon-client-new/build.gradle.kts
@@ -28,19 +28,19 @@ dependencies {
     compileOnly(project(":kotlin-daemon-client"))
     compileOnly(project(":js:js.frontend"))
     compileOnly(project(":daemon-common")) { isTransitive = false }
-    compileOnly(commonDep("net.rubygrapefruit", "native-platform"))
+    compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 
     embedded(project(":kotlin-daemon-client")) { isTransitive = false }
     embedded(project(":daemon-common")) { isTransitive = false }
-    embedded(commonDep("net.rubygrapefruit", "native-platform"))
+    embedded(commonDependency("net.rubygrapefruit", "native-platform"))
     nativePlatformVariants.forEach {
-        embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
+        embedded(commonDependency("net.rubygrapefruit", "native-platform", "-$it"))
     }
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
-    api(commonDep("io.ktor", "ktor-network")) {
+    api(commonDependency("io.ktor", "ktor-network")) {
         ktorExcludesForDaemon.forEach { (group, module) ->
             exclude(group = group, module = module)
         }
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index cfe6e32d863..165b8d2f244 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -24,16 +24,16 @@ dependencies {
     compileOnly(project(":daemon-common"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":js:js.frontend"))
-    compileOnly(commonDep("net.rubygrapefruit", "native-platform"))
+    compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 
     embedded(project(":daemon-common")) { isTransitive = false }
-    embedded(commonDep("net.rubygrapefruit", "native-platform"))
+    embedded(commonDependency("net.rubygrapefruit", "native-platform"))
     nativePlatformVariants.forEach {
-        embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
+        embedded(commonDependency("net.rubygrapefruit", "native-platform", "-$it"))
     }
     runtimeOnly(project(":kotlin-reflect"))
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
 }
diff --git a/compiler/daemon/daemon-common-new/build.gradle.kts b/compiler/daemon/daemon-common-new/build.gradle.kts
index 48c65281cca..02c59462d83 100644
--- a/compiler/daemon/daemon-common-new/build.gradle.kts
+++ b/compiler/daemon/daemon-common-new/build.gradle.kts
@@ -11,10 +11,10 @@ dependencies {
     api(kotlinStdlib())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
-    api(commonDep("io.ktor", "ktor-network")) {
+    api(commonDependency("io.ktor", "ktor-network")) {
         ktorExcludesForDaemon.forEach { (group, module) ->
             exclude(group = group, module = module)
         }
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index 39c701f5379..29d412f02d1 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     compileOnly(project(":js:js.config"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
 }
diff --git a/compiler/daemon/daemon-tests/build.gradle.kts b/compiler/daemon/daemon-tests/build.gradle.kts
index 94ed85de302..ffb8635e9c8 100644
--- a/compiler/daemon/daemon-tests/build.gradle.kts
+++ b/compiler/daemon/daemon-tests/build.gradle.kts
@@ -11,15 +11,15 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
 dependencies {
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(kotlinStdlib())
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(project(":kotlin-daemon-client"))
     testApi(project(":kotlin-daemon-client-new"))
     testCompileOnly(project(":kotlin-daemon"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
-    testApi(commonDep("io.ktor", "ktor-network")) {
+    testApi(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    testApi(commonDependency("io.ktor", "ktor-network")) {
         ktorExcludesForDaemon.forEach { (group, module) ->
             exclude(group = group, module = module)
         }
diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
index c28c64d8ede..58aeb43cc44 100644
--- a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))
diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts
index 799030b5f8c..79cff26b2ba 100644
--- a/compiler/fir/modularized-tests/build.gradle.kts
+++ b/compiler/fir/modularized-tests/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     testRuntimeOnly(intellijPluginDep("java"))
     testRuntimeOnly(intellijDep()) { includeJars("commons-lang-2.4") }
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))
diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
index 39c48f71d5a..1a437821064 100644
--- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
 
diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
index 1dff3a6dbeb..7be791606d6 100644
--- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts
+++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
 
     testImplementation(intellijDep()) { includeJars("platform-api", rootProject = rootProject) }
 
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
 
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index e54be96ccec..c479c4b241c 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     api(project(":compiler:frontend.common"))
     api(project(":compiler:frontend.common-psi"))
     api(project(":kotlin-script-runtime"))
-    api(commonDep("io.javaslang","javaslang"))
+    api(commonDependency("io.javaslang","javaslang"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
 }
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index 04f8ac84655..b157ceb7ca3 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testApi(kotlinStdlib())
     testApi(projectTests(":kotlin-build-common"))
diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts
index 6d7009db9dd..10c7f110a7b 100644
--- a/compiler/psi/build.gradle.kts
+++ b/compiler/psi/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
 
-    jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
+    jflexPath(commonDependency("org.jetbrains.intellij.deps.jflex", "jflex"))
 }
 
 sourceSets {
diff --git a/compiler/resolution.common.jvm/build.gradle.kts b/compiler/resolution.common.jvm/build.gradle.kts
index 430f540f474..5dd1efaf169 100644
--- a/compiler/resolution.common.jvm/build.gradle.kts
+++ b/compiler/resolution.common.jvm/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     api(project(":core:compiler.common.jvm"))
     api(project(":compiler:psi"))
     implementation(project(":compiler:util"))
-    implementation(commonDep("io.javaslang","javaslang"))
+    implementation(commonDependency("io.javaslang","javaslang"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
 }
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 317c730e41d..543c335efac 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
     testApi(projectTests(":compiler:tests-common-jvm6"))
     testApi(project(":kotlin-scripting-compiler-impl"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
-    testApi(commonDep("junit:junit"))
-    testApi(commonDep("com.android.tools:r8"))
+    testApi(commonDependency("junit:junit"))
+    testApi(commonDependency("com.android.tools:r8"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompileOnly(toolsJar())
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts
index c89bb071ef1..5ea3a4062cf 100644
--- a/compiler/tests-compiler-utils/build.gradle.kts
+++ b/compiler/tests-compiler-utils/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     testApi(project(":compiler:backend.jvm.entrypoint"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(project(":kotlin-preloader"))
-    testApi(commonDep("com.android.tools:r8"))
+    testApi(commonDependency("com.android.tools:r8"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testApi(intellijDep()) {
diff --git a/compiler/util-io/build.gradle.kts b/compiler/util-io/build.gradle.kts
index e64e7df5cc2..27a85a4be0b 100644
--- a/compiler/util-io/build.gradle.kts
+++ b/compiler/util-io/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     implementation(kotlinStdlib())
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(kotlin("test"))
 }
 
diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts
index 6fb9f3d3494..c6f670562ec 100644
--- a/compiler/util-klib/build.gradle.kts
+++ b/compiler/util-klib/build.gradle.kts
@@ -8,7 +8,7 @@ description = "Common klib reader and writer"
 dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-util-io"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
 }
 
 sourceSets {
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index 0af4de5d72c..8e2767dbf1d 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(project(":core:compiler.common.jvm"))
     api(project(":core:deserialization.common.jvm"))
     api(project(":core:util.runtime"))
-    api(commonDep("javax.inject"))
+    api(commonDependency("javax.inject"))
 }
 
 sourceSets {
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index 1acbfe66433..6340eb559f7 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(project(":core:deserialization.common"))
     api(project(":core:util.runtime"))
     api(project(":core:descriptors"))
-    api(commonDep("javax.inject"))
+    api(commonDependency("javax.inject"))
 }
 
 sourceSets {
diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts
index ac68508c1ec..bf400d09306 100644
--- a/generators/test-generator/build.gradle.kts
+++ b/generators/test-generator/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     testApi(project(":core:util.runtime"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(kotlinStdlib())
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApiJUnit5()
     testApi(project(":generators"))
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index e9a82081866..8ade4a695d7 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
     testApi(project(":js:js.dce"))
     testApi(project(":js:js.engines"))
     testApi(project(":compiler:incremental-compilation-impl"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(projectTests(":kotlin-build-common"))
     testApi(projectTests(":generators:test-generator"))
 
@@ -71,12 +71,12 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
     testRuntimeOnly(project(":compiler:backend-common"))
-    testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi"))
+    testRuntimeOnly(commonDependency("org.fusesource.jansi", "jansi"))
     
-    antLauncherJar(commonDep("org.apache.ant", "ant"))
+    antLauncherJar(commonDependency("org.apache.ant", "ant"))
     antLauncherJar(toolsJar())
 
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonVer("org.junit", "junit-bom")}")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonDependencyVersion("org.junit", "junit-bom")}")
 }
 
 val generationRoot = projectDir.resolve("tests-gen")
diff --git a/kotlin-native/Interop/StubGenerator/build.gradle b/kotlin-native/Interop/StubGenerator/build.gradle
index 35ac20d865c..2195ff5256e 100644
--- a/kotlin-native/Interop/StubGenerator/build.gradle
+++ b/kotlin-native/Interop/StubGenerator/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation(project(":compiler:util"))
     implementation(project(":compiler:ir.serialization.common"))
 
-    testImplementation DependenciesKt.commonDep(project, "junit")
+    testImplementation DependenciesKt.commonDependency(project, "junit")
     testImplementation project(":kotlin-test:kotlin-test-junit")
 }
 
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 05e43f862b8..f904a3ba5fa 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -6082,7 +6082,7 @@ dependencies {
 
     api project(kotlinCompilerModule)
     api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
-    api DependenciesKt.commonDep(project, "junit")
+    api DependenciesKt.commonDependency(project, "junit")
 }
 
 project.tasks.named("test").configure {
diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle
index 7b3aace592c..273cbddb19f 100644
--- a/kotlin-native/klib/build.gradle
+++ b/kotlin-native/klib/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation project(":kotlin-stdlib")
     implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
     implementation project(":kotlin-native:utilities:basic-utils")
-    testImplementation DependenciesKt.commonDep(project, "junit")
+    testImplementation DependenciesKt.commonDependency(project, "junit")
     testImplementation project(":kotlin-test:kotlin-test-junit")
 }
 
diff --git a/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts b/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts
index d4197bdc8af..5ed9a5ed081 100644
--- a/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts
+++ b/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
     kotlinNativeEmbedded(project(":kotlin-native:klib"))
     kotlinNativeEmbedded(project(":kotlin-native:endorsedLibraries:kotlinx.cli", "jvmRuntimeElements"))
     kotlinNativeEmbedded(project(":kotlin-compiler")) { isTransitive = false }
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
 }
 
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
index 665ed3704b0..f15b70497ed 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     bundleDependencies "org.jetbrains.kotlin:kotlin-util-io:$kotlinVersion"
     bundleDependencies "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion"
 
-    testImplementation DependenciesKt.commonDep(project, "junit")
+    testImplementation DependenciesKt.commonDependency(project, "junit")
     testImplementation "org.jetbrains.kotlin:kotlin-test:${project.bootstrapKotlinVersion}"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${project.bootstrapKotlinVersion}"
     testImplementation "org.tools4j:tools4j-spockito:1.6"
diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
index 2bdef478234..ed911b9c672 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
@@ -25,13 +25,13 @@ dependencies {
     testApi(project(":kotlin-daemon-client"))
     testApi(project(":kotlin-daemon-embeddable"))
     testApi(project(":kotlin-compiler-embeddable"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testRuntimeOnly(project(":kotlin-reflect"))
     compilerClasspath(project(":kotlin-reflect"))
     compilerClasspath(kotlinStdlib())
-    compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
-    compilerClasspath(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    compilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
+    compilerClasspath(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
     compilerClasspath(project(":kotlin-compiler-embeddable"))
     compilerClasspath(project(":kotlin-scripting-compiler-embeddable"))
     compilerClasspath(project(":kotlin-scripting-compiler-impl-embeddable"))
diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
index 547ebd1d26e..f864dae19bc 100644
--- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     api(project(":kotlin-script-util"))
     runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testRuntimeOnly(project(":kotlin-reflect"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
index c4079f004af..a2337409ff8 100644
--- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
index 99fd9d8ed07..beb35466fbc 100644
--- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
 
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
index 08ec28c1f27..5d36cd1b0ab 100644
--- a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(project(":kotlin-scripting-jvm"))
     api(project(":kotlin-scripting-dependencies"))
     api(project(":kotlin-scripting-dependencies-maven"))
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 
 sourceSets {
diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
index 7301fbb8426..df6cccf603a 100644
--- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts
index 748a126d205..ba660f6a86f 100644
--- a/libraries/kotlinx-metadata/jvm/build.gradle.kts
+++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     shadows(project(":core:metadata.jvm"))
     shadows(protobufLite())
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index 3b8409383bc..2b073a2ee75 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -8,7 +8,7 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts
index 9b401d2acd6..44c14238108 100644
--- a/libraries/scripting/dependencies-maven/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven/build.gradle.kts
@@ -30,10 +30,10 @@ dependencies {
     implementation("org.apache.maven:maven-core:3.8.1")
     implementation("org.apache.maven.wagon:wagon-http:3.4.3")
     testImplementation(projectTests(":kotlin-scripting-dependencies"))
-    testImplementation(commonDep("junit"))
+    testImplementation(commonDependency("junit"))
     testRuntimeOnly("org.slf4j:slf4j-nop:1.7.30")
     testImplementation(kotlin("reflect"))
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts
index 90c4b0f22b9..728c14c2136 100644
--- a/libraries/scripting/dependencies/build.gradle.kts
+++ b/libraries/scripting/dependencies/build.gradle.kts
@@ -8,8 +8,8 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-scripting-common"))
-    testApi(commonDep("junit"))
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    testApi(commonDependency("junit"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts
index f815a89364d..0d96ebb44a5 100644
--- a/libraries/scripting/js-test/build.gradle.kts
+++ b/libraries/scripting/js-test/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 val embeddableTestRuntime by configurations.creating
 
 dependencies {
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 
     testApi(project(":kotlin-scripting-js"))
     testApi(project(":compiler:plugin-api"))
diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts
index 2ec67498372..67985438cd3 100644
--- a/libraries/scripting/jsr223-test/build.gradle.kts
+++ b/libraries/scripting/jsr223-test/build.gradle.kts
@@ -17,7 +17,7 @@ val testJsr223Runtime by configurations.creating {
 val testCompilationClasspath by configurations.creating
 
 dependencies {
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":core:util.runtime"))
@@ -29,7 +29,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
 
-    embeddableTestRuntime(commonDep("junit"))
+    embeddableTestRuntime(commonDependency("junit"))
     embeddableTestRuntime(project(":kotlin-scripting-jsr223"))
     embeddableTestRuntime(project(":kotlin-scripting-compiler-embeddable"))
     embeddableTestRuntime(testSourceSet.output)
diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts
index c1c4065fe8c..8f6ff1cceae 100644
--- a/libraries/scripting/jvm-host-test/build.gradle.kts
+++ b/libraries/scripting/jvm-host-test/build.gradle.kts
@@ -11,18 +11,18 @@ val embeddableTestRuntime by configurations.creating {
 }
 
 dependencies {
-    allTestsRuntime(commonDep("junit"))
+    allTestsRuntime(commonDependency("junit"))
     allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
     testApi(project(":kotlin-scripting-jvm-host-unshaded"))
     testApi(projectTests(":compiler:tests-common"))
     testApi(project(":kotlin-scripting-compiler"))
     testApi(project(":daemon-common")) // TODO: fix import (workaround for jps build)
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testImplementation(project(":kotlin-reflect"))
-    testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     
     embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
     embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index e75f4b39bee..d76a1ac29e5 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     publishedRuntime(project(":kotlin-compiler"))
     publishedRuntime(project(":kotlin-scripting-compiler"))
     publishedRuntime(project(":kotlin-reflect"))
-    publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index 962f9fc4b1c..b019def9fd9 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     api(project(":kotlin-script-runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-scripting-common"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
index 5b2559c9fa4..cd003e84c9e 100644
--- a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 83fd6768f89..34a185702e1 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     testImplementation(project(":kotlin-reflect"))
     testImplementation(project(":kotlin-android-extensions"))
     testImplementation(project(":kotlin-parcelize-compiler"))
-    testImplementation(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    testImplementation(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 
     testImplementation(gradleApi())
     testImplementation(gradleTestKit())
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index f349aa5d929..d3a0495d411 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -100,7 +100,7 @@ dependencies {
     testImplementation(project(":kotlin-android-extensions"))
     testImplementation(project(":kotlin-compiler-runner"))
     testImplementation(project(":kotlin-test::kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(project(":kotlin-gradle-statistics"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompileOnly(project(":kotlin-annotation-processing"))
diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
index be246c60106..c385579fd0e 100644
--- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit"))
+    testImplementation(commonDependency("junit"))
 }
 
 sourceSets {
diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
index cffd68a0635..74b8fb58d36 100644
--- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testApi(kotlinStdlib("jdk8"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
     testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
     testImplementation(project(":kotlin-compiler-embeddable"))
 }
diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts
index 3e90abd1ec9..559694ed83c 100644
--- a/libraries/tools/kotlin-main-kts/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
     embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
     embedded(project(":kotlin-scripting-dependencies-maven-all"))
     embedded("org.slf4j:slf4j-nop:1.7.30")
-    embedded(commonDep("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) {
+    embedded(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) {
         isTransitive = false
         attributes {
             attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle
index 6349ac370a7..60adf660b26 100644
--- a/libraries/tools/kotlin-noarg/build.gradle
+++ b/libraries/tools/kotlin-noarg/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     compileOnly project(':kotlin-noarg-compiler-plugin')
 
     testApi gradleApi()
-    testApi(DependenciesKt.commonDep(project, "junit"))
+    testApi(DependenciesKt.commonDependency(project, "junit"))
 
     embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false }
 }
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle
index fca3e63c0e4..2995583f1f5 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
 
     testApi gradleApi()
-    testApi DependenciesKt.commonDep(project, "junit")
+    testApi DependenciesKt.commonDependency(project, "junit")
 
     embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false }
 }
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index fba13af9169..de425003dd1 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-script-runtime"))
     api(project(":kotlin-scripting-jvm"))
-    api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":daemon-common"))
     compileOnly(project(":kotlin-scripting-compiler"))
@@ -21,7 +21,7 @@ dependencies {
     testCompileOnly(project(":compiler:cli"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testImplementation(project(":kotlin-reflect"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testImplementation("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
@@ -34,7 +34,7 @@ dependencies {
 
 configurations.all {
     resolutionStrategy {
-        force(commonDep("junit:junit"))
+        force(commonDependency("junit:junit"))
     }
 }
 
diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts
index 6d0721cf402..ce3deb7e463 100644
--- a/libraries/tools/kotlinp/build.gradle.kts
+++ b/libraries/tools/kotlinp/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
     testCompileOnly(project(":kotlinx-metadata"))
     testCompileOnly(project(":kotlinx-metadata-jvm"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(projectTests(":generators:test-generator"))
 
diff --git a/native/commonizer-api/build.gradle.kts b/native/commonizer-api/build.gradle.kts
index f06e1040e5f..df773160726 100644
--- a/native/commonizer-api/build.gradle.kts
+++ b/native/commonizer-api/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
     implementation(kotlinStdlib())
     implementation(project(":native:kotlin-native-utils"))
     testImplementation(project(":kotlin-test::kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testRuntimeOnly(project(":native:kotlin-klib-commonizer"))
 }
diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts
index 6756351d6d9..0eff97bb126 100644
--- a/native/commonizer/build.gradle.kts
+++ b/native/commonizer/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
     api(kotlinStdlib())
 
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(project(":kotlinx-metadata-klib")) { isTransitive = false }
     testImplementation(project(":kotlinx-metadata")) { isTransitive = false }
diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts
index b95a45568ee..25307987cab 100644
--- a/native/utils/build.gradle.kts
+++ b/native/utils/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     compileOnly(kotlinStdlib())
     api(project(":kotlin-util-io"))
 
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testImplementation(project(":kotlin-reflect"))
 }
diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts
index 5a253d67de8..537eda8a3aa 100644
--- a/plugins/allopen/allopen-cli/build.gradle.kts
+++ b/plugins/allopen/allopen-cli/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testApi(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index e2b55135d70..84e79f3e6c7 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -32,12 +32,12 @@ dependencies {
     testApi(project(":kotlin-android-extensions-runtime"))
     testApi(projectTests(":compiler:tests-common"))
     testApi(project(":kotlin-test:kotlin-test-jvm"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testRuntimeOnly(intellijPluginDep("junit"))
     testRuntimeOnly(intellijDep())
 
-    robolectricClasspath(commonDep("org.robolectric", "robolectric"))
+    robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
     robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
     robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
 
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 50a16888b9a..9dfb3042742 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
     testApi(projectTests(":idea"))
     testApi(projectTests(":idea:idea-android"))
     testApi(project(":kotlin-test:kotlin-test-jvm"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":idea:idea-native")) { isTransitive = false }
     testApi(project(":idea:idea-gradle-native")) { isTransitive = false }
     testRuntime(project(":native:frontend.native"))
diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
index 51cfabb77cf..9ad967e7455 100644
--- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
@@ -9,7 +9,7 @@ project.updateJvmTarget("1.6")
 
 dependencies {
     api(kotlinStdlib())
-    compileOnly(commonDep("com.google.android", "android"))
+    compileOnly(commonDependency("com.google.android", "android"))
 }
 
 sourceSets {
diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
index 8044a410e19..c283b0da0c4 100644
--- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
@@ -65,13 +65,13 @@ dependencies {
     testImplementation(projectTests(":generators:test-generator"))
 
     testImplementation(projectTests(":js:js.tests"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testRuntimeOnly(kotlinStdlib())
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
     testRuntimeOnly(project(":compiler:backend-common"))
-    testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi"))
+    testRuntimeOnly(commonDependency("org.fusesource.jansi", "jansi"))
 
     atomicfuClasspath("org.jetbrains.kotlinx:atomicfu-js:0.16.3") { isTransitive = false }
     atomicfuRuntimeForTests(project(":kotlinx-atomicfu-runtime"))  { isTransitive = false }
diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts
index 96157eba867..307ee646d34 100644
--- a/plugins/jvm-abi-gen/build.gradle.kts
+++ b/plugins/jvm-abi-gen/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     // Note that kotlinx-metadata-jvm already includes kotlinx-metadata, core:metadata, core:metadata.jvm,
     // and protobuf-lite, so we only need to include kotlinx-metadata-jvm in the shadow jar.
     compileOnly(project(":kotlinx-metadata"))
-    shadows(commonDep("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
+    shadows(commonDependency("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
 
@@ -42,7 +42,7 @@ dependencies {
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(project(":kotlin-compiler"))
 
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(projectTests(":compiler:incremental-compilation-impl"))
 }
diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts
index c5eedac405a..b929c44001a 100644
--- a/plugins/kapt3/kapt3-base/build.gradle.kts
+++ b/plugins/kapt3/kapt3-base/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(kotlinStdlib())
     compileOnly(toolsJarApi())
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(toolsJarApi())
     testRuntimeOnly(toolsJar())
 
diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts
index cb35ae5cf69..921041de3fc 100644
--- a/plugins/kapt3/kapt3-cli/build.gradle.kts
+++ b/plugins/kapt3/kapt3-cli/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 }
 
 sourceSets {
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index 36944c1ce76..10bfd10b340 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
     testApi(projectTests(":compiler:tests-common"))
     testApi(project(":kotlin-annotation-processing-base"))
     testApi(projectTests(":kotlin-annotation-processing-base"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-annotation-processing-runtime"))
 
     testCompileOnly(toolsJarApi())
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
index a468d15d192..afe2ec5d601 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     testApi(projectTests(":compiler:tests-compiler-utils"))
     testApi(projectTests(":compiler:tests-common-new"))
     testImplementation(projectTests(":generators:test-generator"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApiJUnit5(vintageEngine = true)
 
     testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")
diff --git a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts b/plugins/lombok/lombok-compiler-plugin/build.gradle.kts
index 50ceac92a6b..569e6a8c74b 100644
--- a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts
+++ b/plugins/lombok/lombok-compiler-plugin/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
 
     testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
 
     testImplementation("org.projectlombok:lombok:1.18.16")
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index de4d1624254..ad99520b4a9 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(intellijCoreDep()) { includeJars("intellij-core")}
 }
 
diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts
index b2178998927..94926c1d9c3 100644
--- a/plugins/parcelize/parcelize-compiler/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts
@@ -60,11 +60,11 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testRuntimeOnly(intellijPluginDep("junit"))
 
-    robolectricClasspath(commonDep("org.robolectric", "robolectric"))
+    robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
     robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
     robolectricClasspath(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
     robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
diff --git a/plugins/parcelize/parcelize-runtime/build.gradle.kts b/plugins/parcelize/parcelize-runtime/build.gradle.kts
index 82932e9095b..bb29aa7e3dc 100644
--- a/plugins/parcelize/parcelize-runtime/build.gradle.kts
+++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts
@@ -10,7 +10,7 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-android-extensions-runtime"))
-    compileOnly(commonDep("com.google.android", "android"))
+    compileOnly(commonDependency("com.google.android", "android"))
 }
 
 sourceSets {
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index 7629e325f87..2e11aba497c 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     }
 
     testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
-    testRuntimeOnly(platform(commonDep("org.junit:junit-bom")))
+    testRuntimeOnly(platform(commonDependency("org.junit:junit-bom")))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter")
 
     if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index d3e366cf832..2edfe1b590e 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-compiler"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testApi(project(":kotlin-scripting-jvm-host-unshaded"))
diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
index 589dbb2271b..3c846d5ba9f 100644
--- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     testApi(project(":compiler:cli-common"))
     testApi(project(":compiler:frontend.java"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 }
 
 sourceSets {
diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts
index 9dc6c32483e..7940d3a67b7 100644
--- a/plugins/scripting/scripting-compiler/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler/build.gradle.kts
@@ -32,12 +32,11 @@ dependencies {
     testApi(project(":compiler:frontend.java"))
     testApi(project(":compiler:backend.js"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
 
     testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
     testRuntimeOnly(intellijDep()) { includeJars("jps-model", "jna") }
-
     testImplementation(project(":kotlin-reflect"))
 }
 
diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
index af47b07f214..8f4893543be 100644
--- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts
@@ -19,18 +19,18 @@ val embeddableTestRuntime by configurations.creating {
 }
 
 dependencies {
-    allTestsRuntime(commonDep("junit"))
+    allTestsRuntime(commonDependency("junit"))
     testApi(kotlinStdlib("jdk8"))
     testApi(project(":kotlin-scripting-ide-services-unshaded"))
     testApi(project(":kotlin-scripting-compiler"))
     testApi(project(":kotlin-scripting-dependencies-maven"))
     testApi(project(":compiler:cli"))
 
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
-    testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
     testImplementation(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-compiler"))
-    testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     testRuntimeOnly(project(":kotlin-scripting-ide-common")) { isTransitive = false }
 
     embeddableTestRuntime(project(":kotlin-scripting-ide-services"))
@@ -39,8 +39,8 @@ dependencies {
     embeddableTestRuntime(project(":kotlin-scripting-dependencies-maven-all"))
     embeddableTestRuntime(kotlinStdlib("jdk8"))
     embeddableTestRuntime(testSourceSet.output)
-    embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
-    embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
+    embeddableTestRuntime(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    embeddableTestRuntime(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
 }
 
 sourceSets {
diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts
index 6776c953ece..22e78fa3aa9 100644
--- a/plugins/scripting/scripting-ide-services/build.gradle.kts
+++ b/plugins/scripting/scripting-ide-services/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     publishedRuntime(project(":kotlin-compiler"))
     publishedRuntime(project(":kotlin-scripting-compiler"))
     publishedRuntime(project(":kotlin-reflect"))
-    publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 }
 
 sourceSets {
diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts
index e96e9f87ad3..8be42ceae32 100644
--- a/prepare/android-extensions-compiler-gradle/build.gradle.kts
+++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":kotlin-android-extensions-runtime"))
     runtimeOnly(project(":kotlin-compiler-embeddable"))
-    compileOnly(commonDep("com.google.android", "android"))
+    compileOnly(commonDependency("com.google.android", "android"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     embedded(project(":plugins:android-extensions-compiler")) { isTransitive = false }
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index e9afa7a615b..9033ff3b1a4 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -23,11 +23,11 @@ dependencies {
     testApi(project(":daemon-common"))
     testApi(project(":daemon-common-new"))
     testApi(project(":kotlin-daemon-client"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-jvm"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testCompilerClasspath(project(":kotlin-compiler"))
-    testCompilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    testCompilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     testCompilerClasspath(project(":kotlin-scripting-compiler"))
     testCompilerClasspath(project(":kotlin-daemon"))
     testCompilationClasspath(kotlinStdlib())
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index d8b07dbeb8b..3be8131475f 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -25,11 +25,11 @@ dependencies {
     runtimeOnly(project(":kotlin-script-runtime"))
     runtimeOnly(project(":kotlin-reflect"))
     runtimeOnly(project(":kotlin-daemon-embeddable"))
-    runtimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     Platform[203].orHigher {
-        runtimeOnly(commonDep("net.java.dev.jna", "jna"))
+        runtimeOnly(commonDependency("net.java.dev.jna", "jna"))
     }
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testCompilationClasspath(kotlinStdlib())
 }
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 613fd25338b..d15ad65e82d 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -138,7 +138,7 @@ dependencies {
     api(kotlinStdlib())
     api(project(":kotlin-script-runtime"))
     api(project(":kotlin-reflect"))
-    api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 
     proguardLibraries(project(":kotlin-annotations-jvm"))
 
@@ -157,7 +157,7 @@ dependencies {
         libraries(project(":kotlin-test:kotlin-test-js", configuration = "distLibrary"))
     }
 
-    librariesStripVersion(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    librariesStripVersion(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     distLibraryProjects.forEach {
         libraries(project(it)) { isTransitive = false }
@@ -196,13 +196,13 @@ dependencies {
     buildNumber(project(":prepare:build.version", configuration = "buildVersion"))
 
     fatJarContents(kotlinBuiltins())
-    fatJarContents(commonDep("javax.inject"))
-    fatJarContents(commonDep("org.jline", "jline"))
-    fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
+    fatJarContents(commonDependency("javax.inject"))
+    fatJarContents(commonDependency("org.jline", "jline"))
+    fatJarContents(commonDependency("org.fusesource.jansi", "jansi"))
     fatJarContents(protobufFull())
-    fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
-    fatJarContents(commonDep("io.javaslang", "javaslang"))
-    fatJarContents(commonDep("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false }
+    fatJarContents(commonDependency("com.google.code.findbugs", "jsr305"))
+    fatJarContents(commonDependency("io.javaslang", "javaslang"))
+    fatJarContents(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false }
 
     fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
     fatJarContents(intellijDep()) { includeJars("jna-platform") }
diff --git a/prepare/parcelize-compiler-gradle/build.gradle.kts b/prepare/parcelize-compiler-gradle/build.gradle.kts
index f53f5b8defd..a4c9e4a9f12 100644
--- a/prepare/parcelize-compiler-gradle/build.gradle.kts
+++ b/prepare/parcelize-compiler-gradle/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":plugins:parcelize:parcelize-runtime"))
     runtimeOnly(project(":kotlin-compiler-embeddable"))
-    compileOnly(commonDep("com.google.android", "android"))
+    compileOnly(commonDependency("com.google.android", "android"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     embedded(project(":plugins:parcelize:parcelize-compiler")) { isTransitive = false }
diff --git a/wasm/wasm.ir/build.gradle.kts b/wasm/wasm.ir/build.gradle.kts
index 78ef05504c7..9519ab340bb 100644
--- a/wasm/wasm.ir/build.gradle.kts
+++ b/wasm/wasm.ir/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     implementation(kotlinStdlib())
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testImplementation(projectTests(":compiler:tests-common"))