diff --git a/idea/testData/scratch/generics.repl.after b/idea/testData/scratch/generics.repl.after
index be6807c321a..a9a019c85f3 100644
--- a/idea/testData/scratch/generics.repl.after
+++ b/idea/testData/scratch/generics.repl.after
@@ -5,4 +5,4 @@ class GClass<T> {
 }
 
 val g = GClass<Int>()
-g.foo(1)                  // RESULT: 1
\ No newline at end of file
+g.foo(1)                  // RESULT: res2: kotlin.Int = 1
\ No newline at end of file
diff --git a/idea/testData/scratch/klass.repl.after b/idea/testData/scratch/klass.repl.after
index b2a75a59f58..c1459c67aa4 100644
--- a/idea/testData/scratch/klass.repl.after
+++ b/idea/testData/scratch/klass.repl.after
@@ -2,7 +2,7 @@ class MyClass {
     fun foo() = 1
 }
 
-MyClass().foo()                    // RESULT: 1
+MyClass().foo()                    // RESULT: res1: kotlin.Int = 1
 
 interface I {
     fun foo(): Int
@@ -11,4 +11,4 @@ interface I {
 val i = object: I {
     override fun foo(): Int = 1
 }
-i.foo()                            // RESULT: 1
+i.foo()                            // RESULT: res4: kotlin.Int = 1
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after b/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
index 453b26566b7..d5a3451b8f6 100644
--- a/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
+++ b/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
@@ -1,3 +1,3 @@
 import inlineFun.*
 
-foo { 1 + 3 }         // RESULT: 4
\ No newline at end of file
+foo { 1 + 3 }         // RESULT: res1: kotlin.Int = 4
\ No newline at end of file
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after b/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
index 0f224476ec7..26c5636c243 100644
--- a/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
+++ b/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
@@ -1,3 +1,3 @@
 import myTest.MyJavaClass
 
-MyJavaClass().test()         // RESULT: 1
\ No newline at end of file
+MyJavaClass().test()         // RESULT: res1: kotlin.Int = 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simple.repl.after b/idea/testData/scratch/simple.repl.after
index 607c3daa309..ca0b9807d18 100644
--- a/idea/testData/scratch/simple.repl.after
+++ b/idea/testData/scratch/simple.repl.after
@@ -1,2 +1,2 @@
 val a = 1
-a            // RESULT: 1
\ No newline at end of file
+a            // RESULT: res1: kotlin.Int = 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simpleFun.repl.after b/idea/testData/scratch/simpleFun.repl.after
index d1eefa1f707..13e025b93aa 100644
--- a/idea/testData/scratch/simpleFun.repl.after
+++ b/idea/testData/scratch/simpleFun.repl.after
@@ -2,4 +2,4 @@ fun foo(): Int {
     return 1
 }
 
-foo()               // RESULT: 1
\ No newline at end of file
+foo()               // RESULT: res1: kotlin.Int = 1
\ No newline at end of file
diff --git a/idea/testData/scratch/spacesAtLineStart.repl.after b/idea/testData/scratch/spacesAtLineStart.repl.after
index a945cc8c9c2..5eb2cc128ed 100644
--- a/idea/testData/scratch/spacesAtLineStart.repl.after
+++ b/idea/testData/scratch/spacesAtLineStart.repl.after
@@ -1,3 +1,3 @@
 val a = 1
-a            // RESULT: 1
-    a        // RESULT: 1
+a            // RESULT: res1: kotlin.Int = 1
+    a        // RESULT: res2: kotlin.Int = 1
diff --git a/idea/testData/scratch/stdlibFun.repl.after b/idea/testData/scratch/stdlibFun.repl.after
index 556ab826a4c..c68521274dd 100644
--- a/idea/testData/scratch/stdlibFun.repl.after
+++ b/idea/testData/scratch/stdlibFun.repl.after
@@ -1,3 +1,3 @@
-arrayListOf(1, 5, 7).map { it * 2 }    // RESULT: 2
+arrayListOf(1, 5, 7).map { it * 2 }    // RESULT: res0: kotlin.Int? = 2
     .filter { it < 10 }
     .find { it == 2 }
diff --git a/idea/testData/scratch/var.repl.after b/idea/testData/scratch/var.repl.after
index fa801c0bb3d..96cd3bc17ee 100644
--- a/idea/testData/scratch/var.repl.after
+++ b/idea/testData/scratch/var.repl.after
@@ -1,3 +1,3 @@
 var a = 1
-a++          // RESULT: 1
-a            // RESULT: 2
\ No newline at end of file
+a++          // RESULT: res1: kotlin.Int = 1
+a            // RESULT: res2: kotlin.Int = 2
\ No newline at end of file
diff --git a/idea/testData/scratch/veryLongOutput.repl.after b/idea/testData/scratch/veryLongOutput.repl.after
index def50b185ec..0cd06916af0 100644
--- a/idea/testData/scratch/veryLongOutput.repl.after
+++ b/idea/testData/scratch/veryLongOutput.repl.after
@@ -1,10 +1,10 @@
 val a = "a".repeat(100)
-a                                                           // RESULT: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
+a                                                           // RESULT: res1: kotlin.String = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
 val b = "0123456789\n".repeat(10)
-b                                                           // RESULT: 0123456789...
+b                                                           // RESULT: res3: kotlin.String = 0123456789...
 println("0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789")    // OUTPUT: 01...
-/** veryLongOutput.kts:2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa */
-/** veryLongOutput.kts:4 0123456789
+/** veryLongOutput.kts:2 res1: kotlin.String = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa */
+/** veryLongOutput.kts:4 res3: kotlin.String = 0123456789
 0123456789
 0123456789
 0123456789