diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/PlatformAndroidGradleDetector.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt
similarity index 93%
rename from idea/idea-android/src/org/jetbrains/kotlin/android/configure/PlatformAndroidGradleDetector.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt
index 410d0c68bc4..f4e45e564f1 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/PlatformAndroidGradleDetector.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt
@@ -35,9 +35,9 @@ package org.jetbrains.kotlin.android.configure
 import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
-import org.jetbrains.kotlin.idea.inspections.gradle.KotlinPlatformGradleDetector
+import org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade
 
-class PlatformAndroidGradleDetector : KotlinPlatformGradleDetector {
+class AndroidGradleModelFacade : KotlinGradleModelFacade {
     override fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List<String>): String? {
         ExternalSystemApiUtil
                 .findAllRecursively(moduleData, AndroidProjectKeys.JAVA_MODULE_MODEL).asSequence()
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
index 0190b6973c3..58e6411b687 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
@@ -110,7 +110,8 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
                 }
             }
 
-            return getGradleModule()?.dependencies?.mapNotNullTo(LinkedHashSet()) {
+            val dependencies = getGradleModule()?.dependencies
+            return dependencies?.mapNotNullTo(LinkedHashSet()) {
                 val targetModuleName = (it as? IdeaModuleDependency)?.targetModuleName ?: return@mapNotNullTo null
                 val targetGradleModule = gradleIdeaProject.modules.firstOrNull { it.name == targetModuleName } ?: return@mapNotNullTo null
                 ExternalSystemApiUtil.findFirstRecursively(ideProject) {
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt
index 758017ce341..7b51bd516e8 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt
@@ -116,7 +116,7 @@ class DifferentStdlibGradleVersionInspection : GradleBaseInspection() {
 }
 
 internal fun DataNode<*>.getResolvedKotlinStdlibVersionByModuleData(libraryIds: List<String>): String? {
-    return KotlinPlatformGradleDetector.EP_NAME.extensions.asSequence()
+    return KotlinGradleModelFacade.EP_NAME.extensions.asSequence()
             .mapNotNull { it.getResolvedKotlinStdlibVersionByModuleData(this, libraryIds) }
             .firstOrNull()
 }
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinPlatformGradleDetector.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleModelFacade.kt
similarity index 86%
rename from idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinPlatformGradleDetector.kt
rename to idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleModelFacade.kt
index f0583fcbfff..abf20daa806 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinPlatformGradleDetector.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleModelFacade.kt
@@ -21,15 +21,15 @@ import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.ProjectKeys
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 
-interface KotlinPlatformGradleDetector {
+interface KotlinGradleModelFacade {
     companion object {
-        val EP_NAME: ExtensionPointName<KotlinPlatformGradleDetector> = ExtensionPointName.create("org.jetbrains.kotlin.platformGradleDetector")
+        val EP_NAME: ExtensionPointName<KotlinGradleModelFacade> = ExtensionPointName.create("org.jetbrains.kotlin.gradleModelFacade")
     }
 
     fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List<String>): String?
 }
 
-class DefaultPlatformGradleDetector : KotlinPlatformGradleDetector {
+class DefaultGradleModelFacade : KotlinGradleModelFacade {
     override fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List<String>): String? {
         for (libraryDependencyData in ExternalSystemApiUtil.findAllRecursively(moduleData, ProjectKeys.LIBRARY_DEPENDENCY)) {
             for (libraryId in libraryIds) {
diff --git a/idea/src/META-INF/android.xml b/idea/src/META-INF/android.xml
index b12f7681fc7..f60302f5766 100644
--- a/idea/src/META-INF/android.xml
+++ b/idea/src/META-INF/android.xml
@@ -90,7 +90,7 @@
 
         <quickFixContributor implementation="org.jetbrains.kotlin.android.quickfix.AndroidQuickFixRegistrar"/>
         <projectConfigurator implementation="org.jetbrains.kotlin.android.configure.KotlinAndroidGradleModuleConfigurator"/>
-        <platformGradleDetector implementation="org.jetbrains.kotlin.android.configure.PlatformAndroidGradleDetector"/>
+        <gradleModelFacade implementation="org.jetbrains.kotlin.android.configure.AndroidGradleModelFacade"/>
         <completionInformationProvider implementation="org.jetbrains.kotlin.AndroidExtensionsCompletionInformationProvider" />
 
         <expressionCodegenExtension implementation="org.jetbrains.kotlin.android.parcel.IDEParcelableCodegenExtension"/>
diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml
index eea74ce50e6..7f39492c4ec 100644
--- a/idea/src/META-INF/extensions/common.xml
+++ b/idea/src/META-INF/extensions/common.xml
@@ -41,8 +41,8 @@
                         interface="org.jetbrains.kotlin.idea.facet.KotlinFacetConfigurationExtension"/>
         <extensionPoint name="versionInfoProvider"
                         interface="org.jetbrains.kotlin.idea.facet.KotlinVersionInfoProvider"/>
-        <extensionPoint name="platformGradleDetector"
-                        interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinPlatformGradleDetector"/>
+        <extensionPoint name="gradleModelFacade"
+                        interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade"/>
         <extensionPoint name="scriptHelper"
                         interface="org.jetbrains.kotlin.script.ScriptHelper"/>
         <extensionPoint name="completionInformationProvider"
diff --git a/idea/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml
index 5d852f55359..c87b9f4ff64 100644
--- a/idea/src/META-INF/gradle.xml
+++ b/idea/src/META-INF/gradle.xml
@@ -53,7 +53,7 @@
 
         <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
         <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>
-        <platformGradleDetector implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultPlatformGradleDetector"/>
+        <gradleModelFacade implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultGradleModelFacade"/>
 
         <scriptTemplatesProvider
             implementation="org.jetbrains.kotlin.idea.core.script.GradleSettingsKotlinDSLTemplateProvider"/>