diff --git a/build.xml b/build.xml
index 4447adeb6d8..345763d722a 100644
--- a/build.xml
+++ b/build.xml
@@ -461,7 +461,7 @@
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
                 <attribute name="${manifest.impl.attribute.kotlin.version}" value="${manifest.impl.value.kotlin.version}"/>
-                <attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.core}"/>
+                <attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.main}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
                 <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.javascript.stdlib}"/>
@@ -479,7 +479,7 @@
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
                 <attribute name="${manifest.impl.attribute.kotlin.version}" value="${manifest.impl.value.kotlin.version}"/>
-                <attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.core}"/>
+                <attribute name="${manifest.impl.attribute.kotlin.runtime.component}" value="${manifest.impl.value.kotlin.runtime.component.main}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
                 <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.jvm.runtime.sources}"/>
@@ -1119,7 +1119,7 @@
         <attribute name="jar-dir" default="${kotlin-home}/lib"/>
         <attribute name="jar-name"/>
         <attribute name="implementation-title"/>
-        <attribute name="runtime-component" default="${manifest.impl.value.kotlin.runtime.component.core}"/>
+        <attribute name="runtime-component" default="${manifest.impl.value.kotlin.runtime.component.main}"/>
         <element name="jar-content"/>
 
         <sequential>
diff --git a/libraries/stdlib/common/pom.xml b/libraries/stdlib/common/pom.xml
index 80b30f544a9..3f29ac0167e 100644
--- a/libraries/stdlib/common/pom.xml
+++ b/libraries/stdlib/common/pom.xml
@@ -115,7 +115,7 @@
                     <archive>
                         <manifestEntries>
                             <Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
-                            <Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
+                            <Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/libraries/stdlib/jre7/pom.xml b/libraries/stdlib/jre7/pom.xml
index e12e03c0823..e732b6c373b 100644
--- a/libraries/stdlib/jre7/pom.xml
+++ b/libraries/stdlib/jre7/pom.xml
@@ -85,7 +85,7 @@
                     <archive>
                         <manifestEntries>
                             <Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
-                            <Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
+                            <Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/libraries/stdlib/jre8/pom.xml b/libraries/stdlib/jre8/pom.xml
index a0b73dcc84e..0cbbda29e19 100644
--- a/libraries/stdlib/jre8/pom.xml
+++ b/libraries/stdlib/jre8/pom.xml
@@ -86,7 +86,7 @@
                     <archive>
                         <manifestEntries>
                             <Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
-                            <Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
+                            <Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 7ed4e60b448..2a000a743c0 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -76,7 +76,7 @@
                     <archive>
                         <manifestEntries>
                             <Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
-                            <Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
+                            <Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
index e9a0d08b46d..8ab265c7ab0 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt
@@ -17,7 +17,7 @@ val LIBRARIES = listOf(
 
 const val KOTLIN_VERSION = "Kotlin-Version"
 const val KOTLIN_RUNTIME_COMPONENT = "Kotlin-Runtime-Component"
-const val KOTLIN_RUNTIME_COMPONENT_VALUE = "Core"
+const val KOTLIN_RUNTIME_COMPONENT_VALUE = "Main"
 val KOTLIN_VERSION_VALUE = with(KotlinVersion.CURRENT) { "$major.$minor" }
 
 fun main(args: Array<String>) {
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index 3ab4c0cae25..a24e668462f 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -114,7 +114,7 @@
                     <archive>
                         <manifestEntries>
                             <Kotlin-Version>${kotlin.language.version}</Kotlin-Version>
-                            <Kotlin-Runtime-Component>Core</Kotlin-Runtime-Component>
+                            <Kotlin-Runtime-Component>Main</Kotlin-Runtime-Component>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index f40c9147391..efa124bb2fb 100644
--- a/resources/kotlinManifest.properties
+++ b/resources/kotlinManifest.properties
@@ -3,6 +3,7 @@ manifest.impl.vendor=JetBrains
 manifest.impl.attribute.kotlin.version=Kotlin-Version
 manifest.impl.value.kotlin.version=1.1
 manifest.impl.attribute.kotlin.runtime.component=Kotlin-Runtime-Component
+# suppress inspection "UnusedProperty" (Used reflectively in JvmRuntimeVersionsConsistencyChecker)
 manifest.impl.value.kotlin.runtime.component.core=Core
 manifest.impl.value.kotlin.runtime.component.main=Main