diff --git a/idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/1/1.kt b/idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/1/a1.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/1/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/1/a1.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/2/1.kt b/idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/2/a2.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/2/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/breakpointOnLocalProperty/2/a2.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/functionInLibrary/1/functionInLibrary.kt b/idea/testData/debugger/customLibraryForTinyApp/functionInLibrary/1/functionInLibrary2.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/functionInLibrary/1/functionInLibrary.kt
rename to idea/testData/debugger/customLibraryForTinyApp/functionInLibrary/1/functionInLibrary2.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/1/1.kt b/idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/1/a1.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/1/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/1/a1.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/2/1.kt b/idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/2/a2.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/2/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/oneFunSameFileName/2/a2.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/property/1/1.kt b/idea/testData/debugger/customLibraryForTinyApp/property/1/a1.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/property/1/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/property/1/a1.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/property/2/1.kt b/idea/testData/debugger/customLibraryForTinyApp/property/2/a2.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/property/2/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/property/2/a2.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/1/1.kt b/idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/1/a1.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/1/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/1/a1.kt
diff --git a/idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/2/1.kt b/idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/2/a2.kt
similarity index 100%
rename from idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/2/1.kt
rename to idea/testData/debugger/customLibraryForTinyApp/twoFunDifferentSignature/2/a2.kt
diff --git a/idea/testData/debugger/positionManager/_DefaultPackage.kt b/idea/testData/debugger/positionManager/_DefaultPackage.kt
index 81b2b0a7a9a..d5736ec1f07 100644
--- a/idea/testData/debugger/positionManager/_DefaultPackage.kt
+++ b/idea/testData/debugger/positionManager/_DefaultPackage.kt
@@ -1,3 +1,3 @@
 fun foo() {
-    ""   // _DefaultPackage\$_DefaultPackage\$.+
+    ""   // _DefaultPackage
 }
diff --git a/idea/testData/debugger/positionManager/anonymousNamedFunction.kt b/idea/testData/debugger/positionManager/anonymousNamedFunction.kt
index fdcd6f34b87..50f573c6b14 100644
--- a/idea/testData/debugger/positionManager/anonymousNamedFunction.kt
+++ b/idea/testData/debugger/positionManager/anonymousNamedFunction.kt
@@ -2,6 +2,6 @@ package insertInBlock
 
 fun foo() {
     val lambda = {
-        val a = 1 // insertInBlock/InsertInBlockPackage\$anonymousNamedFunction\$.+\$foo\$lambda\$1
+        val a = 1 // insertInBlock/AnonymousNamedFunction\$foo\$lambda\$1
     }()
 }
diff --git a/idea/testData/debugger/positionManager/extensionFunction.kt b/idea/testData/debugger/positionManager/extensionFunction.kt
index 90c70b99efa..b20d26b6d22 100644
--- a/idea/testData/debugger/positionManager/extensionFunction.kt
+++ b/idea/testData/debugger/positionManager/extensionFunction.kt
@@ -4,5 +4,5 @@ class A {
 }
 
 fun A.foo() {
-    ""   // a/APackage\$extensionFunction\$.+
+    ""   // a/ExtensionFunction
 }
diff --git a/idea/testData/debugger/positionManager/localFunction.kt b/idea/testData/debugger/positionManager/localFunction.kt
index a1278695717..3533415e6c9 100644
--- a/idea/testData/debugger/positionManager/localFunction.kt
+++ b/idea/testData/debugger/positionManager/localFunction.kt
@@ -2,7 +2,7 @@ package test
 
 fun foo(): String {
     fun bar(): String {
-        return ""   // test/TestPackage\$localFunction\$.+\$foo\$1
+        return ""   // test/LocalFunction\$foo\$1
     }
     return bar()
 }
diff --git a/idea/testData/debugger/positionManager/multiFilePackage/a.kt b/idea/testData/debugger/positionManager/multiFilePackage/a.kt
index 346171351a5..627d38c7624 100644
--- a/idea/testData/debugger/positionManager/multiFilePackage/a.kt
+++ b/idea/testData/debugger/positionManager/multiFilePackage/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    ""   // test/TestPackage\$a\$.+
+    ""   // test/A.+
 }
diff --git a/idea/testData/debugger/positionManager/multiFilePackage/b.kt b/idea/testData/debugger/positionManager/multiFilePackage/b.kt
index df5b5f3d321..c11df75d182 100644
--- a/idea/testData/debugger/positionManager/multiFilePackage/b.kt
+++ b/idea/testData/debugger/positionManager/multiFilePackage/b.kt
@@ -1,5 +1,5 @@
 package test
 
 fun bar() {
-    foo();   // test/TestPackage\$b\$.+
+    foo();   // test/B.+
 }
diff --git a/idea/testData/debugger/positionManager/package.kt b/idea/testData/debugger/positionManager/package.kt
index 903bb28e807..bdef81e707d 100644
--- a/idea/testData/debugger/positionManager/package.kt
+++ b/idea/testData/debugger/positionManager/package.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    ""   // test/TestPackage\$package\$.+
+    ""   // test/Package
 }
diff --git a/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt b/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt
index dabbd949a51..c0d72c89238 100644
--- a/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt
+++ b/idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt
@@ -1,3 +1,3 @@
 package prop
 
-val foo: Int = 5   // prop/PropPackage\$topLevelPropertyInitializer\$.+
+val foo: Int = 5   // prop/TopLevelPropertyInitializer
diff --git a/idea/testData/debugger/tinyApp/outs/customLibClassName.out b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
index d8cfff9a64c..e9517018695 100644
--- a/idea/testData/debugger/tinyApp/outs/customLibClassName.out
+++ b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
@@ -1,17 +1,17 @@
-LineBreakpoint created at 1.kt:3
-LineBreakpoint created at 1.kt:3
-LineBreakpoint created at 1.kt:3
-LineBreakpoint created at 1.kt:3
+LineBreakpoint created at a1.kt:3
+LineBreakpoint created at a1.kt:3
+LineBreakpoint created at a1.kt:3
+LineBreakpoint created at a1.kt:3
 LineBreakpoint created at simpleLibFile.kt:3
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! customLibClassName.CustomLibClassNamePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-1.kt:4
+a1.kt:4
 Compile bytecode for 1 + 1
-1.kt:4
+a1.kt:4
 Compile bytecode for 1 + 2
-1.kt:4
+a1.kt:4
 Compile bytecode for 1 + 3
-1.kt:4
+a1.kt:4
 Compile bytecode for 1 + 4
 simpleLibFile.kt:4
 Compile bytecode for 1 + 5
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index 496d08286e5..a2d11c1b2b0 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -26,8 +26,8 @@ class MyDelegateThrowsException {
 }
 
 // PRINT_FRAME
- frame    = main():8, DelegatedPropertyInClassPackage$@packagePartHASH {delegatedPropertyInClass}
-   static   = static = delegatedPropertyInClass.DelegatedPropertyInClassPackage$@packagePartHASH
+ frame    = main():8, DelegatedPropertyInClass {delegatedPropertyInClass}
+   static   = static = delegatedPropertyInClass.DelegatedPropertyInClass
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 5)
    local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
      field    = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 12)
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
index 4100c6beb93..adccc2820de 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -22,8 +22,8 @@ class MyDelegate {
 
 // RENDER_DELEGATED_PROPERTIES: false
 // PRINT_FRAME
- frame    = main():8, DelegatedPropertyInClassWoRendererPackage$@packagePartHASH {delegatedPropertyInClassWoRenderer}
-   static   = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRendererPackage$@packagePartHASH
+ frame    = main():8, DelegatedPropertyInClassWoRenderer {delegatedPropertyInClassWoRenderer}
+   static   = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRenderer
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 5)
    local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
      field    = prop: delegatedPropertyInClassWoRenderer.MyDelegate: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 12)
diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
index 1bc957af997..d4f814a1b51 100644
--- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
@@ -20,8 +20,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():14, EvBreakpointOnPropertyDeclarationPackage$@packagePartHASH {evBreakpointOnPropertyDeclaration}
-   static   = static = evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclarationPackage$@packagePartHASH
+ frame    = main():14, EvBreakpointOnPropertyDeclaration {evBreakpointOnPropertyDeclaration}
+   static   = static = evBreakpointOnPropertyDeclaration.EvBreakpointOnPropertyDeclaration
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 7)
    local    = a1: evBreakpointOnPropertyDeclaration.A = {evBreakpointOnPropertyDeclaration.A@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 8)
      field    = prop: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
index d1e982aab50..d1ed0ea9a27 100644
--- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
@@ -18,8 +18,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():13, EvDelegatedPropertyPackage$@packagePartHASH {evDelegatedProperty}
-   static   = static = evDelegatedProperty.EvDelegatedPropertyPackage$@packagePartHASH
+ frame    = main():13, EvDelegatedProperty {evDelegatedProperty}
+   static   = static = evDelegatedProperty.EvDelegatedProperty
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDelegatedProperty.kt, 9)
    local    = a: evDelegatedProperty.A = {evDelegatedProperty.A@uniqueID} (sp = evDelegatedProperty.kt, 10)
      field    = prop$delegate: kotlin.properties.ReadWriteProperty = {kotlin.properties.NotNullVar@uniqueID} (sp = evDelegatedProperty.kt, 6)
diff --git a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
index ab0a513ba5c..fcc7f538c6f 100644
--- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
+++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
@@ -15,8 +15,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():10, EvDuplicateItemsPackage$@packagePartHASH {evDuplicateItems}
-   static   = static = evDuplicateItems.EvDuplicateItemsPackage$@packagePartHASH
+ frame    = main():10, EvDuplicateItems {evDuplicateItems}
+   static   = static = evDuplicateItems.EvDuplicateItems
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDuplicateItems.kt, 7)
    local    = a: evDuplicateItems.A = {evDuplicateItems.A@uniqueID} (sp = evDuplicateItems.kt, 8)
      field    = prop: int = 1 (sp = evDuplicateItems.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
index 58b68289c93..b54771d4191 100644
--- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
@@ -15,8 +15,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():10, EvFinalPropertyPackage$@packagePartHASH {evFinalProperty}
-   static   = static = evFinalProperty.EvFinalPropertyPackage$@packagePartHASH
+ frame    = main():10, EvFinalProperty {evFinalProperty}
+   static   = static = evFinalProperty.EvFinalProperty
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evFinalProperty.kt, 7)
    local    = a: evFinalProperty.A = {evFinalProperty.A@uniqueID} (sp = evFinalProperty.kt, 8)
      field    = prop: int = 1 (sp = evFinalProperty.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/outs/evLineRange.out
index 6591822650e..fe14732c960 100644
--- a/idea/testData/debugger/tinyApp/outs/evLineRange.out
+++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out
@@ -24,8 +24,8 @@ fun main(args: Array<String>) {
 fun foo(i: Int) {}
 
 // PRINT_FRAME
- frame    = main():15, EvLineRangePackage$@packagePartHASH {evLineRange}
-   static   = static = evLineRange.EvLineRangePackage$@packagePartHASH
+ frame    = main():15, EvLineRange {evLineRange}
+   static   = static = evLineRange.EvLineRange
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evLineRange.kt, 7)
    local    = a1: evLineRange.A = {evLineRange.A@uniqueID} (sp = evLineRange.kt, 8)
      field    = prop: int = 1 (sp = evLineRange.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evProperty.out b/idea/testData/debugger/tinyApp/outs/evProperty.out
index 0cb1ffff71c..16718e54c77 100644
--- a/idea/testData/debugger/tinyApp/outs/evProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evProperty.out
@@ -17,8 +17,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():10, EvPropertyPackage$@packagePartHASH {evProperty}
-   static   = static = evProperty.EvPropertyPackage$@packagePartHASH
+ frame    = main():10, EvProperty {evProperty}
+   static   = static = evProperty.EvProperty
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evProperty.kt, 7)
    local    = a: evProperty.A = {evProperty.A@uniqueID} (sp = evProperty.kt, 8)
      field    = prop: int = 1 (sp = evProperty.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
index a30887a44a4..25824da1a4d 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
@@ -28,8 +28,8 @@ interface T {
 fun foo(i: Int) {}
 
 // PRINT_FRAME
- frame    = main():12, EvSkipAnonymousObjectPackage$@packagePartHASH {evSkipAnonymousObject}
-   static   = static = evSkipAnonymousObject.EvSkipAnonymousObjectPackage$@packagePartHASH
+ frame    = main():12, EvSkipAnonymousObject {evSkipAnonymousObject}
+   static   = static = evSkipAnonymousObject.EvSkipAnonymousObject
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipAnonymousObject.kt, 7)
    local    = a1: evSkipAnonymousObject.A = {evSkipAnonymousObject.A@uniqueID} (sp = evSkipAnonymousObject.kt, 8)
      field    = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
index 70b7556248a..561ba907a0d 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
@@ -23,8 +23,8 @@ fun foo(i: Int) {}
 fun l(f: () -> Unit) {}
 
 // PRINT_FRAME
- frame    = main():12, EvSkipLambdaPackage$@packagePartHASH {evSkipLambda}
-   static   = static = evSkipLambda.EvSkipLambdaPackage$@packagePartHASH
+ frame    = main():12, EvSkipLambda {evSkipLambda}
+   static   = static = evSkipLambda.EvSkipLambda
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLambda.kt, 7)
    local    = a1: evSkipLambda.A = {evSkipLambda.A@uniqueID} (sp = evSkipLambda.kt, 8)
      field    = prop: int = 1 (sp = evSkipLambda.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
index 20a9a03f3fa..71e8be34049 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
@@ -24,8 +24,8 @@ fun main(args: Array<String>) {
 fun foo(i: Int) {}
 
 // PRINT_FRAME
- frame    = main():12, EvSkipLocalClassPackage$@packagePartHASH {evSkipLocalClass}
-   static   = static = evSkipLocalClass.EvSkipLocalClassPackage$@packagePartHASH
+ frame    = main():12, EvSkipLocalClass {evSkipLocalClass}
+   static   = static = evSkipLocalClass.EvSkipLocalClass
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLocalClass.kt, 7)
    local    = a1: evSkipLocalClass.A = {evSkipLocalClass.A@uniqueID} (sp = evSkipLocalClass.kt, 8)
      field    = prop: int = 1 (sp = evSkipLocalClass.kt, 4)
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
index 61d6e2885a4..a8525741146 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -25,9 +25,9 @@ fun foo(f: () -> Unit) {
 }
 
 // PRINT_FRAME
- frame    = invoke():11, FrameAnonymousObjectPackage$@packagePartHASH$main$o$1$run$1 {frameAnonymousObject}
-   this     = this = {frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1$run$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
-     field    = this$0: frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1@uniqueID} (sp = null)
+ frame    = invoke():11, FrameAnonymousObject$main$o$1$run$1 {frameAnonymousObject}
+   this     = this = {frameAnonymousObject.FrameAnonymousObject$main$o$1$run$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+     field    = this$0: frameAnonymousObject.FrameAnonymousObject$main$o$1 = {frameAnonymousObject.FrameAnonymousObject$main$o$1@uniqueID} (sp = null)
        field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
        field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
index 6c8ebf0c22f..269d444264b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
@@ -14,8 +14,8 @@ fun main(args: Array<String>) {
 // EXPRESSION: a
 // RESULT: 1: I
 
- frame    = main():6, FrameClosingBracketPackage$@packagePartHASH {frameClosingBracket}
-   static   = static = frameClosingBracket.FrameClosingBracketPackage$@packagePartHASH
+ frame    = main():6, FrameClosingBracket {frameClosingBracket}
+   static   = static = frameClosingBracket.FrameClosingBracket
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameClosingBracket.kt, 3)
    local    = a: int = 1 (sp = frameClosingBracket.kt, 4)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index 586b79b1186..cf89bb1b126 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -27,8 +27,8 @@ fun A.foo() {
 
 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = foo():14, FrameExtensionFunPackage$@packagePartHASH {frameExtensionFun}
-   static   = static = frameExtensionFun.FrameExtensionFunPackage$@packagePartHASH
+ frame    = foo():14, FrameExtensionFun {frameExtensionFun}
+   static   = static = frameExtensionFun.FrameExtensionFun
    local    = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID} (sp = null)
      field    = prop: int = 1 (sp = frameExtensionFun.kt, 8)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index 4f0c0051b15..b4f7870f9b9 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -32,9 +32,9 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1 + val2
 // RESULT: 2: I
- frame    = invoke():9, FrameInnerLambdaPackage$@packagePartHASH$main$1$1 {frameInnerLambda}
-   this     = this = {frameInnerLambda.FrameInnerLambdaPackage$@packagePartHASH$main$1$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
-     field    = this$0: frameInnerLambda.FrameInnerLambdaPackage$@packagePartHASH$main$1 = {frameInnerLambda.FrameInnerLambdaPackage$@packagePartHASH$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit> (sp = null)
+ frame    = invoke():9, FrameInnerLambda$main$1$1 {frameInnerLambda}
+   this     = this = {frameInnerLambda.FrameInnerLambda$main$1$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+     field    = this$0: frameInnerLambda.FrameInnerLambda$main$1 = {frameInnerLambda.FrameInnerLambda$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit> (sp = null)
        field    = $val1: int = 1 (sp = null)
        field    = arity: int = 0 (sp = Lambda.!EXT!)
      field    = $val2: int = 1 (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index 37439ebc1c1..cb8b45ea0e9 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -21,8 +21,8 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1
 // RESULT: 1: I
- frame    = invoke():7, FrameLambdaPackage$@packagePartHASH$main$1 {frameLambda}
-   this     = this = {frameLambda.FrameLambdaPackage$@packagePartHASH$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+ frame    = invoke():7, FrameLambda$main$1 {frameLambda}
+   this     = this = {frameLambda.FrameLambda$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
      field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index 3dd3d44d4ef..e0a4bac3371 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -21,8 +21,8 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1
 // RESULT: Cannot find local variable: name = val1
- frame    = invoke():7, FrameLambdaNotUsedPackage$@packagePartHASH$main$1 {frameLambdaNotUsed}
-   this     = this = {frameLambdaNotUsed.FrameLambdaNotUsedPackage$@packagePartHASH$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+ frame    = invoke():7, FrameLambdaNotUsed$main$1 {frameLambdaNotUsed}
+   this     = this = {frameLambdaNotUsed.FrameLambdaNotUsed$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
      field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
index 11e70e16498..1759be7048b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
@@ -11,8 +11,8 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():6, FrameLocalVariablePackage$@packagePartHASH {frameLocalVariable}
-   static   = static = frameLocalVariable.FrameLocalVariablePackage$@packagePartHASH
+ frame    = main():6, FrameLocalVariable {frameLocalVariable}
+   static   = static = frameLocalVariable.FrameLocalVariable
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameLocalVariable.kt, 3)
    local    = val1: int = 1 (sp = frameLocalVariable.kt, 4)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out
index 696fd338b73..3aa20ef1c27 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -29,8 +29,8 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: O.obMyFun()
 // RESULT: 1: I
- frame    = invoke():6, FrameObjectPackage$@packagePartHASH$main$1 {frameObject}
-   this     = this = {frameObject.FrameObjectPackage$@packagePartHASH$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+ frame    = invoke():6, FrameObject$main$1 {frameObject}
+   this     = this = {frameObject.FrameObject$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
      field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
index 3db651952ab..1c2d4473b8a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -21,8 +21,8 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = invoke():7, FrameSharedVarPackage$@packagePartHASH$main$1 {frameSharedVar}
-   this     = this = {frameSharedVar.FrameSharedVarPackage$@packagePartHASH$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
+ frame    = invoke():7, FrameSharedVar$main$1 {frameSharedVar}
+   this     = this = {frameSharedVar.FrameSharedVar$main$1@uniqueID}kotlin.jvm.functions.Function0<kotlin.Unit>
      field    = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null)
        field    = element: int = 1 (sp = Ref.!EXT!)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
index 4bb6d7b02f7..c49e95daf6c 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -21,8 +21,8 @@ inline fun foo(f: () -> Unit) {
 
 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = main():7, FrameSharedVarLocalVarPackage$@packagePartHASH {frameSharedVarLocalVar}
-   static   = static = frameSharedVarLocalVar.FrameSharedVarLocalVarPackage$@packagePartHASH
+ frame    = main():7, FrameSharedVarLocalVar {frameSharedVarLocalVar}
+   static   = static = frameSharedVarLocalVar.FrameSharedVarLocalVar
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSharedVarLocalVar.kt, 3)
    local    = var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = frameSharedVarLocalVar.kt, 4)
      field    = element: int = 1 (sp = Ref.!EXT!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out
index 781811ebdb1..f7e279b201e 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -32,8 +32,8 @@ class MyClass
 
 // EXPRESSION: val1 + topVal1
 // RESULT: 2: I
- frame    = main():9, FrameSimplePackage$@packagePartHASH {frameSimple}
-   static   = static = frameSimple.FrameSimplePackage$@packagePartHASH
+ frame    = main():9, FrameSimple {frameSimple}
+   static   = static = frameSimple.FrameSimple
      field    = topVal1: int = 1 (sp = null)
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSimple.kt, 5)
    local    = val1: int = 1 (sp = frameSimple.kt, 6)
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index 94dec9b6d67..9da985873e9 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -15,8 +15,8 @@ class A {
 }
 
 // PRINT_FRAME
- frame    = main():6, ToStringRendererPackage$@packagePartHASH {toStringRenderer}
-   static   = static = toStringRenderer.ToStringRendererPackage$@packagePartHASH
+ frame    = main():6, ToStringRenderer {toStringRenderer}
+   static   = static = toStringRenderer.ToStringRenderer
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3)
    local    = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt
index d68cbf77571..52570ba965e 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt
@@ -20,10 +20,10 @@ class MyClass {
 }
 
 // EXPRESSION: publicTopLevelObject
-// RESULT: instance of ceAnonymousObject.CeAnonymousObjectPackage$ceAnonymousObject$@packagePartHASH$publicTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObjectPackage$ceAnonymousObject$@packagePartHASH$publicTopLevelObject$1;
+// RESULT: instance of ceAnonymousObject.CeAnonymousObject$publicTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObject$publicTopLevelObject$1;
 
 // EXPRESSION: privateTopLevelObject
-// RESULT: instance of ceAnonymousObject.CeAnonymousObjectPackage$ceAnonymousObject$@packagePartHASH$privateTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObjectPackage$ceAnonymousObject$@packagePartHASH$privateTopLevelObject$1;
+// RESULT: instance of ceAnonymousObject.CeAnonymousObject$privateTopLevelObject$1(id=ID): LceAnonymousObject/CeAnonymousObject$privateTopLevelObject$1;
 
 // EXPRESSION: publicObject
 // RESULT: instance of ceAnonymousObject.MyClass$publicObject$1(id=ID): LceAnonymousObject/MyClass$publicObject$1;
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
index 4bb883a8815..ba2759fdfa3 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
@@ -16,4 +16,4 @@ interface T {
 // RESULT: 1: I
 
 // EXPRESSION: object: T {}
-// RESULT: instance of packageForDebugger.PackageForDebuggerPackage$debugFile$@packagePartHASH$myFun$1(id=ID): LpackageForDebugger/PackageForDebuggerPackage$debugFile$@packagePartHASH$myFun$1;
\ No newline at end of file
+// RESULT: instance of packageForDebugger.DebugFile$myFun$1(id=ID): LpackageForDebugger/DebugFile$myFun$1;
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/forTests/simple.kt b/idea/testData/debugger/tinyApp/src/forTests/simpleKt.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/forTests/simple.kt
rename to idea/testData/debugger/tinyApp/src/forTests/simpleKt.kt