diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
index 9a0f9df2294..af1527a99b8 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
@@ -20,7 +20,8 @@ import com.google.protobuf.MessageLite
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.load.java.descriptors.getImplClassName
+import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForDeserialized
+import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForProto
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.FqName
@@ -71,11 +72,11 @@ public object JvmFileClassUtil {
 
     @JvmStatic
     public fun getImplClassName(callable: DeserializedCallableMemberDescriptor): Name? =
-            callable.getImplClassName()
+            callable.getImplClassNameForDeserialized()
 
     @JvmStatic
     public fun getImplClassName(proto: MessageLite, nameResolver: NameResolver): Name? =
-            getImplClassName(proto, nameResolver)
+            getImplClassNameForProto(proto, nameResolver)
 
     @JvmStatic
     public fun getHiddenPartFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt
index 520fdc0d449..6c24485256a 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt
@@ -67,10 +67,10 @@ fun ClassDescriptor.getParentJavaStaticClassScope(): LazyJavaStaticClassScope? {
     return staticScope
 }
 
-fun DeserializedCallableMemberDescriptor.getImplClassName(): Name? =
-        getImplClassName(this.proto, this.nameResolver)
+fun DeserializedCallableMemberDescriptor.getImplClassNameForDeserialized(): Name? =
+        getImplClassNameForProto(this.proto, this.nameResolver)
 
-fun getImplClassName(proto: MessageLite, nameResolver: NameResolver): Name? =
+fun getImplClassNameForProto(proto: MessageLite, nameResolver: NameResolver): Name? =
         when (proto) {
             is ProtoBuf.Constructor ->
                 null
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt
index 814b7a7f05b..5865363a36c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.load.kotlin
 
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.SourceFile
-import org.jetbrains.kotlin.load.java.descriptors.getImplClassName
+import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForDeserialized
+import org.jetbrains.kotlin.load.java.descriptors.getImplClassNameForProto
 import org.jetbrains.kotlin.load.java.structure.JavaPackage
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
 
@@ -43,7 +44,7 @@ class KotlinJvmBinaryPackageSourceElement(
     }
 
     public fun getContainingBinaryClass(descriptor: DeserializedCallableMemberDescriptor): KotlinJvmBinaryClass? {
-        val name = descriptor.getImplClassName() ?: return null
+        val name = descriptor.getImplClassNameForDeserialized() ?: return null
         return implClassNameToBinaryClass[name.asString()]
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
index 9c606a33ab8..552f2fae39c 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
index c898540bf6a..131fc644d33 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
index 2f1bb65b15e..7324f24d9d4 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -10,7 +9,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/TopLevelUsageKt.class
 out/production/module/usage/Usage.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
index 73c24d79a1d..81dc8237c58 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -10,7 +9,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt$usage$use$1.class
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
index e03d85b028e..7cfa84f7e3a 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -10,7 +9,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt$usage$1.class
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
index c898540bf6a..131fc644d33 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
index 189cef9935f..7c45fecebde 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
index c898540bf6a..131fc644d33 100644
--- a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
+++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inline.kt
@@ -9,7 +8,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log
index 1bcd74bbd73..6059154e756 100644
--- a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/OtherKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
index e6135ea0ed4..9fec192fafc 100644
--- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/OtherKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Cleaning output files:
 out/production/module/UsageKt.class
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
index cf4dad56113..a52dc89f8cb 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
@@ -1,12 +1,15 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/Fun2Kt.class
-out/production/module/test/TestPackage.class
+out/production/module/test/Utils.class
+out/production/module/test/Utils__Fun2Kt.class
 End of files
 Compiling files:
 src/fun2.kt
 End of files
 COMPILATION FAILED
+Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
+    fun function(list: kotlin.List<kotlin.Any>): kotlin.Unit
+    fun function(list: kotlin.List<kotlin.String>): kotlin.Unit
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
     fun function(list: kotlin.List<kotlin.Any>): kotlin.Unit
     fun function(list: kotlin.List<kotlin.String>): kotlin.Unit
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt
index 45fb46b3db7..c40775ad126 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt
@@ -1,3 +1,5 @@
+@file:JvmName("Utils")
+@file:JvmMultifileClass
 package test
 
 fun function(list: List<Any>) {
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt
index 897d69e3641..5cfb71fb5fa 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt
@@ -1,3 +1,5 @@
+@file:JvmName("Utils")
+@file:JvmMultifileClass
 package test
 
 val x = 1
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new
index 97e1b6d862c..b52b4557d42 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new
@@ -1,3 +1,5 @@
+@file:JvmName("Utils")
+@file:JvmMultifileClass
 package test
 
 val x = 1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log
index e5452954f7d..8ef11343a77 100644
--- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/AKt.class
 out/production/module/META-INF/module.kotlin_module
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
index d4162fbf6f8..2e91170dfdf 100644
--- a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineGetKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 src/inlineGet.kt
@@ -20,7 +19,6 @@ End of files
 
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/inline/InlinePackage.class
 out/production/module/inline/InlineSetKt.class
 End of files
 Compiling files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
index 733faeb31b6..60df58144eb 100644
--- a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
@@ -1,14 +1,12 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/inline/InlineKt.class
-out/production/module/inline/InlinePackage.class
 End of files
 Compiling files:
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/usage/UsageKt.class
-out/production/module/usage/UsagePackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
index 4607a5f8ce2..95279b945bf 100644
--- a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
@@ -1,9 +1,7 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/bar/BarPackage.class
 out/production/module/bar/CKt.class
 out/production/module/foo/BKt.class
-out/production/module/foo/FooPackage.class
 End of files
 Compiling files:
 src/b.kt
@@ -11,14 +9,8 @@ src/c.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/bar/BKt.class
-out/production/module/bar/BarPackage.class
 out/production/module/foo/AKt.class
-out/production/module/foo/CKt.class
-out/production/module/foo/FooPackage.class
 End of files
 Compiling files:
 src/a.kt
-src/b.kt
-src/c.kt
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
index c0a3c02fc3e..56ddebe1997 100644
--- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Fun2Kt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log
index 64f2485efca..5d71ad8f098 100644
--- a/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log
index f920f7c94b5..4bf4f586644 100644
--- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 End of files
 Compiling files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log
index 663b207d00c..0130c5b1155 100644
--- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Test.class
-out/production/module/test/TestPackage.class
 out/production/module/test/Test__AKt.class
 End of files
 Cleaning output files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
index 3f1c854ccdd..dbd1e3ebd5e 100644
--- a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/b/B2Kt.class
-out/production/module/b/BPackage.class
 End of files
 Compiling files:
 src/a2.kt
@@ -9,9 +8,7 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/a/A1Kt.class
-out/production/module/a/APackage.class
 out/production/module/b/B1Kt.class
-out/production/module/b/BPackage.class
 End of files
 Compiling files:
 src/a1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log
index 1bcd74bbd73..6059154e756 100644
--- a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/OtherKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
index 3dba902abd0..5fde10f5d36 100644
--- a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
@@ -1,16 +1,13 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/other/OtherKt.class
-out/production/module/other/OtherPackage.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
@@ -21,7 +18,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/other/OtherKt.class
-out/production/module/other/OtherPackage.class
 End of files
 Compiling files:
 src/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
index 64f2485efca..5d71ad8f098 100644
--- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
index 453becd76c1..9f4084d830a 100644
--- a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
@@ -4,7 +4,6 @@ out/production/module/test/ConstKt.class
 out/production/module/test/Klass$Companion.class
 out/production/module/test/Klass.class
 out/production/module/test/Obj.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
index 57f8be71b1c..03c96004241 100644
--- a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/Prop2Kt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/prop2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
index 608f0f77e0d..55336e565a6 100644
--- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
@@ -1,14 +1,12 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
index 6472fc74235..9ecb2e772f7 100644
--- a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
@@ -1,15 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/foo/AKt.class
-out/production/module/foo/FooPackage.class
-End of files
-Compiling files:
-src/a.kt
-End of files
-Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/bar/AKt.class
-out/production/module/bar/BarPackage.class
 End of files
 Compiling files:
 src/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
index 6f1e2c934a1..19a6d813836 100644
--- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
@@ -6,11 +6,10 @@ src/A.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
 src/usage.kt
 End of files
 COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int?
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
index a16744da042..3eb9b489054 100644
--- a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
@@ -1,6 +1,5 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/test/TestPackage.class
 out/production/module/test/UsageKt.class
 End of files
 Compiling files:
@@ -16,4 +15,4 @@ End of files
 Compiling files:
 src/A.kt
 src/usage.kt
-End of files
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
index feb87ecf426..2e8924b6ec7 100644
--- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
+++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
@@ -8,7 +8,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/Usage.class
 out/production/module/UsageInKotlinKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usageInKotlin.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
index 9470b88ba7f..170796b034f 100644
--- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
+++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
@@ -4,7 +4,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/Foo.kt
@@ -13,7 +12,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
@@ -26,7 +24,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
index f522c2a2bec..5ca026d1eef 100644
--- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
+++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
@@ -10,7 +10,6 @@ Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/Usage.class
 out/production/module/UsageInKotlinKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usageInKotlin.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
index 877c6f84715..fb3b63529f5 100644
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
@@ -7,7 +7,6 @@ End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
index 56ac4ce0b6a..16bb200a16c 100644
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
@@ -2,7 +2,6 @@ Cleaning output files:
 out/production/module/JavaClass.class
 out/production/module/META-INF/module.kotlin_module
 out/production/module/UsageKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
index fe3532de44b..7acfe6e0c6e 100644
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
@@ -9,7 +9,6 @@ out/production/module/META-INF/module.kotlin_module
 out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class
 out/production/module/WillBeResolvedToOtherKt.class
 out/production/module/WillBeUnresolvedKt.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/willBeResolvedToOther.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
index 5f216e1066a..351c19dafcc 100644
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
@@ -6,12 +6,11 @@ src/SamInterface.java
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class
 out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
 out/production/module/UsageWithFunctionExpressionKt.class
 out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class
 out/production/module/UsageWithFunctionLiteralKt.class
-out/production/module/_DefaultPackage$sam$SamInterface$*.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usageWithFunctionExpression.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
index 23dd90da9ab..51e50502a62 100644
--- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
@@ -6,12 +6,11 @@ src/SamInterface.java
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class
 out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
 out/production/module/UsageWithFunctionExpressionKt.class
 out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class
 out/production/module/UsageWithFunctionLiteralKt.class
-out/production/module/_DefaultPackage$sam$SamInterface$*.class
-out/production/module/_DefaultPackage.class
 End of files
 Compiling files:
 src/usageWithFunctionExpression.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
index da2f9b63512..24f7dfeeee0 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
@@ -1,5 +1,5 @@
 class JavaUsage {
     public static void main(String[] args) {
-        test.TestPackage.f("x");
+        test.FunKt.f("x");
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
index 9e3013e637b..ed7f4aa70c3 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
@@ -10,7 +9,6 @@ Cleaning output files:
 out/production/module/JavaUsage.class
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/OtherKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/other.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
index 29261260d2e..6d42272706d 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
index c5c8cac1e85..b492ee33f0f 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
@@ -1,5 +1,5 @@
 public class Usage {
     public static void main(String[] args) {
-        test.TestPackage.foo();
+        test.FunKt.foo();
     }
 }
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
index 9781fe64b23..b8578f3d619 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
index 7d43b904ef1..9fdeb34fe1e 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
@@ -1,5 +1,5 @@
 class WillBeUnresolved {
     void main() {
-        test.TestPackage.f(":(");
+        test.FunKt.f(":(");
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
index 0f156cfb7d7..5c2f946ccf7 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
@@ -15,4 +14,4 @@ End of files
 COMPILATION FAILED
 cannot find symbol
 symbol  : method f(java.lang.String)
-location: class test.TestPackage
\ No newline at end of file
+location: class test.FunKt
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
index c5c8cac1e85..b492ee33f0f 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
@@ -1,5 +1,5 @@
 public class Usage {
     public static void main(String[] args) {
-        test.TestPackage.foo();
+        test.FunKt.foo();
     }
 }
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
index 29261260d2e..6d42272706d 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/FunKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
index d1dcba0d6fa..b0c2df3d720 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
@@ -1,5 +1,5 @@
 class Usage {
     void usage() {
-        test.TestPackage.a();
+        test.AKt.a();
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
index 60d621e6d83..3bf6a00fbf0 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
@@ -1,20 +1,14 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/BKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/b.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/Usage.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
-End of files
-Compiling files:
-src/Usage.java
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
index d1dcba0d6fa..b0c2df3d720 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
@@ -1,5 +1,5 @@
 class Usage {
     void usage() {
-        test.TestPackage.a();
+        test.AKt.a();
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
index bff530ab5c1..91e2e0b5602 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
@@ -1,6 +1,6 @@
 class Usage {
     void usage() {
-        test.TestPackage.a();
-        test.TestPackage.b();
+        test.AKt.a();
+        test.BKt.b();
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
index ed15d46e2c7..097791a0aa3 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
@@ -9,13 +9,8 @@ src/Usage.java
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
-out/production/module/Usage.class
 out/production/module/test/AKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/a.kt
-End of files
-Compiling files:
-src/Usage.java
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
index 38666b4ad3c..f4445f33838 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
@@ -1,5 +1,5 @@
 class WillBeUnresolved {
     void main() {
-        test.TestPackage.getProp();
+        test.PropKt.getProp();
     }
 }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
index 75f34f18a29..6aabff7ee22 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
@@ -1,7 +1,6 @@
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
 out/production/module/test/PropKt.class
-out/production/module/test/TestPackage.class
 End of files
 Compiling files:
 src/prop.kt
@@ -15,4 +14,4 @@ End of files
 COMPILATION FAILED
 cannot find symbol
 symbol  : method getProp()
-location: class test.TestPackage
\ No newline at end of file
+location: class test.PropKt
\ No newline at end of file