Minor: fix testdata

jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log

@@ -6,7 +6,7 @@ End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module1/src/module1_C.java
+  module1/src/C.java
 End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -19,7 +19,7 @@ Cleaning output files:
   out/production/module1/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
@@ -27,7 +27,7 @@ Cleaning output files:
   out/production/module1/B.class
 End of files
 Compiling files:
-  module1/src/module1_B.kt
+  module1/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log

@@ -4,7 +4,7 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -12,7 +12,7 @@ Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -20,7 +20,7 @@ Cleaning output files:
   out/production/module3/c/C.class
 End of files
 Compiling files:
-  module3/src/module3_C.kt
+  module3/src/C.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -28,7 +28,7 @@ Cleaning output files:
   out/production/module4/D/D.class
 End of files
 Compiling files:
-  module4/src/module4_D.kt
+  module4/src/D.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log

@@ -4,20 +4,20 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_A.kt
-  module2/src/module2_B.kt
-  module3/src/module3_C.kt
-  module4/src/module4_D.kt
+  module1/src/A.kt
+  module2/src/B.kt
+  module3/src/C.kt
+  module4/src/D.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -25,7 +25,7 @@ Cleaning output files:
   out/production/module3/c/C.class
 End of files
 Compiling files:
-  module3/src/module3_C.kt
+  module3/src/C.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -33,7 +33,7 @@ Cleaning output files:
   out/production/module4/D/D.class
 End of files
 Compiling files:
-  module4/src/module4_D.kt
+  module4/src/D.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log

@@ -6,7 +6,7 @@ End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module1/src/module1_A.java
+  module1/src/A.java
 End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -21,7 +21,7 @@ End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module1/src/module1_B.java
+  module1/src/B.java
 End of files
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log

@@ -6,35 +6,35 @@ Cleaning output files:
   out/production/module4/module4/D.class
 End of files
 Compiling files:
-  module4/src/module4_d.kt
+  module4/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
+  out/production/module1/module1/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/Module3_cKt.class
+  out/production/module3/module3/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log

@@ -6,40 +6,40 @@ Cleaning output files:
   out/production/module4/module4/D.class
 End of files
 Compiling files:
-  module4/src/module4_d.kt
+  module4/src/d.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_a.kt
-  module2/src/module2_b.kt
-  module3/src/module3_c.kt
-  module4/src/module4_d.kt
+  module1/src/a.kt
+  module2/src/b.kt
+  module3/src/c.kt
+  module4/src/d.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
+  out/production/module1/module1/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/Module3_cKt.class
+  out/production/module3/module3/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log

@@ -3,19 +3,19 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
+  out/production/module1/module1/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log

@@ -3,22 +3,22 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
+  out/production/module1/module1/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_a.kt
-  module2/src/module2_b.kt
+  module1/src/a.kt
+  module2/src/b.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log

@@ -2,10 +2,10 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_AKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -13,7 +13,7 @@ Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log

@@ -2,21 +2,21 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_AKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_A.kt
-  module2/src/module2_B.kt
+  module1/src/A.kt
+  module2/src/B.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log

@@ -3,10 +3,10 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_AKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -14,7 +14,7 @@ Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log

@@ -3,21 +3,21 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_AKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_A.kt
-  module2/src/module2_B.kt
+  module1/src/A.kt
+  module2/src/B.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/b/B.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log

@@ -6,19 +6,19 @@ Cleaning output files:
   out/production/module4/module4/D.class
 End of files
 Compiling files:
-  module4/src/module4_d.kt
+  module4/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
-  out/production/module1/module1/Module1_fKt.class
+  out/production/module1/module1/AKt.class
+  out/production/module1/module1/FKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_f.kt
+  module1/src/a.kt
+  module1/src/f.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -32,26 +32,26 @@ Exit code: NOTHING_DONE
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_f.kt
+  module1/src/a.kt
+  module1/src/f.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/Module3_cKt.class
+  out/production/module3/module3/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log

@@ -6,25 +6,25 @@ Cleaning output files:
   out/production/module4/module4/D.class
 End of files
 Compiling files:
-  module4/src/module4_d.kt
+  module4/src/d.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_a.kt
-  module1/src/module1_f.kt
-  module2/src/module2_b.kt
-  module3/src/module3_c.kt
-  module4/src/module4_d.kt
+  module1/src/a.kt
+  module1/src/f.kt
+  module2/src/b.kt
+  module3/src/c.kt
+  module4/src/d.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/module1/A.class
-  out/production/module1/module1/Module1_aKt.class
-  out/production/module1/module1/Module1_fKt.class
+  out/production/module1/module1/AKt.class
+  out/production/module1/module1/FKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_f.kt
+  module1/src/a.kt
+  module1/src/f.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -38,26 +38,26 @@ Exit code: NOTHING_DONE
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_f.kt
+  module1/src/a.kt
+  module1/src/f.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/Module2_bKt.class
+  out/production/module2/module2/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/Module3_cKt.class
+  out/production/module3/module3/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log

@@ -4,30 +4,30 @@ Cleaning output files:
   out/production/module1/foo/Z.class
 End of files
 Compiling files:
-  module1/src/module1_z.kt
+  module1/src/z.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_z.kt
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
-  module3/src/module3_d.kt
-  module4/src/module4_e.kt
+  module1/src/z.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
+  module3/src/d.kt
+  module4/src/e.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/A.class
+  out/production/module2/foo/AKt.class
   out/production/module2/foo/B.class
+  out/production/module2/foo/BKt.class
   out/production/module2/foo/C.class
-  out/production/module2/foo/Module2_aKt.class
-  out/production/module2/foo/Module2_bKt.class
-  out/production/module2/foo/Module2_cKt.class
+  out/production/module2/foo/CKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -35,7 +35,7 @@ Cleaning output files:
   out/production/module3/foo/D.class
 End of files
 Compiling files:
-  module3/src/module3_d.kt
+  module3/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -43,7 +43,7 @@ Cleaning output files:
   out/production/module4/foo/E.class
 End of files
 Compiling files:
-  module4/src/module4_e.kt
+  module4/src/e.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -55,10 +55,10 @@ Exit code: NOTHING_DONE
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/A.class
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
+  module2/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log

@@ -1,37 +1,37 @@
 ================ Step #1 =================
 
 Cleaning output files:
+  out/production/module1/AKt.class
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/Module1_aKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_a.kt
-  module2/src/module2_c.kt
-  module3/src/module3_d.kt
+  module1/src/a.kt
+  module2/src/c.kt
+  module3/src/d.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/B.class
+  out/production/module2/CKt.class
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/Module2_cKt.class
 End of files
 Compiling files:
-  module2/src/module2_c.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Compiling files:
-  module2/src/module2_B.java
+  module2/src/B.java
 End of files
 Cleaning output files:
+  out/production/module3/DKt.class
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/Module3_dKt.class
 End of files
 Compiling files:
-  module3/src/module3_d.kt
+  module3/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log

@@ -4,30 +4,30 @@ Cleaning output files:
   out/production/module1/foo/Z.class
 End of files
 Compiling files:
-  module1/src/module1_z.kt
+  module1/src/z.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_z.kt
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
-  module3/src/module3_d.kt
-  module4/src/module4_e.kt
+  module1/src/z.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
+  module3/src/d.kt
+  module4/src/e.kt
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/A.class
+  out/production/module2/foo/AKt.class
   out/production/module2/foo/B.class
+  out/production/module2/foo/BKt.class
   out/production/module2/foo/C.class
-  out/production/module2/foo/Module2_aKt.class
-  out/production/module2/foo/Module2_bKt.class
-  out/production/module2/foo/Module2_cKt.class
+  out/production/module2/foo/CKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -35,7 +35,7 @@ Cleaning output files:
   out/production/module3/foo/D.class
 End of files
 Compiling files:
-  module3/src/module3_d.kt
+  module3/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -43,7 +43,7 @@ Cleaning output files:
   out/production/module4/foo/E.class
 End of files
 Compiling files:
-  module4/src/module4_e.kt
+  module4/src/e.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -55,10 +55,10 @@ Exit code: NOTHING_DONE
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/A.class
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
+  module2/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -74,23 +74,23 @@ Exit code: NOTHING_DONE
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/A.class
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
+  module2/src/a.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/foo/B.class
+  out/production/module2/foo/BKt.class
   out/production/module2/foo/C.class
-  out/production/module2/foo/Module2_bKt.class
-  out/production/module2/foo/Module2_cKt.class
+  out/production/module2/foo/CKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log

@@ -4,12 +4,12 @@ Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -24,12 +24,12 @@ Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log

@@ -4,12 +4,12 @@ Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -24,20 +24,20 @@ Cleaning output files:
   out/production/module1/foo/Z.class
 End of files
 Compiling files:
-  module1/src/module1_z.kt
+  module1/src/z.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_aKt.class
-  out/production/module2/foo/Module2_bKt.class
-  out/production/module2/foo/Module2_cKt.class
+  out/production/module2/foo/AKt.class
+  out/production/module2/foo/BKt.class
+  out/production/module2/foo/CKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
-  module2/src/module2_b.kt
-  module2/src/module2_c.kt
+  module2/src/a.kt
+  module2/src/b.kt
+  module2/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -45,7 +45,7 @@ Cleaning output files:
   out/production/module3/foo/D.class
 End of files
 Compiling files:
-  module3/src/module3_d.kt
+  module3/src/d.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -53,7 +53,7 @@ Cleaning output files:
   out/production/module4/foo/E.class
 End of files
 Compiling files:
-  module4/src/module4_e.kt
+  module4/src/e.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -64,21 +64,21 @@ Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_aKt.class
+  out/production/module2/foo/AKt.class
 End of files
 Compiling files:
-  module2/src/module2_a.kt
+  module2/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_bKt.class
+  out/production/module2/foo/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log

@@ -4,14 +4,14 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_D.kt
-  module2/src/module2_B.kt
-  module3/src/module3_C.kt
-  module4/src/module4_E.kt
-  module5/src/module5_F.kt
+  module1/src/D.kt
+  module2/src/B.kt
+  module3/src/C.kt
+  module4/src/E.kt
+  module5/src/F.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
@@ -20,13 +20,13 @@ Cleaning output files:
   out/production/module3/foo/C.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Compiling files:
-  module3/src/module3_C.kt
+  module3/src/C.kt
 End of files
 Compiling files:
-  module1/src/module1_D.kt
+  module1/src/D.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -39,18 +39,18 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module2/src/module2_B.kt
+  module2/src/B.kt
 End of files
 Compiling files:
-  module3/src/module3_C.kt
+  module3/src/C.kt
 End of files
 Compiling files:
-  module1/src/module1_A.kt
-  module1/src/module1_D.kt
+  module1/src/A.kt
+  module1/src/D.kt
 End of files
 Marked as dirty by Kotlin:
-  module4/src/module4_E.kt
-  module5/src/module5_F.kt
+  module4/src/E.kt
+  module5/src/F.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
@@ -59,7 +59,7 @@ Cleaning output files:
   out/production/module4/foo/E.class
 End of files
 Compiling files:
-  module4/src/module4_E.kt
+  module4/src/E.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -67,7 +67,7 @@ Cleaning output files:
   out/production/module5/foo/F.class
 End of files
 Compiling files:
-  module5/src/module5_F.kt
+  module5/src/F.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log

@@ -4,23 +4,23 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_createADefault.kt
-  module2/src/module2_createANonDefault.kt
+  module2/src/createADefault.kt
+  module2/src/createANonDefault.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_createADefaultKt.class
-  out/production/module2/foo/Module2_createANonDefaultKt.class
+  out/production/module2/foo/CreateADefaultKt.class
+  out/production/module2/foo/CreateANonDefaultKt.class
 End of files
 Compiling files:
-  module2/src/module2_createADefault.kt
-  module2/src/module2_createANonDefault.kt
+  module2/src/createADefault.kt
+  module2/src/createANonDefault.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -32,7 +32,7 @@ Too many arguments for public constructor A() defined in foo.A
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module2/src/module2_createADefault.kt
+  module2/src/createADefault.kt
 End of files
 Exit code: OK
-------------------------------------------
+------------------------------------------

jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log

@@ -4,23 +4,23 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_createADefault.kt
-  module2/src/module2_createANonDefault.kt
+  module2/src/createADefault.kt
+  module2/src/createANonDefault.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/Module2_createADefaultKt.class
-  out/production/module2/foo/Module2_createANonDefaultKt.class
+  out/production/module2/foo/CreateADefaultKt.class
+  out/production/module2/foo/CreateANonDefaultKt.class
 End of files
 Compiling files:
-  module2/src/module2_createADefault.kt
-  module2/src/module2_createANonDefault.kt
+  module2/src/createADefault.kt
+  module2/src/createANonDefault.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -32,7 +32,7 @@ No value passed for parameter x
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module2/src/module2_createANonDefault.kt
+  module2/src/createANonDefault.kt
 End of files
 Exit code: OK
-------------------------------------------
+------------------------------------------

jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log

@@ -4,13 +4,13 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_AChild.kt
-  module3/src/module3_AGrandChild.kt
-  module3/src/module3_importAGrandChild.kt
-  module4/src/module4_importAGrandChild.kt
+  module2/src/AChild.kt
+  module3/src/AGrandChild.kt
+  module3/src/importAGrandChild.kt
+  module4/src/importAGrandChild.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
@@ -19,7 +19,7 @@ Cleaning output files:
   out/production/module2/foo/AChild.class
 End of files
 Compiling files:
-  module2/src/module2_AChild.kt
+  module2/src/AChild.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -33,19 +33,19 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_AChild.kt
-  module3/src/module3_AGrandChild.kt
-  module3/src/module3_importAGrandChild.kt
-  module4/src/module4_importAGrandChild.kt
+  module2/src/AChild.kt
+  module3/src/AGrandChild.kt
+  module3/src/importAGrandChild.kt
+  module4/src/importAGrandChild.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module2/src/module2_AChild.kt
+  module2/src/AChild.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -53,13 +53,13 @@ Cleaning output files:
   out/production/module3/foo/AGrandChild.class
 End of files
 Compiling files:
-  module3/src/module3_AGrandChild.kt
-  module3/src/module3_importAGrandChild.kt
+  module3/src/AGrandChild.kt
+  module3/src/importAGrandChild.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Compiling files:
-  module4/src/module4_importAGrandChild.kt
+  module4/src/importAGrandChild.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log

@@ -4,12 +4,12 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_AChild.kt
-  module2/src/module2_importA.kt
-  module3/src/module3_importAChild.kt
+  module2/src/AChild.kt
+  module2/src/importA.kt
+  module3/src/importAChild.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
@@ -18,8 +18,8 @@ Cleaning output files:
   out/production/module2/foo/AChild.class
 End of files
 Compiling files:
-  module2/src/module2_AChild.kt
-  module2/src/module2_importA.kt
+  module2/src/AChild.kt
+  module2/src/importA.kt
 End of files
 Exit code: ABORT
 ------------------------------------------
@@ -34,24 +34,24 @@ Cleaning output files:
   out/production/module1/foo/A.class
 End of files
 Compiling files:
-  module1/src/module1_A.kt
+  module1/src/A.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_AChild.kt
-  module2/src/module2_importA.kt
-  module3/src/module3_importAChild.kt
+  module2/src/AChild.kt
+  module2/src/importA.kt
+  module3/src/importAChild.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  module2/src/module2_AChild.kt
-  module2/src/module2_importA.kt
+  module2/src/AChild.kt
+  module2/src/importA.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Compiling files:
-  module3/src/module3_importAChild.kt
+  module3/src/importAChild.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log

@@ -5,7 +5,7 @@ Cleaning output files:
   out/production/module2/b/BB.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
@@ -14,7 +14,7 @@ Cleaning output files:
   out/production/module1/a/AA.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log

@@ -5,10 +5,10 @@ Cleaning output files:
   out/production/module2/b/BB.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Marked as dirty by Kotlin:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
@@ -16,7 +16,7 @@ Cleaning output files:
   out/production/module1/a/AA.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log

@@ -2,10 +2,10 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/Module1_aKt.class
+  out/production/module1/test/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log

@@ -2,20 +2,20 @@
 
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log

@@ -2,10 +2,10 @@
 
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log

@@ -2,27 +2,27 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
-  out/production/module1/c/Module1_c2Kt.class
+  out/production/module1/a/AKt.class
+  out/production/module1/c/C2Kt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_c2.kt
+  module1/src/a.kt
+  module1/src/c2.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/c/Module1_c1Kt.class
+  out/production/module1/c/C1Kt.class
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/b/B.class
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Compiling files:
-  module1/src/module1_c1.kt
+  module1/src/c1.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log

@@ -2,12 +2,12 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
-  out/production/module1/c/Module1_c2Kt.class
+  out/production/module1/a/AKt.class
+  out/production/module1/c/C2Kt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
-  module1/src/module1_c2.kt
+  module1/src/a.kt
+  module1/src/c2.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log

@@ -2,10 +2,10 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/Module1_constKt.class
+  out/production/module1/test/ConstKt.class
 End of files
 Compiling files:
-  module1/src/module1_const.kt
+  module1/src/const.kt
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
@@ -15,7 +15,7 @@ Cleaning output files:
   out/production/module2/usage/Usage.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log

@@ -2,21 +2,21 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/Module1_constKt.class
+  out/production/module1/test/ConstKt.class
 End of files
 Compiling files:
-  module1/src/module1_const.kt
+  module1/src/const.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/Module1_constKt.class
+  out/production/module1/test/ConstKt.class
 End of files
 Compiling files:
-  module1/src/module1_const.kt
+  module1/src/const.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -24,7 +24,7 @@ Cleaning output files:
   out/production/module2/usage/Usage.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log

@@ -4,16 +4,16 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log

@@ -4,20 +4,20 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log

@@ -2,19 +2,19 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log

@@ -2,23 +2,23 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log

@@ -4,16 +4,16 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log

@@ -4,20 +4,20 @@ Cleaning output files:
   out/production/module1/a/A.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log

@@ -2,19 +2,19 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log

@@ -2,23 +2,23 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log

@@ -2,23 +2,23 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/Module1_inlineKt.class
+  out/production/module1/inline/InlineKt.class
 End of files
 Compiling files:
-  module1/src/module1_inline.kt
+  module1/src/inline.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageKt.class
+  out/production/module2/usage/UsageKt.class
 End of files
 Compiling files:
-  module2/src/module2_usage.kt
+  module2/src/usage.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log

@@ -2,23 +2,23 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/Module1_inlineFKt.class
+  out/production/module1/inline/InlineFKt.class
 End of files
 Compiling files:
-  module1/src/module1_inlineF.kt
+  module1/src/inlineF.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usageF.kt
+  module2/src/usageF.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageFKt.class
+  out/production/module2/usage/UsageFKt.class
 End of files
 Compiling files:
-  module2/src/module2_usageF.kt
+  module2/src/usageF.kt
 End of files
 Exit code: OK
 ------------------------------------------
@@ -27,23 +27,23 @@ Exit code: OK
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/Module1_inlineGKt.class
+  out/production/module1/inline/InlineGKt.class
 End of files
 Compiling files:
-  module1/src/module1_inlineG.kt
+  module1/src/inlineG.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_usageG.kt
+  module2/src/usageG.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Module2_usageGKt.class
+  out/production/module2/usage/UsageGKt.class
 End of files
 Compiling files:
-  module2/src/module2_usageG.kt
+  module2/src/usageG.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependency/build.log

@@ -3,19 +3,19 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log

@@ -3,23 +3,23 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log

@@ -3,22 +3,22 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
+  out/production/module1/a/AKt.class
   out/production/module1/a/ClassAnnotation.class
   out/production/module1/a/FileAnnotation.class
-  out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/b/B.class
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: ABORT
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log

@@ -3,15 +3,15 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
+  out/production/module1/a/AKt.class
   out/production/module1/a/ClassAnnotation.class
   out/production/module1/a/FileAnnotation.class
-  out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
@@ -19,10 +19,10 @@ Exit code: NOTHING_DONE
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/b/B.class
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: ABORT
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log

@@ -3,23 +3,23 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
+  out/production/module1/a/AKt.class
   out/production/module1/a/InternalA.class
   out/production/module1/a/InternalClassAnnotation.class
   out/production/module1/a/InternalFileAnnotation.class
-  out/production/module1/a/Module1_aKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
   out/production/module2/b/B.class
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: ABORT
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log

@@ -3,10 +3,10 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log

@@ -3,19 +3,19 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log

@@ -3,23 +3,23 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log

@@ -2,36 +2,36 @@
 
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Marked as dirty by Kotlin:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/Module3_cKt.class
+  out/production/module3/c/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/twoDependants/build.log

@@ -3,28 +3,28 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/Module3_cKt.class
+  out/production/module3/c/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------

jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log

@@ -3,33 +3,33 @@
 Cleaning output files:
   out/production/module1/META-INF/module1.kotlin_module
   out/production/module1/a/A.class
-  out/production/module1/a/Module1_aKt.class
+  out/production/module1/a/AKt.class
 End of files
 Compiling files:
-  module1/src/module1_a.kt
+  module1/src/a.kt
 End of files
 Marked as dirty by Kotlin:
-  module2/src/module2_b.kt
-  module3/src/module3_c.kt
+  module2/src/b.kt
+  module3/src/c.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Exit code: NOTHING_DONE
 ------------------------------------------
 Cleaning output files:
   out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/Module3_cKt.class
+  out/production/module3/c/CKt.class
 End of files
 Compiling files:
-  module3/src/module3_c.kt
+  module3/src/c.kt
 End of files
 Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/Module2_bKt.class
+  out/production/module2/b/BKt.class
 End of files
 Compiling files:
-  module2/src/module2_b.kt
+  module2/src/b.kt
 End of files
 Exit code: OK
 ------------------------------------------