diff --git a/.idea/artifacts/instrumentation_jar.xml b/.idea/artifacts/Instrumentation.xml
similarity index 66%
rename from .idea/artifacts/instrumentation_jar.xml
rename to .idea/artifacts/Instrumentation.xml
index c1e9ce3ccad..908fba322f2 100644
--- a/.idea/artifacts/instrumentation_jar.xml
+++ b/.idea/artifacts/Instrumentation.xml
@@ -1,7 +1,7 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="instrumentation:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/instrumentation_jar</output-path>
-    <root id="archive" name="instrumentation.jar">
+  <artifact type="jar" name="Instrumentation">
+    <output-path>$PROJECT_DIR$/out/artifacts/Instrumentation</output-path>
+    <root id="archive" name="Instrumentation.jar">
       <element id="module-output" name="instrumentation" />
       <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/jetbrains-asm-debug-all-4.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar" path-in-jar="/" />
diff --git a/.idea/artifacts/KotlinBarePlugin.xml b/.idea/artifacts/KotlinBarePlugin.xml
index 4dc7ce7bd47..dc4df90c62d 100644
--- a/.idea/artifacts/KotlinBarePlugin.xml
+++ b/.idea/artifacts/KotlinBarePlugin.xml
@@ -12,19 +12,7 @@
             <element id="module-output" name="descriptors" />
           </element>
           <element id="directory" name="jps">
-            <element id="archive" name="kotlin-jps-plugin.jar">
-              <element id="module-output" name="jps-plugin" />
-              <element id="directory" name="META-INF">
-                <element id="dir-copy" path="$PROJECT_DIR$/jps-plugin/src/META-INF" />
-              </element>
-              <element id="module-output" name="ide-compiler-runner" />
-              <element id="module-output" name="cli-common" />
-              <element id="module-output" name="util" />
-              <element id="module-output" name="preloader" />
-              <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
-              <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
-              <element id="module-output" name="util.runtime" />
-            </element>
+            <element id="artifact" artifact-name="KotlinJpsPlugin" />
           </element>
           <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
         </element>
diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
new file mode 100644
index 00000000000..89d82e715b1
--- /dev/null
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -0,0 +1,18 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="KotlinJpsPlugin">
+    <output-path>$PROJECT_DIR$/out/artifacts/KotlinJpsPlugin</output-path>
+    <root id="archive" name="KotlinJpsPlugin.jar">
+      <element id="directory" name="META-INF">
+        <element id="dir-copy" path="$PROJECT_DIR$/jps-plugin/src/META-INF" />
+      </element>
+      <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
+      <element id="module-output" name="cli-common" />
+      <element id="module-output" name="ide-compiler-runner" />
+      <element id="module-output" name="jps-plugin" />
+      <element id="module-output" name="preloader" />
+      <element id="module-output" name="util" />
+      <element id="module-output" name="util.runtime" />
+      <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index d89f3cd95ee..f732bf02a6d 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -34,19 +34,7 @@
           </element>
           <element id="library" level="project" name="javax.inject" />
           <element id="directory" name="jps">
-            <element id="archive" name="kotlin-jps-plugin.jar">
-              <element id="module-output" name="jps-plugin" />
-              <element id="directory" name="META-INF">
-                <element id="dir-copy" path="$PROJECT_DIR$/jps-plugin/src/META-INF" />
-              </element>
-              <element id="module-output" name="ide-compiler-runner" />
-              <element id="module-output" name="cli-common" />
-              <element id="module-output" name="util" />
-              <element id="module-output" name="preloader" />
-              <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
-              <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
-              <element id="module-output" name="util.runtime" />
-            </element>
+            <element id="artifact" artifact-name="KotlinJpsPlugin" />
           </element>
           <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
         </element>