diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt
index 2da7bd44471..c074ec08039 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt
@@ -30,11 +30,11 @@ fun box(): String {
 
     class Local
     val l = Local::class.jvmName
-    assertTrue(l != null && l.startsWith("_DefaultPackage\$") && "\$box\$" in l && l.endsWith("\$Local"))
+    assertTrue(l != null && l.startsWith("JvmNameKt\$") && "\$box\$" in l && l.endsWith("\$Local"))
 
     val obj = object {}
     val o = obj.javaClass.kotlin.jvmName
-    assertTrue(o != null && o.startsWith("_DefaultPackage\$") && "\$box\$" in o && o.endsWith("\$1"))
+    assertTrue(o != null && o.startsWith("JvmNameKt\$") && "\$box\$" in o && o.endsWith("\$1"))
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
index 30ddedb53eb..c19e93dba90 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
@@ -8,7 +8,8 @@ fun box(): String {
 
     assert(p.javaField != null, "Fail p field")
     val field = p.javaField!!
-    assert(field.getDeclaringClass().getName() contains "_DefaultPackage\$", "Fail field not in package part: ${field.getDeclaringClass()}")
+    val className = field.getDeclaringClass().getName()
+    assertEquals("TopLevelPropertyKt", className)
 
     val getter = p.javaGetter!!
     val setter = p.javaSetter!!
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
index 0459b9c2297..9ee77fb60bb 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/1.kt
@@ -4,5 +4,5 @@ fun test2() {
     1.test1()
 }
 
-// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(I\)V
-// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
+// 2 INVOKESTATIC _1Kt.test1 \(I\)V
+// 1 INVOKESTATIC _1Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/a1.kt b/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/a1.kt
deleted file mode 100644
index 9b04ece1273..00000000000
--- a/compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/a1.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun Int.test1() {}
-
-fun test2() {
-    1.test1()
-}
-
-// 2 INVOKESTATIC A1Kt.test1 \(I\)V
-// 1 INVOKESTATIC A1Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
index a858592c031..92637b6bfe7 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/1.kt
@@ -2,5 +2,5 @@ package a
 
 fun test1() {}
 
-// 2 INVOKESTATIC a/APackage.+\.test1 \(\)V
-// 1 INVOKESTATIC b/BPackage.+\.test2 \(\)V
+// 2 INVOKESTATIC a/_1Kt.test1 \(\)V
+// 1 INVOKESTATIC b/_2Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/a1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/a1.kt
deleted file mode 100644
index f721d9f01a7..00000000000
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/a1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-fun test1() {}
-
-// 2 INVOKESTATIC a/A1Kt.test1 \(\)V
-// 1 INVOKESTATIC b/A2Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt
index 25a13df2ab7..bda25253f1c 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/1.kt
@@ -1,4 +1,4 @@
 fun test1() {}
 
-// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
+// 2 INVOKESTATIC _1Kt.test1 \(\)V
+// 1 INVOKESTATIC _2Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
index 077d97124e9..3fd1d2cd444 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/1.kt
@@ -4,5 +4,5 @@ fun test2() {
     test1()
 }
 
-// 2 INVOKESTATIC _DefaultPackage.+\.test1 \(\)V
-// 1 INVOKESTATIC _DefaultPackage.+\.test2 \(\)V
+// 2 INVOKESTATIC _1Kt.test1 \(\)V
+// 1 INVOKESTATIC _1Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/a1.kt b/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/a1.kt
deleted file mode 100644
index b9577ae1873..00000000000
--- a/compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/a1.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun test1() {}
-
-fun test2() {
-    test1()
-}
-
-// 2 INVOKESTATIC A1Kt.test1 \(\)V
-// 1 INVOKESTATIC A1Kt.test2 \(\)V
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
index 9d9b4763745..d2d407b998a 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/property/1.kt
@@ -2,5 +2,5 @@ package a
 
 val prop = 1
 
-// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I
-// 1 GETSTATIC a/APackage.+\.prop \: I
+// 2 INVOKESTATIC a/_1Kt.getProp \(\)I
+// 1 GETSTATIC a/_1Kt.prop \: I
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/property/a1.kt b/compiler/testData/codegen/topLevelMemberInvocation/property/a1.kt
deleted file mode 100644
index 880c69ddbe0..00000000000
--- a/compiler/testData/codegen/topLevelMemberInvocation/property/a1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-val prop = 1
-
-// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
-// 1 GETSTATIC a/A1Kt.prop \: I
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
index 48a4d568490..63b1a0b1bb9 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/1.kt
@@ -5,5 +5,5 @@ val prop: Int = 0
         return $prop + 1
     }
 
-// 2 INVOKESTATIC a/APackage.+\.getProp \(\)I
-// 1 GETSTATIC a/APackage.+\.prop \: I
+// 2 INVOKESTATIC a/_1Kt.getProp \(\)I
+// 1 GETSTATIC a/_1Kt.prop \: I
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/a1.kt b/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/a1.kt
deleted file mode 100644
index f4cc427acf0..00000000000
--- a/compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/a1.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package a
-
-val prop: Int = 0
-    get() {
-        return $prop + 1
-    }
-
-// 2 INVOKESTATIC a/A1Kt.getProp \(\)I
-// 1 GETSTATIC a/A1Kt.prop \: I
diff --git a/compiler/testData/codegen/topLevelMemberInvocation/twoModules/1.kt b/compiler/testData/codegen/topLevelMemberInvocation/twoModules/1.kt
index 9948096c08d..53ed0bdb28f 100644
--- a/compiler/testData/codegen/topLevelMemberInvocation/twoModules/1.kt
+++ b/compiler/testData/codegen/topLevelMemberInvocation/twoModules/1.kt
@@ -8,5 +8,5 @@ fun test2() {
    prop
 }
 
-// 1 a/APackage\.test1 \(\)V
-// 1 a/APackage\.getProp \(\)I
\ No newline at end of file
+// 1 a/APackage.test1 \(\)V
+// 1 a/APackage.getProp \(\)I
\ No newline at end of file
diff --git a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
index 624da361210..46a5fcffa5d 100644
--- a/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
+++ b/compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt
@@ -1,6 +1,6 @@
 Deprecated("") val test: Int = 0
 
 // TESTED_OBJECT_KIND: property
-// TESTED_OBJECTS: _DefaultPackage$, test
+// TESTED_OBJECTS: TopLevelPropertyKt, test
 // IS_FULL_CONTAINING_CLASS_NAME: false
 // FLAGS: ACC_DEPRECATED, ACC_FINAL, ACC_STATIC
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 45e614a0588..88a5ba274c1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -4557,7 +4557,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class OptimizeImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInOptimizeImports() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([a-zA-Z0-9]+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
         }
 
         @TestMetadata("fileRuntime.kt")