diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
index 0661a26d16e..8742f51c267 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
@@ -896,7 +896,7 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinExecuti
 public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinExecution$ExecutionSource {
 }
 
-public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPoint {
+public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPoint {
 	public abstract fun get (Lorg/gradle/api/Project;)Ljava/util/List;
 	public abstract fun register (Lorg/gradle/api/Project;Ljava/lang/Object;)V
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPoint.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPoint.kt
similarity index 92%
rename from libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPoint.kt
rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPoint.kt
index d548040c27c..edd2bf701b8 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPoint.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPoint.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
  * Note: Not stable for implementation: Custom implementations of this interface will not be supported by the Kotlin Gradle Plugin!
  *
  * #### Motivation
- * This [KotlinExtensionPoint] will be used to 'generically' extend parts of the Kotlin Gradle Plugin (internally and externally).
+ * This [KotlinGradlePluginExtensionPoint] will be used to 'generically' extend parts of the Kotlin Gradle Plugin (internally and externally).
  * General Kotlin Gradle Plugin code will call into this 'semantically' structured extension points to load logic
  * Such extension points are to be used for public as well as for internal extension points.
  *
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
  * [org.jetbrains.kotlin.gradle.plugin.registerKotlinPluginExtensions] entry point.
  */
 @ExperimentalKotlinGradlePluginApi
-interface KotlinExtensionPoint<T> {
+interface KotlinGradlePluginExtensionPoint<T> {
     /**
      * @return all currently registered extension points.
      * The returned list is *not* live and just represents the current snapshot.
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPointInternal.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPointInternal.kt
similarity index 70%
rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPointInternal.kt
rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPointInternal.kt
index 228d19fd82e..06a9c16209e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExtensionPointInternal.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradlePluginExtensionPointInternal.kt
@@ -10,20 +10,20 @@ import org.jetbrains.kotlin.gradle.utils.storedProjectProperty
 import org.jetbrains.kotlin.tooling.core.UnsafeApi
 
 /**
- * Creates a new [KotlinExtensionPoint]
- * See [KotlinExtensionPoint] documentation for the intended usage!
+ * Creates a new [KotlinGradlePluginExtensionPoint]
+ * See [KotlinGradlePluginExtensionPoint] documentation for the intended usage!
  */
-internal fun <T> KotlinExtensionPoint(): KotlinExtensionPoint<T> {
+internal fun <T> KotlinGradlePluginExtensionPoint(): KotlinGradlePluginExtensionPoint<T> {
     @OptIn(UnsafeApi::class)
-    return KotlinExtensionPointInternal()
+    return KotlinGradlePluginExtensionPointInternal()
 }
 
 /**
- * Only intended implementation of [KotlinExtensionPoint]!
+ * Only intended implementation of [KotlinGradlePluginExtensionPoint]!
  * Visible for tests to allow test utils to overwrite certain extension points
  */
 @UnsafeApi("Visible for tests only")
-internal class KotlinExtensionPointInternal<T> : KotlinExtensionPoint<T> {
+internal class KotlinGradlePluginExtensionPointInternal<T> : KotlinGradlePluginExtensionPoint<T> {
 
     private val Project.registeredExtensions by storedProjectProperty<MutableList<T>> { mutableListOf() }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinGradleProjectChecker.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinGradleProjectChecker.kt
index 7687b80a9e5..eed97664e91 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinGradleProjectChecker.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinGradleProjectChecker.kt
@@ -7,14 +7,10 @@ package org.jetbrains.kotlin.gradle.plugin.diagnostics
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.dsl.AndroidMainSourceSetConventionsChecker
-import org.jetbrains.kotlin.gradle.dsl.IosSourceSetConventionChecker
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.dsl.PlatformSourceSetConventionsChecker
-import org.jetbrains.kotlin.gradle.plugin.KotlinExtensionPoint
+import org.jetbrains.kotlin.gradle.plugin.KotlinGradlePluginExtensionPoint
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
-import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.*
 
 /**
  * Interface for generic checks of a Gradle Project with any Kotlin Gradle Plugin applied.
@@ -97,7 +93,7 @@ internal interface KotlinGradleProjectChecker {
     suspend fun KotlinGradleProjectCheckerContext.runChecks(collector: KotlinToolingDiagnosticsCollector)
 
     companion object {
-        val extensionPoint = KotlinExtensionPoint<KotlinGradleProjectChecker>()
+        val extensionPoint = KotlinGradlePluginExtensionPoint<KotlinGradleProjectChecker>()
     }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
index f15462d64b9..08e4c10d3fd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.dsl.AndroidMainSourceSetConventionsChecker
 import org.jetbrains.kotlin.gradle.dsl.IosSourceSetConventionChecker
 import org.jetbrains.kotlin.gradle.dsl.PlatformSourceSetConventionsChecker
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinGradleProjectChecker
-import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.*
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.AndroidPluginWithoutAndroidTargetChecker
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.AndroidSourceSetLayoutV1SourceSetsNotFoundChecker
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.CommonMainOrTestWithDependsOnChecker
@@ -29,7 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.UnusedSourceSetsC
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.WasmSourceSetsNotFoundChecker
 
 /**
- * Active Extensions (using the [KotlinExtensionPoint] infrastructure) will be registered here by the Kotlin Gradle Plugin.
+ * Active Extensions (using the [KotlinGradlePluginExtensionPoint] infrastructure) will be registered here by the Kotlin Gradle Plugin.
  */
 internal fun Project.registerKotlinPluginExtensions() {
     KotlinGradleProjectChecker.extensionPoint.apply {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinExtensionPointTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinGradlePluginExtensionPointTest.kt
similarity index 82%
rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinExtensionPointTest.kt
rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinGradlePluginExtensionPointTest.kt
index c0a5a9e124c..472113a87ac 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinExtensionPointTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinGradlePluginExtensionPointTest.kt
@@ -9,15 +9,15 @@ package org.jetbrains.kotlin.gradle.unitTests
 
 import org.jetbrains.kotlin.gradle.util.buildProject
 import org.jetbrains.kotlin.gradle.util.set
-import org.jetbrains.kotlin.gradle.plugin.KotlinExtensionPoint
+import org.jetbrains.kotlin.gradle.plugin.KotlinGradlePluginExtensionPoint
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class KotlinExtensionPointTest {
+class KotlinGradlePluginExtensionPointTest {
 
     @Test
     fun `test - simple extension point`() {
-        val extensionPoint = KotlinExtensionPoint<String>()
+        val extensionPoint = KotlinGradlePluginExtensionPoint<String>()
         val projectA = buildProject()
         val projectB = buildProject()
 
@@ -33,7 +33,7 @@ class KotlinExtensionPointTest {
 
     @Test
     fun `test - overwrite`() {
-        val extensionPoint = KotlinExtensionPoint<Int>()
+        val extensionPoint = KotlinGradlePluginExtensionPoint<Int>()
         val project = buildProject()
 
         extensionPoint.register(project, 0)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/extensionPointUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/extensionPointUtils.kt
index 3caf769ff71..29e3a244749 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/extensionPointUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/extensionPointUtils.kt
@@ -6,15 +6,15 @@
 package org.jetbrains.kotlin.gradle.util
 
 import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.plugin.KotlinExtensionPoint
-import org.jetbrains.kotlin.gradle.plugin.KotlinExtensionPointInternal
+import org.jetbrains.kotlin.gradle.plugin.KotlinGradlePluginExtensionPoint
+import org.jetbrains.kotlin.gradle.plugin.KotlinGradlePluginExtensionPointInternal
 import org.jetbrains.kotlin.tooling.core.UnsafeApi
 
 /**
- * Completely overwrites the currently registered extensions on this [KotlinExtensionPoint] in this project.
+ * Completely overwrites the currently registered extensions on this [KotlinGradlePluginExtensionPoint] in this project.
  */
 @OptIn(UnsafeApi::class)
-operator fun <T> KotlinExtensionPoint<T>.set(project: Project, extensions: List<T>) {
-    (this as KotlinExtensionPointInternal<T>)
+operator fun <T> KotlinGradlePluginExtensionPoint<T>.set(project: Project, extensions: List<T>) {
+    (this as KotlinGradlePluginExtensionPointInternal<T>)
     set(project, extensions)
 }