diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
index 1e9444f5d38..65aedde795b 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
@@ -1,6 +1,6 @@
 Cleaning output files:
-out/production/module/_DefaultPackage$usage$*.class
-out/production/module/_DefaultPackage.class
+out/production/module/usage/UsagePackage$usage$*.class
+out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -9,10 +9,6 @@ COMPILATION FAILED
 Expecting an expression
 
 
-Cleaning output files:
-out/production/module/_DefaultPackage$fun$*.class
-End of files
 Compiling files:
-src/fun.kt
 src/usage.kt
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
index 99cec0dbea1..2171b8f5fcf 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
@@ -1,2 +1,4 @@
+package f
+
 fun f() {
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
index 05a6473592e..406f84ac5b6 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
@@ -1,3 +1,5 @@
+package usage
+
 fun main(args: Array<String>) {
-    f()
+    f.f()
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
index c7eec515ee8..568fde17ee6 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
@@ -1,3 +1,5 @@
+package usage
+
 fun main(args: Array<String>) {
-    f(
+    f.f(
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
index 05a6473592e..406f84ac5b6 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
@@ -1,3 +1,5 @@
+package usage
+
 fun main(args: Array<String>) {
-    f()
+    f.f()
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
index 65aedde795b..1e9444f5d38 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
@@ -1,6 +1,6 @@
 Cleaning output files:
-out/production/module/usage/UsagePackage$usage$*.class
-out/production/module/usage/UsagePackage.class
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -9,6 +9,10 @@ COMPILATION FAILED
 Expecting an expression
 
 
+Cleaning output files:
+out/production/module/_DefaultPackage$fun$*.class
+End of files
 Compiling files:
+src/fun.kt
 src/usage.kt
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
index 2171b8f5fcf..99cec0dbea1 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
@@ -1,4 +1,2 @@
-package f
-
 fun f() {
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
index 406f84ac5b6..05a6473592e 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
@@ -1,5 +1,3 @@
-package usage
-
 fun main(args: Array<String>) {
-    f.f()
+    f()
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
index 568fde17ee6..c7eec515ee8 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
@@ -1,5 +1,3 @@
-package usage
-
 fun main(args: Array<String>) {
-    f.f(
+    f(
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
index 406f84ac5b6..05a6473592e 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
@@ -1,5 +1,3 @@
-package usage
-
 fun main(args: Array<String>) {
-    f.f()
+    f()
 }
\ No newline at end of file