diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index c2c53bdc9b6..616e1ec22d2 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -31,7 +31,7 @@ class MyDelegateThrowsException {
 // SKIP: stackTrace
 
 Compile bytecode for args.size
- frame    = main():9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
+ frame    = main:9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
    local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 7)
      field    = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 13)
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
index 057b0f6b0a0..45c41237fbe 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -25,7 +25,7 @@ class MyDelegate {
 // PRINT_FRAME
 
 Compile bytecode for args.size
- frame    = main():9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
+ frame    = main:9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
    local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 7)
      field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 13)
diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
index e3e30781de7..30d56c1d323 100644
--- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
 
 // PRINT_FRAME
 Compile bytecode for a2.prop
- frame    = main():14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
+ frame    = main:14, EvBreakpointOnPropertyDeclarationKt {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 e4aba2782c4..fede6417a6e 100644
--- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():13, EvDelegatedPropertyKt {evDelegatedProperty}
+ frame    = main:13, EvDelegatedPropertyKt {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 0946af65926..d54107ece8b 100644
--- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
+++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
@@ -16,7 +16,7 @@ fun main(args: Array<String>) {
 
 // PRINT_FRAME
 Compile bytecode for a.prop
- frame    = main():10, EvDuplicateItemsKt {evDuplicateItems}
+ frame    = main:10, EvDuplicateItemsKt {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 dd868c4547b..2ddc99c9c33 100644
--- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():10, EvFinalPropertyKt {evFinalProperty}
+ frame    = main:10, EvFinalPropertyKt {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/evFunctionDeclaration.out b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
index a182a4f63b8..560d187b82b 100644
--- a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
 
 // PRINT_FRAME
 Compile bytecode for a
- frame    = foo():5, A {evFunctionDeclaration}
+ frame    = foo:5, A {evFunctionDeclaration}
    this     = this = {evFunctionDeclaration.A@uniqueID}
      field    = a: int = 1 (sp = evFunctionDeclaration.kt, 3)
    extra    = a
diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/outs/evLineRange.out
index 51d1666b160..b3689c7c50d 100644
--- a/idea/testData/debugger/tinyApp/outs/evLineRange.out
+++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out
@@ -25,7 +25,7 @@ fun foo(i: Int) {}
 
 // PRINT_FRAME
 Compile bytecode for a2.prop
- frame    = main():15, EvLineRangeKt {evLineRange}
+ frame    = main:15, EvLineRangeKt {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 751f30968c1..f7eb8ed1c9e 100644
--- a/idea/testData/debugger/tinyApp/outs/evProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evProperty.out
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
 
 // PRINT_FRAME
 Compile bytecode for a.prop
- frame    = main():10, EvPropertyKt {evProperty}
+ frame    = main:10, EvPropertyKt {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/evPropertyRefExpr.out b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
index 88a55868924..4669ebdc2bf 100644
--- a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
+++ b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
 
 // PRINT_FRAME
 Compile bytecode for prop
- frame    = test():8, A {evPropertyRefExpr}
+ frame    = test:8, A {evPropertyRefExpr}
    this     = this = {evPropertyRefExpr.A@uniqueID}
      field    = prop: int = 1 (sp = evPropertyRefExpr.kt, 4)
    extra    = prop
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
index 107733c6def..48504b9cbc7 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
@@ -29,7 +29,7 @@ fun foo(i: Int) {}
 
 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main():12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
+ frame    = main:12, EvSkipAnonymousObjectKt {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 68cb90678ec..efa5fdc33a9 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
@@ -24,7 +24,7 @@ fun l(f: () -> Unit) {}
 
 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main():12, EvSkipLambdaKt {evSkipLambda}
+ frame    = main:12, EvSkipLambdaKt {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 c98d214dcbc..3b06d63aa51 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
@@ -25,7 +25,7 @@ fun foo(i: Int) {}
 
 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main():12, EvSkipLocalClassKt {evSkipLocalClass}
+ frame    = main:12, EvSkipLocalClassKt {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 f71b6942cda..760ef02a005 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -25,7 +25,7 @@ fun foo(f: () -> Unit) {
 }
 
 // PRINT_FRAME
- frame    = invoke():11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
+ frame    = invoke:11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
    this     = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameAnonymousObject.FrameAnonymousObjectKt$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1@uniqueID} (sp = null)
        field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
index 7d6ebde4201..e07c6576734 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -35,7 +35,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke():16, A$test$1 {frameClassObject}
+ frame    = invoke:16, A$test$1 {frameClassObject}
    this     = this = {frameClassObject.A$test$1@uniqueID}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/frameClosingBracket.out b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
index 0842c5cdf4a..f9f363f72e6 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
@@ -14,7 +14,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: a
 // RESULT: 1: I
 
- frame    = main():6, FrameClosingBracketKt {frameClosingBracket}
+ frame    = main:6, FrameClosingBracketKt {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/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
index 035fac79533..383951cf211 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -83,7 +83,7 @@ fun lambda(f: () -> Unit) {
 
 // EXPRESSION: bMyFun()
 // RESULT: 1: I
- frame    = invoke():24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
+ frame    = invoke:24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
    this     = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameExtFunExtFun.Outer$foo$LocalClass = {frameExtFunExtFun.Outer$foo$LocalClass@uniqueID} (sp = null)
        field    = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 19)
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index 6dd02949b2f..52d11d3218e 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -27,7 +27,7 @@ fun A.foo() {
 
 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = foo():14, FrameExtensionFunKt {frameExtensionFun}
+ frame    = foo:14, FrameExtensionFunKt {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/frameInlineArgument.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
index f5502f33109..f41f1197e8b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
@@ -28,7 +28,7 @@ class A {
 // RESULT: 1: I
 
 
- frame    = main():7, FrameInlineArgumentKt {frameInlineArgument}
+ frame    = main:7, FrameInlineArgumentKt {frameInlineArgument}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameInlineArgument.kt, 3)
    local    = element: int = 1 (sp = frameInlineArgument.kt, 4)
    local    = this_$iv: frameInlineArgument.A = {frameInlineArgument.A@uniqueID} (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
index c87f8fa8cb8..cf2442eb61a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
@@ -41,7 +41,7 @@ fun main(args: Array<String>) {
 
 // EXPRESSION: element
 // RESULT: 1: I
- frame    = bar():16, C {frameInlineArgumentInsideInlineFun}
+ frame    = bar:16, C {frameInlineArgumentInsideInlineFun}
    this     = this = {frameInlineArgumentInsideInlineFun.C@uniqueID}
               - Class has no fields
    local    = element: float = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
index 2c2184a2e9d..2873bed2bba 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
@@ -32,7 +32,7 @@ class A {
 // RESULT: 1: I
 
 
- frame    = main():14, FrameInlineFunKt {frameInlineFun}
+ frame    = main:14, FrameInlineFunKt {frameInlineFun}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = null)
    local    = element: int = 1 (sp = frameInlineFun.kt, 12)
    local    = this_$iv: frameInlineFun.A = {frameInlineFun.A@uniqueID} (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
index 3d20f8289e4..645aa07ad3c 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
@@ -54,7 +54,7 @@ fun main(args: Array<String>) {
 // RESULT: 1: I
 
 
- frame    = bar():7, C {frameInlineFunCallInsideInlineFun}
+ frame    = bar:7, C {frameInlineFunCallInsideInlineFun}
    this     = this = {frameInlineFunCallInsideInlineFun.C@uniqueID}
               - Class has no fields
    local    = element: float = 1.0 (sp = frameInlineFunCallInsideInlineFun.kt, 5)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
index 1fbf71fa4fc..3a87abd7025 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -40,7 +40,7 @@ class A {
 
 // EXPRESSION: myFun2()
 // RESULT: 1: I
- frame    = test():17, A$Inner {frameInnerClass}
+ frame    = test:17, A$Inner {frameInnerClass}
    this     = this = {frameInnerClass.A$Inner@uniqueID}
      field    = prop2: int = 1 (sp = frameInnerClass.kt, 12)
      field    = this$0: frameInnerClass.A = {frameInnerClass.A@uniqueID} (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index 71eea332ece..2af8e80ad6e 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -32,7 +32,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1 + val2
 // RESULT: 2: I
- frame    = invoke():9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
+ frame    = invoke:9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
    this     = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}Function0<kotlin.Unit> (sp = null)
        field    = $val1: int = 1 (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index 27c9dccdefe..ce23e71bed6 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1
 // RESULT: 1: I
- frame    = invoke():7, FrameLambdaKt$main$1 {frameLambda}
+ frame    = invoke:7, FrameLambdaKt$main$1 {frameLambda}
    this     = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}Function0<kotlin.Unit>
      field    = $val1: int = 1 (sp = null)
      field    = arity: int = 0 (sp = Lambda.!EXT!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index c8b9f5068a3..8103ced0c2c 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: val1
 // RESULT: Cannot find local variable: name = val1
- frame    = invoke():7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
+ frame    = invoke:7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
    this     = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}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 98bbf45a61a..c3069bb2c84 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
@@ -11,7 +11,7 @@ fun main(args: Array<String>) {
 }
 
 // PRINT_FRAME
- frame    = main():6, FrameLocalVariableKt {frameLocalVariable}
+ frame    = main:6, FrameLocalVariableKt {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 91902d6c741..57c576b3109 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -29,7 +29,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: O.obMyFun()
 // RESULT: 1: I
- frame    = invoke():6, FrameObjectKt$main$1 {frameObject}
+ frame    = invoke:6, FrameObjectKt$main$1 {frameObject}
    this     = this = {frameObject.FrameObjectKt$main$1@uniqueID}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 c716aee0dcd..48928095b5a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = invoke():7, FrameSharedVarKt$main$1 {frameSharedVar}
+ frame    = invoke:7, FrameSharedVarKt$main$1 {frameSharedVar}
    this     = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}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!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
index aa046bda467..8cdb83b828a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -21,7 +21,7 @@ inline fun foo(f: () -> Unit) {
 
 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = main():7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
+ frame    = main:7, FrameSharedVarLocalVarKt {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 cc34cd58863..369d1f9a31b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -32,7 +32,7 @@ class MyClass
 
 // EXPRESSION: val1 + topVal1
 // RESULT: 2: I
- frame    = main():9, FrameSimpleKt {frameSimple}
+ frame    = main:9, FrameSimpleKt {frameSimple}
    static   = static = frameSimple.FrameSimpleKt
      field    = topVal1: int = 1 (sp = frameSimple.kt, 3)
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSimple.kt, 5)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out
index 64f3d06a95c..65111d42071 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -47,7 +47,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke():16, A$test$1 {frameThis0}
+ frame    = invoke:16, A$test$1 {frameThis0}
    this     = this = {frameThis0.A$test$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameThis0.A = {frameThis0.A@uniqueID} (sp = null)
        field    = prop1: int = 1 (sp = frameThis0.kt, 8)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
index c861ec9978b..106e274d73e 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -63,7 +63,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: myFun2()
 // RESULT: 1: I
- frame    = invoke():15, A$testExt$1 {frameThis0Ext}
+ frame    = invoke:15, A$testExt$1 {frameThis0Ext}
    this     = this = {frameThis0Ext.A$testExt$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameThis0Ext.A = {frameThis0Ext.A@uniqueID} (sp = null)
        field    = prop1: int = 1 (sp = frameThis0Ext.kt, 8)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
index 5479351993a..363eec1a794 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -49,7 +49,7 @@ fun foo(f: () -> Unit) {
 
 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke():17, A$test$1$1 {frameThis0This0}
+ frame    = invoke:17, A$test$1$1 {frameThis0This0}
    this     = this = {frameThis0This0.A$test$1$1@uniqueID}Function0<kotlin.Unit>
      field    = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}Function0<kotlin.Unit> (sp = null)
        field    = this$0: frameThis0This0.A = {frameThis0This0.A@uniqueID} (sp = null)
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
index 84575312c95..54cbd45bc46 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
@@ -5,8 +5,8 @@ stepIntoSpecificKotlinClasses.kt:8
 MyJavaClass.java:12
 stepIntoSpecificKotlinClasses.kt:8
 Intrinsics.!EXT!
+Intrinsics.!EXT!
 stepIntoSpecificKotlinClasses.kt:8
-stepIntoSpecificKotlinClasses.kt:9
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
index ce7b422d4e9..eb1407fc9c4 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
@@ -7,7 +7,7 @@ syntheticMethods.kt:19
 syntheticMethods.kt:20
 syntheticMethods.kt:17
 syntheticMethods.kt:7
-syntheticMethods.kt:0
+syntheticMethods.kt:-1
 syntheticMethods.kt:7
 syntheticMethods.kt:25
 syntheticMethods.kt:31
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
index e6ecc2e665f..477e8285147 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
@@ -5,7 +5,7 @@ syntheticMethodsSkip.kt:6
 syntheticMethodsSkip.kt:19
 syntheticMethodsSkip.kt:20
 syntheticMethodsSkip.kt:7
-syntheticMethodsSkip.kt:0
+syntheticMethodsSkip.kt:-1
 syntheticMethodsSkip.kt:7
 syntheticMethodsSkip.kt:25
 syntheticMethodsSkip.kt:31
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index c8801c51e0e..29eab115f54 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -16,7 +16,7 @@ class A {
 
 // PRINT_FRAME
 Compile bytecode for args.size
- frame    = main():6, ToStringRendererKt {toStringRenderer}
+ frame    = main:6, ToStringRendererKt {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)
               - Class has no fields
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
index 68945a10eda..3e9fbe25f55 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
@@ -236,14 +236,11 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
             return "null"
         }
 
-        val virtualFile = sourcePosition.file.virtualFile
-        if (virtualFile == null) {
-            return "VirtualFile for position is null"
-        }
+        val virtualFile = sourcePosition.file.originalFile.virtualFile ?: sourcePosition.file.viewProvider.virtualFile ?:
+                          return "VirtualFile for position is null"
 
         val libraryEntry = LibraryUtil.findLibraryEntry(virtualFile, project)
-        if (libraryEntry != null && (libraryEntry is JdkOrderEntry ||
-                                     libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
+        if (libraryEntry != null && (libraryEntry is JdkOrderEntry || libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
             return FileUtil.getNameWithoutExtension(virtualFile.name) + ".!EXT!"
         }