diff --git a/compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt b/compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt
index 842b50bfc3c..8d50e13e78a 100644
--- a/compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt
+++ b/compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt
@@ -1,32 +1,36 @@
 @0:0..23:0 FILE /augmentedAssignmentWithExpression.kt
   @2:0..8:1 CLASS CLASS Host
-    @2:0..8:1 VALUE_PARAMETER <receiver: Host>
+    @2:0..8:1 VALUE_PARAMETER this@Host: Host
     @2:0..8:1 CONSTRUCTOR public constructor Host()
       @2:0..8:1 BLOCK_BODY
         @2:0..8:1 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         @2:0..8:1 INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     @3:4..38 FUN public final operator fun plusAssign(x: kotlin.Int): kotlin.Unit
-      @3:4..38 VALUE_PARAMETER <receiver: Host>
+      @3:4..38 VALUE_PARAMETER this@Host: Host
       @3:28..34 VALUE_PARAMETER value-parameter x: kotlin.Int
       @3:36..38 BLOCK_BODY
     @5:4..7:5 FUN public final fun test1(): kotlin.Unit
-      @5:4..7:5 VALUE_PARAMETER <receiver: Host>
+      @5:4..7:5 VALUE_PARAMETER this@Host: Host
       @5:16..7:5 BLOCK_BODY
         @6:8..17 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-          @6:8..12 GET_VAR '<receiver: Host>' type=test.Host origin=PLUSEQ
+          @6:8..12 GET_VAR 'this@Host: Host' type=test.Host origin=PLUSEQ
           @6:16..17 CONST Int type=kotlin.Int value='1'
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    @2:0..8:1 FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      @2:0..8:1 VALUE_PARAMETER this@Any: Any
+      @-1:-1..-1 VALUE_PARAMETER value-parameter other: kotlin.Any?
+    @2:0..8:1 FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      @2:0..8:1 VALUE_PARAMETER this@Any: Any
+    @2:0..8:1 FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      @2:0..8:1 VALUE_PARAMETER this@Any: Any
   @10:0..18 FUN public fun foo(): test.Host
     @10:12..18 BLOCK_BODY
       @10:12..18 RETURN type=kotlin.Nothing from='foo(): Host'
         @10:12..18 CALL 'constructor Host()' type=test.Host origin=null
   @12:0..14:1 FUN public fun test.Host.test2(): kotlin.Unit
-    @12:4..8 VALUE_PARAMETER <receiver: test2() on Host: Unit>
+    @12:4..8 VALUE_PARAMETER this@test2: Host
     @12:17..14:1 BLOCK_BODY
       @13:4..13 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-        @13:4..8 GET_VAR '<receiver: test2() on Host: Unit>' type=test.Host origin=PLUSEQ
+        @13:4..8 GET_VAR 'this@test2: Host' type=test.Host origin=PLUSEQ
         @13:12..13 CONST Int type=kotlin.Int value='1'
   @16:0..18:1 FUN public fun test3(): kotlin.Unit
     @16:12..18:1 BLOCK_BODY
diff --git a/compiler/testData/ir/sourceRanges/kt17108.txt b/compiler/testData/ir/sourceRanges/kt17108.txt
index 59dcd2c99fd..ba9b2d59123 100644
--- a/compiler/testData/ir/sourceRanges/kt17108.txt
+++ b/compiler/testData/ir/sourceRanges/kt17108.txt
@@ -1,19 +1,24 @@
 @0:0..26:1 FILE /kt17108.kt
   @0:0..26:1 CLASS INTERFACE Boolean
+    @0:0..26:1 VALUE_PARAMETER this@Boolean: Boolean
     @5:4..8:38 FUN public abstract operator fun not(): Boolean
-      @5:4..8:38 VALUE_PARAMETER <receiver: Boolean>
+      @5:4..8:38 VALUE_PARAMETER this@Boolean: Boolean
     @10:4..13:42 FUN public abstract infix fun and(other: Boolean): Boolean
-      @10:4..13:42 VALUE_PARAMETER <receiver: Boolean>
+      @10:4..13:42 VALUE_PARAMETER this@Boolean: Boolean
       @13:18..32 VALUE_PARAMETER value-parameter other: Boolean
     @15:4..18:41 FUN public abstract infix fun or(other: Boolean): Boolean
-      @15:4..18:41 VALUE_PARAMETER <receiver: Boolean>
+      @15:4..18:41 VALUE_PARAMETER this@Boolean: Boolean
       @18:17..31 VALUE_PARAMETER value-parameter other: Boolean
     @20:4..23:42 FUN public abstract infix fun xor(other: Boolean): Boolean
-      @20:4..23:42 VALUE_PARAMETER <receiver: Boolean>
+      @20:4..23:42 VALUE_PARAMETER this@Boolean: Boolean
       @23:18..32 VALUE_PARAMETER value-parameter other: Boolean
     @25:4..38 FUN public abstract fun compareTo(other: Boolean): kotlin.Int
-      @25:4..38 VALUE_PARAMETER <receiver: Boolean>
+      @25:4..38 VALUE_PARAMETER this@Boolean: Boolean
       @25:18..32 VALUE_PARAMETER value-parameter other: Boolean
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
-    @-1:-1..-1 FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    @0:0..26:1 FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      @0:0..26:1 VALUE_PARAMETER this@Any: Any
+      @-1:-1..-1 VALUE_PARAMETER value-parameter other: kotlin.Any?
+    @0:0..26:1 FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      @0:0..26:1 VALUE_PARAMETER this@Any: Any
+    @0:0..26:1 FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      @0:0..26:1 VALUE_PARAMETER this@Any: Any