diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
index 3fe3eac2f47..cd46c54c965 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
@@ -14,22 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.jetbrains.kotlin.config
 
 import com.intellij.openapi.components.ServiceManager
@@ -69,13 +53,13 @@ object JSPlatform : TargetPlatformKind<NoVersion>(NoVersion, "JavaScript")
 data class KotlinVersionInfo(
         var languageLevel: LanguageVersion? = null,
         var apiLevel: LanguageVersion? = null,
-        @get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null
+        @get:Transient var targetPlatformKind: TargetPlatformKind<*>? = null
 ) {
     // To be serialized
     var targetPlatformName: String
-        get() = targetPlatformKindKind?.description ?: ""
+        get() = targetPlatformKind?.description ?: ""
         set(value) {
-            targetPlatformKindKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value }
+            targetPlatformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value }
         }
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index d747e6e2916..407cf37f311 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -107,7 +107,7 @@ class KotlinFacetEditorGeneralTab(
     override fun isModified(): Boolean {
         return with(configuration.state.versionInfo) {
             languageVersionComboBox.selectedItem != languageLevel
-            || targetPlatformComboBox.selectedItem != targetPlatformKindKind
+            || targetPlatformComboBox.selectedItem != targetPlatformKind
             || apiVersionComboBox.selectedItem != apiLevel
         }
     }
@@ -115,7 +115,7 @@ class KotlinFacetEditorGeneralTab(
     override fun reset() {
         with(configuration.state.versionInfo) {
             languageVersionComboBox.selectedItem = languageLevel
-            targetPlatformComboBox.selectedItem = targetPlatformKindKind
+            targetPlatformComboBox.selectedItem = targetPlatformKind
             apiVersionComboBox.selectedItem = apiLevel
         }
     }
@@ -123,7 +123,7 @@ class KotlinFacetEditorGeneralTab(
     override fun apply() {
         with(configuration.state.versionInfo) {
             languageLevel = languageVersionComboBox.selectedItem as LanguageVersion?
-            targetPlatformKindKind = targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?
+            targetPlatformKind = targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?
             apiLevel = apiVersionComboBox.selectedItem as LanguageVersion?
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index e7730cb2a5a..b42dbe2b4ca 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -101,8 +101,8 @@ internal fun KotlinFacetSettings.initializeIfNeeded(module: Module, rootModel: M
     val project = module.project
 
     with(versionInfo) {
-        if (targetPlatformKindKind == null) {
-            targetPlatformKindKind = getDefaultTargetPlatform(module, rootModel)
+        if (targetPlatformKind == null) {
+            targetPlatformKind = getDefaultTargetPlatform(module, rootModel)
         }
 
         if (languageLevel == null) {
@@ -110,7 +110,7 @@ internal fun KotlinFacetSettings.initializeIfNeeded(module: Module, rootModel: M
         }
 
         if (apiLevel == null) {
-            apiLevel = languageLevel!!.coerceAtMost(getLibraryLanguageLevel(module, rootModel, targetPlatformKindKind!!))
+            apiLevel = languageLevel!!.coerceAtMost(getLibraryLanguageLevel(module, rootModel, targetPlatformKind!!))
         }
     }
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
index 0a50eb22998..d8031eb4999 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt
@@ -78,7 +78,7 @@ class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
         fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments {
             val defaultArguments = getSettings(module.project).k2JvmCompilerArguments
             val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments
-            val targetPlatform = facetSettings.versionInfo.targetPlatformKindKind as? JVMPlatform ?: return defaultArguments
+            val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? JVMPlatform ?: return defaultArguments
             return copyBean(defaultArguments).apply {
                 jvmTarget = targetPlatform.version.description
             }