diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
index 28b180a5805..01925ef997c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.ir.util
 
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.kotlin.ir.IrElement
@@ -247,7 +248,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
 
         internal fun DescriptorRenderer.renderDescriptor(descriptor: DeclarationDescriptor): String =
                 if (descriptor is ReceiverParameterDescriptor)
-                    "<receiver: ${descriptor.containingDeclaration.ref()}>"
+                    "this@${descriptor.containingDeclaration.name}: ${descriptor.type}"
                 else
                     render(descriptor)
 
diff --git a/compiler/testData/ir/irText/classes/abstractMembers.txt b/compiler/testData/ir/irText/classes/abstractMembers.txt
index 93d7ea6a9b3..6487e102745 100644
--- a/compiler/testData/ir/irText/classes/abstractMembers.txt
+++ b/compiler/testData/ir/irText/classes/abstractMembers.txt
@@ -1,35 +1,35 @@
 FILE /abstractMembers.kt
   CLASS CLASS AbstractClass
-    $new: VALUE_PARAMETER <receiver: AbstractClass>
+    $new: VALUE_PARAMETER this@AbstractClass: AbstractClass
     CONSTRUCTOR public constructor AbstractClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='AbstractClass'
     FUN public abstract fun abstractFun(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: AbstractClass>
+      $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
     PROPERTY public abstract val abstractVal: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-abstractVal>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: AbstractClass>
+        $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
     PROPERTY public abstract var abstractVar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-abstractVar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: AbstractClass>
+        $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-abstractVar>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: AbstractClass>
+        $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE Interface
     FUN public abstract fun abstractFun(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Interface>
+      $this: VALUE_PARAMETER this@Interface: Interface
     PROPERTY public abstract val abstractVal: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-abstractVal>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Interface>
+        $this: VALUE_PARAMETER this@Interface: Interface
     PROPERTY public abstract var abstractVar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-abstractVar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Interface>
+        $this: VALUE_PARAMETER this@Interface: Interface
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-abstractVar>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Interface>
+        $this: VALUE_PARAMETER this@Interface: Interface
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
index 016ddf56c1b..63374acda68 100644
--- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
@@ -1,6 +1,6 @@
 FILE /argumentReorderingInDelegatingConstructorCall.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -12,26 +12,26 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Base>
+        $this: VALUE_PARAMETER this@Base: Base
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Base>' type=Base origin=null
+              receiver: GET_VAR 'this@Base: Base' type=Base origin=null
     PROPERTY public final val y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Base>
+        $this: VALUE_PARAMETER this@Base: Base
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Base>' type=Base origin=null
+              receiver: GET_VAR 'this@Base: Base' type=Base origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(xx: kotlin.Int, yy: kotlin.Int)
       VALUE_PARAMETER value-parameter xx: kotlin.Int
       VALUE_PARAMETER value-parameter yy: kotlin.Int
@@ -53,7 +53,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(xx: kotlin.Int, yy: kotlin.Int)
       VALUE_PARAMETER value-parameter xx: kotlin.Int
       VALUE_PARAMETER value-parameter yy: kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt
index f356dab7655..0de1e886472 100644
--- a/compiler/testData/ir/irText/classes/classMembers.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.txt
@@ -1,6 +1,6 @@
 FILE /classMembers.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -15,27 +15,27 @@ FILE /classMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final var z: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var z: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter z: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-z>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Int'
             GET_FIELD 'z: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-z>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'z: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
@@ -48,56 +48,56 @@ FILE /classMembers.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-property>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-property>(): Int'
             GET_FIELD 'property: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final val propertyWithGet: kotlin.Int
       FUN public final fun <get-propertyWithGet>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-propertyWithGet>(): Int'
             CONST Int type=kotlin.Int value='42'
     PROPERTY public final var propertyWithGetAndSet: kotlin.Int
       FUN public final fun <get-propertyWithGetAndSet>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-propertyWithGetAndSet>(): Int'
             CALL '<get-z>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: C>' type=C origin=null
+              $this: GET_VAR 'this@C: C' type=C origin=null
       FUN public final fun <set-propertyWithGetAndSet>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
           CALL '<set-z>(Int): Unit' type=kotlin.Unit origin=EQ
-            $this: GET_VAR '<receiver: C>' type=C origin=null
+            $this: GET_VAR 'this@C: C' type=C origin=null
             <set-?>: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     FUN public final fun function(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='1'
     FUN public final fun kotlin.Int.memberExtensionFunction(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: C>
-      $receiver: VALUE_PARAMETER <receiver: memberExtensionFunction() on Int: Unit>
+      $this: VALUE_PARAMETER this@C: C
+      $receiver: VALUE_PARAMETER this@memberExtensionFunction: Int
       BLOCK_BODY
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='2'
     CLASS CLASS NestedClass
-      $new: VALUE_PARAMETER <receiver: NestedClass>
+      $new: VALUE_PARAMETER this@NestedClass: NestedClass
       CONSTRUCTOR public constructor NestedClass()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='NestedClass'
       FUN public final fun function(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: NestedClass>
+        $this: VALUE_PARAMETER this@NestedClass: NestedClass
         BLOCK_BODY
           CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
             message: CONST String type=kotlin.String value='3'
       FUN public final fun kotlin.Int.memberExtensionFunction(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: NestedClass>
-        $receiver: VALUE_PARAMETER <receiver: memberExtensionFunction() on Int: Unit>
+        $this: VALUE_PARAMETER this@NestedClass: NestedClass
+        $receiver: VALUE_PARAMETER this@memberExtensionFunction: Int
         BLOCK_BODY
           CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
             message: CONST String type=kotlin.String value='4'
@@ -106,18 +106,18 @@ FILE /classMembers.kt
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS INTERFACE NestedInterface
       FUN public abstract fun foo(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: NestedInterface>
+        $this: VALUE_PARAMETER this@NestedInterface: NestedInterface
       FUN public open fun bar(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: NestedInterface>
+        $this: VALUE_PARAMETER this@NestedInterface: NestedInterface
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='bar(): Unit'
             CALL 'foo(): Unit' type=kotlin.Unit origin=null
-              $this: GET_VAR '<receiver: NestedInterface>' type=C.NestedInterface origin=null
+              $this: GET_VAR 'this@NestedInterface: NestedInterface' type=C.NestedInterface origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS OBJECT companion object of C
-      $new: VALUE_PARAMETER <receiver: companion object of C>
+      $new: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/classes/classes.txt b/compiler/testData/ir/irText/classes/classes.txt
index 4deebbc2d62..a90c23ec1bd 100644
--- a/compiler/testData/ir/irText/classes/classes.txt
+++ b/compiler/testData/ir/irText/classes/classes.txt
@@ -1,6 +1,6 @@
 FILE /classes.kt
   CLASS CLASS TestClass
-    $new: VALUE_PARAMETER <receiver: TestClass>
+    $new: VALUE_PARAMETER this@TestClass: TestClass
     CONSTRUCTOR public constructor TestClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -13,7 +13,7 @@ FILE /classes.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT TestObject
-    $new: VALUE_PARAMETER <receiver: TestObject>
+    $new: VALUE_PARAMETER this@TestObject: TestObject
     CONSTRUCTOR private constructor TestObject()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,12 +22,12 @@ FILE /classes.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS ANNOTATION_CLASS TestAnnotationClass
-    $new: VALUE_PARAMETER <receiver: TestAnnotationClass>
+    $new: VALUE_PARAMETER this@TestAnnotationClass: TestAnnotationClass
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS ENUM_CLASS TestEnumClass
-    $new: VALUE_PARAMETER <receiver: TestEnumClass>
+    $new: VALUE_PARAMETER this@TestEnumClass: TestEnumClass
     CONSTRUCTOR private constructor TestEnumClass()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
diff --git a/compiler/testData/ir/irText/classes/companionObject.txt b/compiler/testData/ir/irText/classes/companionObject.txt
index 9462ac0ed09..dac4a0dbdc3 100644
--- a/compiler/testData/ir/irText/classes/companionObject.txt
+++ b/compiler/testData/ir/irText/classes/companionObject.txt
@@ -1,12 +1,12 @@
 FILE /companionObject.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
     CLASS OBJECT companion object of Test1
-      $new: VALUE_PARAMETER <receiver: companion object of Test1>
+      $new: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -18,13 +18,13 @@ FILE /companionObject.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
     CLASS OBJECT companion object of Test2Named
-      $new: VALUE_PARAMETER <receiver: companion object of Test2Named>
+      $new: VALUE_PARAMETER this@Named: Named
       CONSTRUCTOR private constructor Named()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt
index ef2406f1de5..bed03caa6a6 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.txt
@@ -1,6 +1,6 @@
 FILE /dataClasses.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(x: kotlin.Int, y: kotlin.String, z: kotlin.Any)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String
@@ -13,63 +13,63 @@ FILE /dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     PROPERTY public final val y: kotlin.String
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.String
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
             GET_FIELD 'y: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     PROPERTY public final val z: kotlin.Any
       FIELD PROPERTY_BACKING_FIELD public final val z: kotlin.Any
         EXPRESSION_BODY
           GET_VAR 'value-parameter z: Any' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-z>(): kotlin.Any
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Any'
             GET_FIELD 'z: Any' type=kotlin.Any origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1(): Int'
           CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component2(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component2(): String'
           CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component3(): kotlin.Any
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component3(): Any'
           CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: kotlin.Int = ..., y: kotlin.String = ..., z: kotlin.Any = ...): Test1
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY
           CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
       VALUE_PARAMETER value-parameter y: kotlin.String = ...
         EXPRESSION_BODY
           CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
       VALUE_PARAMETER value-parameter z: kotlin.Any = ...
         EXPRESSION_BODY
           CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='copy(Int = ..., String = ..., Any = ...): Test1'
           CALL 'constructor Test1(Int, String, Any)' type=Test1 origin=null
@@ -77,32 +77,32 @@ FILE /dataClasses.kt
             y: GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=null
             z: GET_VAR 'value-parameter z: Any = ...' type=kotlin.Any origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='toString(): String'
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value='Test1('
             CONST String type=kotlin.String value='x='
             CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
             CONST String type=kotlin.String value=', '
             CONST String type=kotlin.String value='y='
             CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
             CONST String type=kotlin.String value=', '
             CONST String type=kotlin.String value='z='
             CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
             CONST String type=kotlin.String value=')'
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
           CONST Int type=kotlin.Int value='0'
         SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
           CALL 'hashCode(): Int' type=kotlin.Int origin=null
             $this: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
         SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
           CALL 'plus(Int): Int' type=kotlin.Int origin=null
             $this: CALL 'times(Int): Int' type=kotlin.Int origin=null
@@ -110,7 +110,7 @@ FILE /dataClasses.kt
               other: CONST Int type=kotlin.Int value='31'
             other: CALL 'hashCode(): Int' type=kotlin.Int origin=null
               $this: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+                $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
         SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
           CALL 'plus(Int): Int' type=kotlin.Int origin=null
             $this: CALL 'times(Int): Int' type=kotlin.Int origin=null
@@ -118,17 +118,17 @@ FILE /dataClasses.kt
               other: CONST Int type=kotlin.Int value='31'
             other: CALL 'hashCode(): Int' type=kotlin.Int origin=null
               $this: CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+                $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
         RETURN type=kotlin.Nothing from='hashCode(): Int'
           GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       VALUE_PARAMETER value-parameter other: kotlin.Any?
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
           BRANCH
             if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
-              arg0: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              arg0: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
               arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               CONST Boolean type=kotlin.Boolean value='true'
@@ -146,7 +146,7 @@ FILE /dataClasses.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+                  $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
                 arg1: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test1' type=Test1 origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
@@ -156,7 +156,7 @@ FILE /dataClasses.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+                  $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
                 arg1: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test1' type=Test1 origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
@@ -166,7 +166,7 @@ FILE /dataClasses.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+                  $this: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
                 arg1: CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test1' type=Test1 origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
@@ -174,7 +174,7 @@ FILE /dataClasses.kt
         RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
           CONST Boolean type=kotlin.Boolean value='true'
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Any?)
       VALUE_PARAMETER value-parameter x: kotlin.Any?
       BLOCK_BODY
@@ -185,39 +185,39 @@ FILE /dataClasses.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Any?' type=kotlin.Any? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Any?
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Any?'
             GET_FIELD 'x: Any?' type=kotlin.Any? origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): kotlin.Any?
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1(): Any?'
           CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+            $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: kotlin.Any? = ...): Test2
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       VALUE_PARAMETER value-parameter x: kotlin.Any? = ...
         EXPRESSION_BODY
           CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+            $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='copy(Any? = ...): Test2'
           CALL 'constructor Test2(Any?)' type=Test2 origin=null
             x: GET_VAR 'value-parameter x: Any? = ...' type=kotlin.Any? origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='toString(): String'
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value='Test2('
             CONST String type=kotlin.String value='x='
             CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             CONST String type=kotlin.String value=')'
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       BLOCK_BODY
         VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
           CONST Int type=kotlin.Int value='0'
@@ -225,7 +225,7 @@ FILE /dataClasses.kt
           BLOCK type=kotlin.Int origin=null
             VAR IR_TEMPORARY_VARIABLE val tmp1: kotlin.Any?
               CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             WHEN type=kotlin.Int origin=null
               BRANCH
                 if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -239,13 +239,13 @@ FILE /dataClasses.kt
         RETURN type=kotlin.Nothing from='hashCode(): Int'
           GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       VALUE_PARAMETER value-parameter other: kotlin.Any?
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
           BRANCH
             if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
-              arg0: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              arg0: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
               arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               CONST Boolean type=kotlin.Boolean value='true'
@@ -263,7 +263,7 @@ FILE /dataClasses.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                  $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
                 arg1: CALL '<get-x>(): Any?' type=kotlin.Any? origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test2' type=Test2 origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
index 2a4233a0825..6998fbbe2df 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
@@ -1,6 +1,6 @@
 FILE /dataClassesGeneric.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test1<T>(x: T)
       VALUE_PARAMETER value-parameter x: T
@@ -12,39 +12,39 @@ FILE /dataClassesGeneric.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): T
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T'
             GET_FIELD 'x: T' type=T origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+              receiver: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): T
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1<T>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1(): T'
           CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+            $this: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: T = ...): Test1<T>
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1<T>
       VALUE_PARAMETER value-parameter x: T = ...
         EXPRESSION_BODY
           CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+            $this: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='copy(T = ...): Test1<T>'
           CALL 'constructor Test1(T)' type=Test1<T> origin=null
             x: GET_VAR 'value-parameter x: T = ...' type=T origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1<T>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='toString(): String'
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value='Test1('
             CONST String type=kotlin.String value='x='
             CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+              $this: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
             CONST String type=kotlin.String value=')'
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1<T>
       BLOCK_BODY
         VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
           CONST Int type=kotlin.Int value='0'
@@ -52,7 +52,7 @@ FILE /dataClassesGeneric.kt
           BLOCK type=kotlin.Int origin=null
             VAR IR_TEMPORARY_VARIABLE val tmp1: T
               CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+                $this: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
             WHEN type=kotlin.Int origin=null
               BRANCH
                 if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -67,13 +67,13 @@ FILE /dataClassesGeneric.kt
         RETURN type=kotlin.Nothing from='hashCode(): Int'
           GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1<T>
       VALUE_PARAMETER value-parameter other: kotlin.Any?
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
           BRANCH
             if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
-              arg0: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+              arg0: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
               arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               CONST Boolean type=kotlin.Boolean value='true'
@@ -91,7 +91,7 @@ FILE /dataClassesGeneric.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test1>' type=Test1<T> origin=null
+                  $this: GET_VAR 'this@Test1: Test1<T>' type=Test1<T> origin=null
                 arg1: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test1<T>' type=Test1<T> origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
index 54cca350421..f784c40468a 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
@@ -1,36 +1,36 @@
 FILE /delegatedImplementation.kt
   CLASS INTERFACE IBase
     FUN public abstract fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter s: kotlin.String
     FUN public abstract fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase
     FUN public abstract fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IBase>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@IBase: IBase
+      $receiver: VALUE_PARAMETER this@qux: String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT BaseImpl
-    $new: VALUE_PARAMETER <receiver: BaseImpl>
+    $new: VALUE_PARAMETER this@BaseImpl: BaseImpl
     CONSTRUCTOR private constructor BaseImpl()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='BaseImpl'
     FUN public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter s: kotlin.String
       BLOCK_BODY
     FUN public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='bar(): Int'
           CONST Int type=kotlin.Int value='42'
     FUN public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: BaseImpl>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
+      $receiver: VALUE_PARAMETER this@qux: String
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -38,24 +38,24 @@ FILE /delegatedImplementation.kt
   CLASS INTERFACE IOther
     PROPERTY public abstract val x: kotlin.String
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-x>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
     PROPERTY public abstract var y: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: IOther>
+        $this: VALUE_PARAMETER this@IOther: IOther
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     PROPERTY public abstract val kotlin.Byte.z1: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<get-z1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z1: Byte
     PROPERTY public abstract var kotlin.Byte.z2: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<get-z2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z2: Byte
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun kotlin.Byte.<set-z2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: IOther>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@IOther: IOther
+        $receiver: VALUE_PARAMETER this@z2: Byte
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -67,7 +67,7 @@ FILE /delegatedImplementation.kt
       RETURN type=kotlin.Nothing from='otherImpl(String, Int): IOther'
         BLOCK type=otherImpl.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER <receiver: <no name provided>>
+            $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
             CONSTRUCTOR public constructor <no name provided>()
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -77,45 +77,45 @@ FILE /delegatedImplementation.kt
                 EXPRESSION_BODY
                   GET_VAR 'value-parameter x0: String' type=kotlin.String origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-x>(): kotlin.String
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='<get-x>(): String'
                     GET_FIELD 'x: String' type=kotlin.String origin=null
-                      receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                      receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
             PROPERTY public open override var y: kotlin.Int
               FIELD PROPERTY_BACKING_FIELD public open override var y: kotlin.Int
                 EXPRESSION_BODY
                   GET_VAR 'value-parameter y0: Int' type=kotlin.Int origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-y>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='<get-y>(): Int'
                     GET_FIELD 'y: Int' type=kotlin.Int origin=null
-                      receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                      receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
               FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                 VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
                 BLOCK_BODY
                   SET_FIELD 'y: Int' type=kotlin.Unit origin=null
-                    receiver: GET_VAR '<receiver: <no name provided>>' type=otherImpl.<no name provided> origin=null
+                    receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=otherImpl.<no name provided> origin=null
                     value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
             PROPERTY public open override val kotlin.Byte.z1: kotlin.Int
               FUN public open override fun kotlin.Byte.<get-z1>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z1: Byte
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='<get-z1>() on Byte: Int'
                     CONST Int type=kotlin.Int value='1'
             PROPERTY public open override var kotlin.Byte.z2: kotlin.Int
               FUN public open override fun kotlin.Byte.<get-z2>(): kotlin.Int
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z2: Byte
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='<get-z2>() on Byte: Int'
                     CONST Int type=kotlin.Int value='2'
               FUN public open override fun kotlin.Byte.<set-z2>(value: kotlin.Int): kotlin.Unit
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
-                $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                $receiver: VALUE_PARAMETER this@z2: Byte
                 VALUE_PARAMETER value-parameter value: kotlin.Int
                 BLOCK_BODY
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
@@ -123,7 +123,7 @@ FILE /delegatedImplementation.kt
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
           CALL 'constructor <no name provided>()' type=otherImpl.<no name provided> origin=OBJECT_LITERAL
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -132,35 +132,35 @@ FILE /delegatedImplementation.kt
       EXPRESSION_BODY
         GET_OBJECT 'BaseImpl' type=BaseImpl
     FUN DELEGATED_MEMBER public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='bar(): Int'
           CALL 'bar(): Int' type=kotlin.Int origin=null
             $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN DELEGATED_MEMBER public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test1>
+      $this: VALUE_PARAMETER this@Test1: Test1
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter s: kotlin.String
       BLOCK_BODY
         CALL 'foo(Int, String): Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
           x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
           s: GET_VAR 'value-parameter s: String' type=kotlin.String origin=null
     FUN DELEGATED_MEMBER public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test1>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@Test1: Test1
+      $receiver: VALUE_PARAMETER this@qux: String
       BLOCK_BODY
         CALL 'qux() on String: Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test1$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
-          $receiver: GET_VAR '<receiver: qux() on String: Unit>' type=kotlin.String origin=null
+            receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
+          $receiver: GET_VAR 'this@qux: String' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -169,30 +169,30 @@ FILE /delegatedImplementation.kt
       EXPRESSION_BODY
         GET_OBJECT 'BaseImpl' type=BaseImpl
     FUN DELEGATED_MEMBER public open override fun bar(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='bar(): Int'
           CALL 'bar(): Int' type=kotlin.Int origin=null
             $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     FUN DELEGATED_MEMBER public open override fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter s: kotlin.String
       BLOCK_BODY
         CALL 'foo(Int, String): Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+            receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
           x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
           s: GET_VAR 'value-parameter s: String' type=kotlin.String origin=null
     FUN DELEGATED_MEMBER public open override fun kotlin.String.qux(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test2>
-      $receiver: VALUE_PARAMETER <receiver: qux() on String: Unit>
+      $this: VALUE_PARAMETER this@Test2: Test2
+      $receiver: VALUE_PARAMETER this@qux: String
       BLOCK_BODY
         CALL 'qux() on String: Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test2$IBase$delegate`: BaseImpl' type=BaseImpl origin=null
-            receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-          $receiver: GET_VAR '<receiver: qux() on String: Unit>' type=kotlin.String origin=null
+            receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+          $receiver: GET_VAR 'this@qux: String' type=kotlin.String origin=null
     FIELD DELEGATE val `Test2$IOther$delegate`: IOther
       EXPRESSION_BODY
         CALL 'otherImpl(String, Int): IOther' type=IOther origin=null
@@ -200,57 +200,57 @@ FILE /delegatedImplementation.kt
           y0: CONST Int type=kotlin.Int value='42'
     PROPERTY DELEGATED_MEMBER public open override val kotlin.Byte.z1: kotlin.Int
       FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<get-z1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z1: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z1: Byte
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z1>() on Byte: Int'
             CALL '<get-z1>() on Byte: Int' type=kotlin.Int origin=null
               $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-              $receiver: GET_VAR '<receiver: z1: Int on Byte>' type=kotlin.Byte origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+              $receiver: GET_VAR 'this@z1: Byte' type=kotlin.Byte origin=null
     PROPERTY DELEGATED_MEMBER public open override val x: kotlin.String
       FUN DELEGATED_MEMBER public open override fun <get-x>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): String'
             CALL '<get-x>(): String' type=kotlin.String origin=null
               $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     PROPERTY DELEGATED_MEMBER public open override var kotlin.Byte.z2: kotlin.Int
       FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<get-z2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z2: Byte
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z2>() on Byte: Int'
             CALL '<get-z2>() on Byte: Int' type=kotlin.Int origin=null
               $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-              $receiver: GET_VAR '<receiver: z2: Int on Byte>' type=kotlin.Byte origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+              $receiver: GET_VAR 'this@z2: Byte' type=kotlin.Byte origin=null
       FUN DELEGATED_MEMBER public open override fun kotlin.Byte.<set-z2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Test2>
-        $receiver: VALUE_PARAMETER <receiver: z2: Int on Byte>
+        $this: VALUE_PARAMETER this@Test2: Test2
+        $receiver: VALUE_PARAMETER this@z2: Byte
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           CALL '<set-z2>(Int) on Byte: Unit' type=kotlin.Unit origin=null
             $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
-            $receiver: GET_VAR '<receiver: z2: Int on Byte>' type=kotlin.Byte origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
+            $receiver: GET_VAR 'this@z2: Byte' type=kotlin.Byte origin=null
             <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     PROPERTY DELEGATED_MEMBER public open override var y: kotlin.Int
       FUN DELEGATED_MEMBER public open override fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             CALL '<get-y>(): Int' type=kotlin.Int origin=null
               $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-                receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+                receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
       FUN DELEGATED_MEMBER public open override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           CALL '<set-y>(Int): Unit' type=kotlin.Unit origin=null
             $this: GET_FIELD '`Test2$IOther$delegate`: IOther' type=IOther origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
index 18b2c4df381..d09a90a07c0 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
@@ -1,29 +1,29 @@
 FILE /delegatedImplementationWithExplicitOverride.kt
   CLASS INTERFACE IFooBar
     FUN public abstract fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IFooBar>
+      $this: VALUE_PARAMETER this@IFooBar: IFooBar
     FUN public abstract fun bar(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IFooBar>
+      $this: VALUE_PARAMETER this@IFooBar: IFooBar
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT FooBarImpl
-    $new: VALUE_PARAMETER <receiver: FooBarImpl>
+    $new: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
     CONSTRUCTOR private constructor FooBarImpl()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='FooBarImpl'
     FUN public open override fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: FooBarImpl>
+      $this: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
       BLOCK_BODY
     FUN public open override fun bar(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: FooBarImpl>
+      $this: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -32,13 +32,13 @@ FILE /delegatedImplementationWithExplicitOverride.kt
       EXPRESSION_BODY
         GET_OBJECT 'FooBarImpl' type=FooBarImpl
     FUN DELEGATED_MEMBER public open override fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
         CALL 'foo(): Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`C$IFooBar$delegate`: FooBarImpl' type=FooBarImpl origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
     FUN public open override fun bar(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
index 20209e25cc4..c956aff1053 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
@@ -1,6 +1,6 @@
 FILE /delegatingConstructorCallToTypeAliasConstructor.kt
   CLASS CLASS Cell
-    $new: VALUE_PARAMETER <receiver: Cell>
+    $new: VALUE_PARAMETER this@Cell: Cell<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Cell<T>(value: T)
       VALUE_PARAMETER value-parameter value: T
@@ -12,18 +12,18 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): T
-        $this: VALUE_PARAMETER <receiver: Cell>
+        $this: VALUE_PARAMETER this@Cell: Cell<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): T'
             GET_FIELD 'value: T' type=T origin=null
-              receiver: GET_VAR '<receiver: Cell>' type=Cell<T> origin=null
+              receiver: GET_VAR 'this@Cell: Cell<T>' type=Cell<T> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   TYPEALIAS typealias CT = Cell<T> type=Cell<T>
   TYPEALIAS typealias CStr = Cell<String> type=Cell<kotlin.String>
   CLASS CLASS C1
-    $new: VALUE_PARAMETER <receiver: C1>
+    $new: VALUE_PARAMETER this@C1: C1
     CONSTRUCTOR public constructor C1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
@@ -35,7 +35,7 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS C2
-    $new: VALUE_PARAMETER <receiver: C2>
+    $new: VALUE_PARAMETER this@C2: C2
     CONSTRUCTOR public constructor C2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
index 12227880dc9..4f756127305 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
@@ -1,6 +1,6 @@
 FILE /delegatingConstructorCallsInSecondaryConstructors.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /delegatingConstructorCallsInSecondaryConstructors.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR public constructor Test()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt
index c2dc546e681..b77ab9520ca 100644
--- a/compiler/testData/ir/irText/classes/enum.txt
+++ b/compiler/testData/ir/irText/classes/enum.txt
@@ -1,6 +1,6 @@
 FILE /enum.kt
   CLASS ENUM_CLASS TestEnum1
-    $new: VALUE_PARAMETER <receiver: TestEnum1>
+    $new: VALUE_PARAMETER this@TestEnum1: TestEnum1
     CONSTRUCTOR private constructor TestEnum1()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -25,7 +25,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum1
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum2
-    $new: VALUE_PARAMETER <receiver: TestEnum2>
+    $new: VALUE_PARAMETER this@TestEnum2: TestEnum2
     CONSTRUCTOR private constructor TestEnum2(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -36,11 +36,11 @@ FILE /enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestEnum2>
+        $this: VALUE_PARAMETER this@TestEnum2: TestEnum2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestEnum2>' type=TestEnum2 origin=null
+              receiver: GET_VAR 'this@TestEnum2: TestEnum2' type=TestEnum2 origin=null
     ENUM_ENTRY enum entry TEST1
       init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum2(Int)'
         x: CONST Int type=kotlin.Int value='1'
@@ -66,7 +66,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum2
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum3
-    $new: VALUE_PARAMETER <receiver: TestEnum3>
+    $new: VALUE_PARAMETER this@TestEnum3: TestEnum3
     CONSTRUCTOR private constructor TestEnum3()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -74,13 +74,13 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST()'
       class: CLASS ENUM_ENTRY TEST
-        $new: VALUE_PARAMETER <receiver: TEST>
+        $new: VALUE_PARAMETER this@TEST: TEST
         CONSTRUCTOR private constructor TEST()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum3()'
             INSTANCE_INITIALIZER_CALL classDescriptor='TEST'
         FUN public open override fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: TEST>
+          $this: VALUE_PARAMETER this@TEST: TEST
           BLOCK_BODY
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='Hello, world!'
@@ -96,7 +96,7 @@ FILE /enum.kt
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     FUN public abstract fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: TestEnum3>
+      $this: VALUE_PARAMETER this@TestEnum3: TestEnum3
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum3!>!
@@ -113,7 +113,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum3
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum4
-    $new: VALUE_PARAMETER <receiver: TestEnum4>
+    $new: VALUE_PARAMETER this@TestEnum4: TestEnum4
     CONSTRUCTOR private constructor TestEnum4(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -124,22 +124,22 @@ FILE /enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestEnum4>
+        $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestEnum4>' type=TestEnum4 origin=null
+              receiver: GET_VAR 'this@TestEnum4: TestEnum4' type=TestEnum4 origin=null
     ENUM_ENTRY enum entry TEST1
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST1()'
       class: CLASS ENUM_ENTRY TEST1
-        $new: VALUE_PARAMETER <receiver: TEST1>
+        $new: VALUE_PARAMETER this@TEST1: TEST1
         CONSTRUCTOR private constructor TEST1()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
               x: CONST Int type=kotlin.Int value='1'
             INSTANCE_INITIALIZER_CALL classDescriptor='TEST1'
         FUN public open override fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: TEST1>
+          $this: VALUE_PARAMETER this@TEST1: TEST1
           BLOCK_BODY
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: GET_ENUM 'TEST1' type=TestEnum4
@@ -159,7 +159,7 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST2
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST2()'
       class: CLASS ENUM_ENTRY TEST2
-        $new: VALUE_PARAMETER <receiver: TEST2>
+        $new: VALUE_PARAMETER this@TEST2: TEST2
         CONSTRUCTOR private constructor TEST2()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
@@ -168,19 +168,19 @@ FILE /enum.kt
         PROPERTY public final val z: kotlin.Int
           FIELD PROPERTY_BACKING_FIELD public final val z: kotlin.Int
           FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-z>(): kotlin.Int
-            $this: VALUE_PARAMETER <receiver: TEST2>
+            $this: VALUE_PARAMETER this@TEST2: TEST2
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-z>(): Int'
                 GET_FIELD 'z: Int' type=kotlin.Int origin=null
-                  receiver: GET_VAR '<receiver: TEST2>' type=TestEnum4.TEST2 origin=null
+                  receiver: GET_VAR 'this@TEST2: TEST2' type=TestEnum4.TEST2 origin=null
         ANONYMOUS_INITIALIZER TEST2
           BLOCK_BODY
             SET_FIELD 'z: Int' type=kotlin.Unit origin=null
-              receiver: GET_VAR '<receiver: TEST2>' type=TestEnum4.TEST2 origin=null
+              receiver: GET_VAR 'this@TEST2: TEST2' type=TestEnum4.TEST2 origin=null
               value: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: TEST2>' type=TestEnum4.TEST2 origin=null
+                $this: GET_VAR 'this@TEST2: TEST2' type=TestEnum4.TEST2 origin=null
         FUN public open override fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: TEST2>
+          $this: VALUE_PARAMETER this@TEST2: TEST2
           BLOCK_BODY
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: GET_ENUM 'TEST2' type=TestEnum4
@@ -198,7 +198,7 @@ FILE /enum.kt
           FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     FUN public abstract fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: TestEnum4>
+      $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum4!>!
@@ -215,7 +215,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum4
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum5
-    $new: VALUE_PARAMETER <receiver: TestEnum5>
+    $new: VALUE_PARAMETER this@TestEnum5: TestEnum5
     CONSTRUCTOR private constructor TestEnum5(x: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY
@@ -228,11 +228,11 @@ FILE /enum.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestEnum5>
+        $this: VALUE_PARAMETER this@TestEnum5: TestEnum5
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestEnum5>' type=TestEnum5 origin=null
+              receiver: GET_VAR 'this@TestEnum5: TestEnum5' type=TestEnum5 origin=null
     ENUM_ENTRY enum entry TEST1
       init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum5(Int = ...)'
     ENUM_ENTRY enum entry TEST2
diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
index a0b055b6bd6..47a18c86407 100644
--- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
+++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
@@ -1,6 +1,6 @@
 FILE /enumWithSecondaryCtor.kt
   CLASS ENUM_CLASS Test0
-    $new: VALUE_PARAMETER <receiver: Test0>
+    $new: VALUE_PARAMETER this@Test0: Test0
     CONSTRUCTOR private constructor Test0(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -11,11 +11,11 @@ FILE /enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test0>
+        $this: VALUE_PARAMETER this@Test0: Test0
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test0>' type=Test0 origin=null
+              receiver: GET_VAR 'this@Test0: Test0' type=Test0 origin=null
     ENUM_ENTRY enum entry ZERO
       init: ENUM_CONSTRUCTOR_CALL 'constructor Test0()'
     CONSTRUCTOR private constructor Test0()
@@ -38,7 +38,7 @@ FILE /enumWithSecondaryCtor.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test0
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR private constructor Test1(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -49,11 +49,11 @@ FILE /enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     ENUM_ENTRY enum entry ZERO
       init: ENUM_CONSTRUCTOR_CALL 'constructor Test1()'
     ENUM_ENTRY enum entry ONE
@@ -79,7 +79,7 @@ FILE /enumWithSecondaryCtor.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test1
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR private constructor Test2(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -90,21 +90,21 @@ FILE /enumWithSecondaryCtor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     ENUM_ENTRY enum entry ZERO
       init: ENUM_CONSTRUCTOR_CALL 'constructor ZERO()'
       class: CLASS ENUM_ENTRY ZERO
-        $new: VALUE_PARAMETER <receiver: ZERO>
+        $new: VALUE_PARAMETER this@ZERO: ZERO
         CONSTRUCTOR private constructor ZERO()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor Test2()'
             INSTANCE_INITIALIZER_CALL classDescriptor='ZERO'
         FUN public open override fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: ZERO>
+          $this: VALUE_PARAMETER this@ZERO: ZERO
           BLOCK_BODY
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='ZERO'
@@ -124,14 +124,14 @@ FILE /enumWithSecondaryCtor.kt
     ENUM_ENTRY enum entry ONE
       init: ENUM_CONSTRUCTOR_CALL 'constructor ONE()'
       class: CLASS ENUM_ENTRY ONE
-        $new: VALUE_PARAMETER <receiver: ONE>
+        $new: VALUE_PARAMETER this@ONE: ONE
         CONSTRUCTOR private constructor ONE()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor Test2(Int)'
               x: CONST Int type=kotlin.Int value='1'
             INSTANCE_INITIALIZER_CALL classDescriptor='ONE'
         FUN public open override fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: ONE>
+          $this: VALUE_PARAMETER this@ONE: ONE
           BLOCK_BODY
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='ONE'
@@ -153,7 +153,7 @@ FILE /enumWithSecondaryCtor.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Test2(Int)'
           x: CONST Int type=kotlin.Int value='0'
     FUN public abstract fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test2>
+      $this: VALUE_PARAMETER this@Test2: Test2
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test2!>!
diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt
index 3a8120521e9..6ffb87dc4c8 100644
--- a/compiler/testData/ir/irText/classes/initBlock.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.txt
@@ -1,6 +1,6 @@
 FILE /initBlock.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -12,7 +12,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -23,11 +23,11 @@ FILE /initBlock.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     ANONYMOUS_INITIALIZER Test2
       BLOCK_BODY
         CALL 'println(): Unit' type=kotlin.Unit origin=null
@@ -35,7 +35,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER <receiver: Test3>
+    $new: VALUE_PARAMETER this@Test3: Test3
     ANONYMOUS_INITIALIZER Test3
       BLOCK_BODY
         CALL 'println(): Unit' type=kotlin.Unit origin=null
@@ -47,7 +47,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test4
-    $new: VALUE_PARAMETER <receiver: Test4>
+    $new: VALUE_PARAMETER this@Test4: Test4
     ANONYMOUS_INITIALIZER Test4
       BLOCK_BODY
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
@@ -64,7 +64,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test5
-    $new: VALUE_PARAMETER <receiver: Test5>
+    $new: VALUE_PARAMETER this@Test5: Test5
     CONSTRUCTOR public constructor Test5()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -74,9 +74,9 @@ FILE /initBlock.kt
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='1'
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER <receiver: TestInner>
+      $new: VALUE_PARAMETER this@TestInner: TestInner
       CONSTRUCTOR public constructor TestInner()
-        $outer: VALUE_PARAMETER <receiver: Test5>
+        $outer: VALUE_PARAMETER this@Test5: Test5
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
diff --git a/compiler/testData/ir/irText/classes/initVal.txt b/compiler/testData/ir/irText/classes/initVal.txt
index 80be31d760f..92d185e9955 100644
--- a/compiler/testData/ir/irText/classes/initVal.txt
+++ b/compiler/testData/ir/irText/classes/initVal.txt
@@ -1,6 +1,6 @@
 FILE /initVal.kt
   CLASS CLASS TestInitValFromParameter
-    $new: VALUE_PARAMETER <receiver: TestInitValFromParameter>
+    $new: VALUE_PARAMETER this@TestInitValFromParameter: TestInitValFromParameter
     CONSTRUCTOR public constructor TestInitValFromParameter(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -11,16 +11,16 @@ FILE /initVal.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitValFromParameter>
+        $this: VALUE_PARAMETER this@TestInitValFromParameter: TestInitValFromParameter
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitValFromParameter>' type=TestInitValFromParameter origin=null
+              receiver: GET_VAR 'this@TestInitValFromParameter: TestInitValFromParameter' type=TestInitValFromParameter origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitValInClass
-    $new: VALUE_PARAMETER <receiver: TestInitValInClass>
+    $new: VALUE_PARAMETER this@TestInitValInClass: TestInitValInClass
     CONSTRUCTOR public constructor TestInitValInClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -30,16 +30,16 @@ FILE /initVal.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitValInClass>
+        $this: VALUE_PARAMETER this@TestInitValInClass: TestInitValInClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitValInClass>' type=TestInitValInClass origin=null
+              receiver: GET_VAR 'this@TestInitValInClass: TestInitValInClass' type=TestInitValInClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitValInInitBlock
-    $new: VALUE_PARAMETER <receiver: TestInitValInInitBlock>
+    $new: VALUE_PARAMETER this@TestInitValInInitBlock: TestInitValInInitBlock
     CONSTRUCTOR public constructor TestInitValInInitBlock()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -47,15 +47,15 @@ FILE /initVal.kt
     PROPERTY public final val x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitValInInitBlock>
+        $this: VALUE_PARAMETER this@TestInitValInInitBlock: TestInitValInInitBlock
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitValInInitBlock>' type=TestInitValInInitBlock origin=null
+              receiver: GET_VAR 'this@TestInitValInInitBlock: TestInitValInInitBlock' type=TestInitValInInitBlock origin=null
     ANONYMOUS_INITIALIZER TestInitValInInitBlock
       BLOCK_BODY
         SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-          receiver: GET_VAR '<receiver: TestInitValInInitBlock>' type=TestInitValInInitBlock origin=null
+          receiver: GET_VAR 'this@TestInitValInInitBlock: TestInitValInInitBlock' type=TestInitValInInitBlock origin=null
           value: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt
index 0fdaeb1c572..fc3fb870b63 100644
--- a/compiler/testData/ir/irText/classes/initVar.txt
+++ b/compiler/testData/ir/irText/classes/initVar.txt
@@ -1,6 +1,6 @@
 FILE /initVar.kt
   CLASS CLASS TestInitVarFromParameter
-    $new: VALUE_PARAMETER <receiver: TestInitVarFromParameter>
+    $new: VALUE_PARAMETER this@TestInitVarFromParameter: TestInitVarFromParameter
     CONSTRUCTOR public constructor TestInitVarFromParameter(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -11,23 +11,23 @@ FILE /initVar.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarFromParameter>
+        $this: VALUE_PARAMETER this@TestInitVarFromParameter: TestInitVarFromParameter
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarFromParameter>' type=TestInitVarFromParameter origin=null
+              receiver: GET_VAR 'this@TestInitVarFromParameter: TestInitVarFromParameter' type=TestInitVarFromParameter origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarFromParameter>
+        $this: VALUE_PARAMETER this@TestInitVarFromParameter: TestInitVarFromParameter
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: TestInitVarFromParameter>' type=TestInitVarFromParameter origin=null
+            receiver: GET_VAR 'this@TestInitVarFromParameter: TestInitVarFromParameter' type=TestInitVarFromParameter origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarInClass
-    $new: VALUE_PARAMETER <receiver: TestInitVarInClass>
+    $new: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
     CONSTRUCTOR public constructor TestInitVarInClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -37,23 +37,23 @@ FILE /initVar.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarInClass>
+        $this: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarInClass>' type=TestInitVarInClass origin=null
+              receiver: GET_VAR 'this@TestInitVarInClass: TestInitVarInClass' type=TestInitVarInClass origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarInClass>
+        $this: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: TestInitVarInClass>' type=TestInitVarInClass origin=null
+            receiver: GET_VAR 'this@TestInitVarInClass: TestInitVarInClass' type=TestInitVarInClass origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarInInitBlock
-    $new: VALUE_PARAMETER <receiver: TestInitVarInInitBlock>
+    $new: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
     CONSTRUCTOR public constructor TestInitVarInInitBlock()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -61,28 +61,28 @@ FILE /initVar.kt
     PROPERTY public final var x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarInInitBlock>
+        $this: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarInInitBlock>' type=TestInitVarInInitBlock origin=null
+              receiver: GET_VAR 'this@TestInitVarInInitBlock: TestInitVarInInitBlock' type=TestInitVarInInitBlock origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarInInitBlock>
+        $this: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: TestInitVarInInitBlock>' type=TestInitVarInInitBlock origin=null
+            receiver: GET_VAR 'this@TestInitVarInInitBlock: TestInitVarInInitBlock' type=TestInitVarInInitBlock origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     ANONYMOUS_INITIALIZER TestInitVarInInitBlock
       BLOCK_BODY
         CALL '<set-x>(Int): Unit' type=kotlin.Unit origin=EQ
-          $this: GET_VAR '<receiver: TestInitVarInInitBlock>' type=TestInitVarInInitBlock origin=null
+          $this: GET_VAR 'this@TestInitVarInInitBlock: TestInitVarInInitBlock' type=TestInitVarInInitBlock origin=null
           <set-?>: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetter
-    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetter>
+    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
     CONSTRUCTOR public constructor TestInitVarWithCustomSetter()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -92,42 +92,42 @@ FILE /initVar.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetter>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarWithCustomSetter>' type=TestInitVarWithCustomSetter origin=null
+              receiver: GET_VAR 'this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter' type=TestInitVarWithCustomSetter origin=null
       FUN public final fun <set-x>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetter>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ
-            receiver: GET_VAR '<receiver: TestInitVarWithCustomSetter>' type=TestInitVarWithCustomSetter origin=null
+            receiver: GET_VAR 'this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter' type=TestInitVarWithCustomSetter origin=null
             value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor
-    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterWithExplicitCtor>
+    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
     PROPERTY public final var x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterWithExplicitCtor>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarWithCustomSetterWithExplicitCtor>' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
+              receiver: GET_VAR 'this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
       FUN public final fun <set-x>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterWithExplicitCtor>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ
-            receiver: GET_VAR '<receiver: TestInitVarWithCustomSetterWithExplicitCtor>' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
+            receiver: GET_VAR 'this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
             value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     ANONYMOUS_INITIALIZER TestInitVarWithCustomSetterWithExplicitCtor
       BLOCK_BODY
         CALL '<set-x>(Int): Unit' type=kotlin.Unit origin=EQ
-          $this: GET_VAR '<receiver: TestInitVarWithCustomSetterWithExplicitCtor>' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
+          $this: GET_VAR 'this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor' type=TestInitVarWithCustomSetterWithExplicitCtor origin=null
           value: CONST Int type=kotlin.Int value='0'
     CONSTRUCTOR public constructor TestInitVarWithCustomSetterWithExplicitCtor()
       BLOCK_BODY
@@ -137,28 +137,28 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetterInCtor
-    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterInCtor>
+    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
     PROPERTY public final var x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterInCtor>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitVarWithCustomSetterInCtor>' type=TestInitVarWithCustomSetterInCtor origin=null
+              receiver: GET_VAR 'this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor origin=null
       FUN public final fun <set-x>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterInCtor>
+        $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ
-            receiver: GET_VAR '<receiver: TestInitVarWithCustomSetterInCtor>' type=TestInitVarWithCustomSetterInCtor origin=null
+            receiver: GET_VAR 'this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor origin=null
             value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     CONSTRUCTOR public constructor TestInitVarWithCustomSetterInCtor()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarWithCustomSetterInCtor'
         CALL '<set-x>(Int): Unit' type=kotlin.Unit origin=EQ
-          $this: GET_VAR '<receiver: TestInitVarWithCustomSetterInCtor>' type=TestInitVarWithCustomSetterInCtor origin=null
+          $this: GET_VAR 'this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor origin=null
           value: CONST Int type=kotlin.Int value='42'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/innerClass.txt b/compiler/testData/ir/irText/classes/innerClass.txt
index 505dbc2f004..5e27011319a 100644
--- a/compiler/testData/ir/irText/classes/innerClass.txt
+++ b/compiler/testData/ir/irText/classes/innerClass.txt
@@ -1,14 +1,14 @@
 FILE /innerClass.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER <receiver: Outer>
+    $new: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS TestInnerClass
-      $new: VALUE_PARAMETER <receiver: TestInnerClass>
+      $new: VALUE_PARAMETER this@TestInnerClass: TestInnerClass
       CONSTRUCTOR public constructor TestInnerClass()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestInnerClass'
@@ -16,12 +16,12 @@ FILE /innerClass.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS DerivedInnerClass
-      $new: VALUE_PARAMETER <receiver: DerivedInnerClass>
+      $new: VALUE_PARAMETER this@DerivedInnerClass: DerivedInnerClass
       CONSTRUCTOR public constructor DerivedInnerClass()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor TestInnerClass()'
-            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+            $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='DerivedInnerClass'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
index e57cd753e02..68501d446e9 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
@@ -1,14 +1,14 @@
 FILE /innerClassWithDelegatingConstructor.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER <receiver: Outer>
+    $new: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER <receiver: Inner>
+      $new: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner(x: kotlin.Int)
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         VALUE_PARAMETER value-parameter x: kotlin.Int
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -18,16 +18,16 @@ FILE /innerClassWithDelegatingConstructor.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-          $this: VALUE_PARAMETER <receiver: Inner>
+          $this: VALUE_PARAMETER this@Inner: Inner
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x>(): Int'
               GET_FIELD 'x: Int' type=kotlin.Int origin=null
-                receiver: GET_VAR '<receiver: Inner>' type=Outer.Inner origin=null
+                receiver: GET_VAR 'this@Inner: Inner' type=Outer.Inner origin=null
       CONSTRUCTOR public constructor Inner()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
-            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+            $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
             x: CONST Int type=kotlin.Int value='0'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/localClasses.txt b/compiler/testData/ir/irText/classes/localClasses.txt
index 00b4920a5f4..2cfd604b96c 100644
--- a/compiler/testData/ir/irText/classes/localClasses.txt
+++ b/compiler/testData/ir/irText/classes/localClasses.txt
@@ -2,13 +2,13 @@ FILE /localClasses.kt
   FUN public fun outer(): kotlin.Unit
     BLOCK_BODY
       CLASS CLASS LocalClass
-        $new: VALUE_PARAMETER <receiver: LocalClass>
+        $new: VALUE_PARAMETER this@LocalClass: LocalClass
         CONSTRUCTOR public constructor LocalClass()
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
             INSTANCE_INITIALIZER_CALL classDescriptor='LocalClass'
         FUN public final fun foo(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: LocalClass>
+          $this: VALUE_PARAMETER this@LocalClass: LocalClass
           BLOCK_BODY
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
index 35c707f865d..4d5125b44c2 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
@@ -1,7 +1,7 @@
 FILE /objectLiteralExpressions.kt
   CLASS INTERFACE IFoo
     FUN public abstract fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IFoo>
+      $this: VALUE_PARAMETER this@IFoo: IFoo
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
@@ -10,7 +10,7 @@ FILE /objectLiteralExpressions.kt
       EXPRESSION_BODY
         BLOCK type=test1.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER <receiver: <no name provided>>
+            $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
             CONSTRUCTOR public constructor <no name provided>()
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -28,13 +28,13 @@ FILE /objectLiteralExpressions.kt
       EXPRESSION_BODY
         BLOCK type=test2.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER <receiver: <no name provided>>
+            $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
             CONSTRUCTOR public constructor <no name provided>()
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
                 INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
             FUN public open override fun foo(): kotlin.Unit
-              $this: VALUE_PARAMETER <receiver: <no name provided>>
+              $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
               BLOCK_BODY
                 CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                   message: CONST String type=kotlin.String value='foo'
@@ -47,15 +47,15 @@ FILE /objectLiteralExpressions.kt
         RETURN type=kotlin.Nothing from='<get-test2>(): IFoo'
           GET_FIELD 'test2: IFoo' type=IFoo origin=null
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER <receiver: Outer>
+    $new: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER <receiver: Inner>
+      $new: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
@@ -64,19 +64,19 @@ FILE /objectLiteralExpressions.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     FUN public final fun test3(): Outer.Inner
-      $this: VALUE_PARAMETER <receiver: Outer>
+      $this: VALUE_PARAMETER this@Outer: Outer
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='test3(): Outer.Inner'
           BLOCK type=Outer.test3.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS <no name provided>
-              $new: VALUE_PARAMETER <receiver: <no name provided>>
+              $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
               CONSTRUCTOR public constructor <no name provided>()
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
-                    $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+                    $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
                   INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
               FUN public open override fun foo(): kotlin.Unit
-                $this: VALUE_PARAMETER <receiver: <no name provided>>
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
                 BLOCK_BODY
                   CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                     message: CONST String type=kotlin.String value='foo'
@@ -88,19 +88,19 @@ FILE /objectLiteralExpressions.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun Outer.test4(): Outer.Inner
-    $receiver: VALUE_PARAMETER <receiver: test4() on Outer: Outer.Inner>
+    $receiver: VALUE_PARAMETER this@test4: Outer
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test4() on Outer: Outer.Inner'
         BLOCK type=test4.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER <receiver: <no name provided>>
+            $new: VALUE_PARAMETER this@<no name provided>: <no name provided>
             CONSTRUCTOR public constructor <no name provided>()
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
-                  $this: GET_VAR '<receiver: test4() on Outer: Outer.Inner>' type=Outer origin=null
+                  $this: GET_VAR 'this@test4: Outer' type=Outer origin=null
                 INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
             FUN public open override fun foo(): kotlin.Unit
-              $this: VALUE_PARAMETER <receiver: <no name provided>>
+              $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
               BLOCK_BODY
                 CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                   message: CONST String type=kotlin.String value='foo'
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
index d7f304a151f..563a09fd7db 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
@@ -1,6 +1,6 @@
 FILE /objectWithInitializers.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /objectWithInitializers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR private constructor Test()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -19,25 +19,25 @@ FILE /objectWithInitializers.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='1'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test>' type=Test origin=null
+              receiver: GET_VAR 'this@Test: Test' type=Test origin=null
     PROPERTY public final val y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test>' type=Test origin=null
+              receiver: GET_VAR 'this@Test: Test' type=Test origin=null
     ANONYMOUS_INITIALIZER Test
       BLOCK_BODY
         SET_FIELD 'y: Int' type=kotlin.Unit origin=null
-          receiver: GET_VAR '<receiver: Test>' type=Test origin=null
+          receiver: GET_VAR 'this@Test: Test' type=Test origin=null
           value: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test>' type=Test origin=null
+            $this: GET_VAR 'this@Test: Test' type=Test origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.txt b/compiler/testData/ir/irText/classes/outerClassAccess.txt
index 3b9947f7202..88133f8f06e 100644
--- a/compiler/testData/ir/irText/classes/outerClassAccess.txt
+++ b/compiler/testData/ir/irText/classes/outerClassAccess.txt
@@ -1,45 +1,45 @@
 FILE /outerClassAccess.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER <receiver: Outer>
+    $new: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     FUN public final fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Outer>
+      $this: VALUE_PARAMETER this@Outer: Outer
       BLOCK_BODY
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER <receiver: Inner>
+      $new: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
       FUN public final fun test(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Inner>
+        $this: VALUE_PARAMETER this@Inner: Inner
         BLOCK_BODY
           CALL 'foo(): Unit' type=kotlin.Unit origin=null
-            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+            $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
       CLASS CLASS Inner2
-        $new: VALUE_PARAMETER <receiver: Inner2>
+        $new: VALUE_PARAMETER this@Inner2: Inner2
         CONSTRUCTOR public constructor Inner2()
-          $outer: VALUE_PARAMETER <receiver: Inner>
+          $outer: VALUE_PARAMETER this@Inner: Inner
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
             INSTANCE_INITIALIZER_CALL classDescriptor='Inner2'
         FUN public final fun test2(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: Inner2>
+          $this: VALUE_PARAMETER this@Inner2: Inner2
           BLOCK_BODY
             CALL 'test(): Unit' type=kotlin.Unit origin=null
-              $this: GET_VAR '<receiver: Inner>' type=Outer.Inner origin=null
+              $this: GET_VAR 'this@Inner: Inner' type=Outer.Inner origin=null
             CALL 'foo(): Unit' type=kotlin.Unit origin=null
-              $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+              $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
         FUN public final fun Outer.test3(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: Inner2>
-          $receiver: VALUE_PARAMETER <receiver: test3() on Outer: Unit>
+          $this: VALUE_PARAMETER this@Inner2: Inner2
+          $receiver: VALUE_PARAMETER this@test3: Outer
           BLOCK_BODY
             CALL 'foo(): Unit' type=kotlin.Unit origin=null
-              $this: GET_VAR '<receiver: test3() on Outer: Unit>' type=Outer origin=null
+              $this: GET_VAR 'this@test3: Outer' type=Outer origin=null
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.txt b/compiler/testData/ir/irText/classes/primaryConstructor.txt
index 9fd4496563f..c67d02a5219 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.txt
@@ -1,6 +1,6 @@
 FILE /primaryConstructor.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -12,26 +12,26 @@ FILE /primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     PROPERTY public final val y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -43,26 +43,26 @@ FILE /primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     PROPERTY public final val x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER <receiver: Test3>
+    $new: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -74,23 +74,23 @@ FILE /primaryConstructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test3>
+        $this: VALUE_PARAMETER this@Test3: Test3
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test3>' type=Test3 origin=null
+              receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
     PROPERTY public final val x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test3>
+        $this: VALUE_PARAMETER this@Test3: Test3
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test3>' type=Test3 origin=null
+              receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
     ANONYMOUS_INITIALIZER Test3
       BLOCK_BODY
         SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-          receiver: GET_VAR '<receiver: Test3>' type=Test3 origin=null
+          receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
           value: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
index e4e09735ebf..f2ca1ac1324 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
@@ -1,6 +1,6 @@
 FILE /primaryConstructorWithSuperConstructorCall.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestImplicitPrimaryConstructor
-    $new: VALUE_PARAMETER <receiver: TestImplicitPrimaryConstructor>
+    $new: VALUE_PARAMETER this@TestImplicitPrimaryConstructor: TestImplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestImplicitPrimaryConstructor()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -18,7 +18,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestExplicitPrimaryConstructor
-    $new: VALUE_PARAMETER <receiver: TestExplicitPrimaryConstructor>
+    $new: VALUE_PARAMETER this@TestExplicitPrimaryConstructor: TestExplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestExplicitPrimaryConstructor()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -27,7 +27,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestWithDelegatingConstructor
-    $new: VALUE_PARAMETER <receiver: TestWithDelegatingConstructor>
+    $new: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
     CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -39,21 +39,21 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestWithDelegatingConstructor>
+        $this: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestWithDelegatingConstructor>' type=TestWithDelegatingConstructor origin=null
+              receiver: GET_VAR 'this@TestWithDelegatingConstructor: TestWithDelegatingConstructor' type=TestWithDelegatingConstructor origin=null
     PROPERTY public final val y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestWithDelegatingConstructor>
+        $this: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestWithDelegatingConstructor>' type=TestWithDelegatingConstructor origin=null
+              receiver: GET_VAR 'this@TestWithDelegatingConstructor: TestWithDelegatingConstructor' type=TestWithDelegatingConstructor origin=null
     CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
index 1dd77ba700a..cd2b6042bf9 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
@@ -1,11 +1,11 @@
 FILE /qualifiedSuperCalls.kt
   CLASS INTERFACE ILeft
     FUN public open fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: ILeft>
+      $this: VALUE_PARAMETER this@ILeft: ILeft
       BLOCK_BODY
     PROPERTY public open val bar: kotlin.Int
       FUN public open fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: ILeft>
+        $this: VALUE_PARAMETER this@ILeft: ILeft
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CONST Int type=kotlin.Int value='1'
@@ -14,11 +14,11 @@ FILE /qualifiedSuperCalls.kt
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IRight
     FUN public open fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IRight>
+      $this: VALUE_PARAMETER this@IRight: IRight
       BLOCK_BODY
     PROPERTY public open val bar: kotlin.Int
       FUN public open fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IRight>
+        $this: VALUE_PARAMETER this@IRight: IRight
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CONST Int type=kotlin.Int value='2'
@@ -26,28 +26,28 @@ FILE /qualifiedSuperCalls.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS CBoth
-    $new: VALUE_PARAMETER <receiver: CBoth>
+    $new: VALUE_PARAMETER this@CBoth: CBoth
     CONSTRUCTOR public constructor CBoth()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='CBoth'
     FUN public open override fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: CBoth>
+      $this: VALUE_PARAMETER this@CBoth: CBoth
       BLOCK_BODY
         CALL 'foo(): Unit' superQualifier=ILeft type=kotlin.Unit origin=null
-          $this: GET_VAR '<receiver: CBoth>' type=CBoth origin=null
+          $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
         CALL 'foo(): Unit' superQualifier=IRight type=kotlin.Unit origin=null
-          $this: GET_VAR '<receiver: CBoth>' type=CBoth origin=null
+          $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
     PROPERTY public open override val bar: kotlin.Int
       FUN public open override fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: CBoth>
+        $this: VALUE_PARAMETER this@CBoth: CBoth
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
               $this: CALL '<get-bar>(): Int' superQualifier=ILeft type=kotlin.Int origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: CBoth>' type=CBoth origin=null
+                $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
               other: CALL '<get-bar>(): Int' superQualifier=IRight type=kotlin.Int origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: CBoth>' type=CBoth origin=null
+                $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/classes/sealedClasses.txt b/compiler/testData/ir/irText/classes/sealedClasses.txt
index a0a795e5327..fd6ae6e33d9 100644
--- a/compiler/testData/ir/irText/classes/sealedClasses.txt
+++ b/compiler/testData/ir/irText/classes/sealedClasses.txt
@@ -1,12 +1,12 @@
 FILE /sealedClasses.kt
   CLASS CLASS Expr
-    $new: VALUE_PARAMETER <receiver: Expr>
+    $new: VALUE_PARAMETER this@Expr: Expr
     CONSTRUCTOR private constructor Expr()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Expr'
     CLASS CLASS Const
-      $new: VALUE_PARAMETER <receiver: Const>
+      $new: VALUE_PARAMETER this@Const: Const
       CONSTRUCTOR public constructor Const(number: kotlin.Double)
         VALUE_PARAMETER value-parameter number: kotlin.Double
         BLOCK_BODY
@@ -17,16 +17,16 @@ FILE /sealedClasses.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter number: Double' type=kotlin.Double origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-number>(): kotlin.Double
-          $this: VALUE_PARAMETER <receiver: Const>
+          $this: VALUE_PARAMETER this@Const: Const
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-number>(): Double'
               GET_FIELD 'number: Double' type=kotlin.Double origin=null
-                receiver: GET_VAR '<receiver: Const>' type=Expr.Const origin=null
+                receiver: GET_VAR 'this@Const: Const' type=Expr.Const origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS Sum
-      $new: VALUE_PARAMETER <receiver: Sum>
+      $new: VALUE_PARAMETER this@Sum: Sum
       CONSTRUCTOR public constructor Sum(e1: Expr, e2: Expr)
         VALUE_PARAMETER value-parameter e1: Expr
         VALUE_PARAMETER value-parameter e2: Expr
@@ -38,26 +38,26 @@ FILE /sealedClasses.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter e1: Expr' type=Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-e1>(): Expr
-          $this: VALUE_PARAMETER <receiver: Sum>
+          $this: VALUE_PARAMETER this@Sum: Sum
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-e1>(): Expr'
               GET_FIELD 'e1: Expr' type=Expr origin=null
-                receiver: GET_VAR '<receiver: Sum>' type=Expr.Sum origin=null
+                receiver: GET_VAR 'this@Sum: Sum' type=Expr.Sum origin=null
       PROPERTY public final val e2: Expr
         FIELD PROPERTY_BACKING_FIELD public final val e2: Expr
           EXPRESSION_BODY
             GET_VAR 'value-parameter e2: Expr' type=Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-e2>(): Expr
-          $this: VALUE_PARAMETER <receiver: Sum>
+          $this: VALUE_PARAMETER this@Sum: Sum
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-e2>(): Expr'
               GET_FIELD 'e2: Expr' type=Expr origin=null
-                receiver: GET_VAR '<receiver: Sum>' type=Expr.Sum origin=null
+                receiver: GET_VAR 'this@Sum: Sum' type=Expr.Sum origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS OBJECT NotANumber
-      $new: VALUE_PARAMETER <receiver: NotANumber>
+      $new: VALUE_PARAMETER this@NotANumber: NotANumber
       CONSTRUCTOR private constructor NotANumber()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Expr()'
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
index 2e1707f44f5..0261ab59fab 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
@@ -1,6 +1,6 @@
 FILE /secondaryConstructorWithInitializersFromClassBody.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,17 +9,17 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestProperty
-    $new: VALUE_PARAMETER <receiver: TestProperty>
+    $new: VALUE_PARAMETER this@TestProperty: TestProperty
     PROPERTY public final val x: kotlin.Int = 0
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int = 0
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestProperty>
+        $this: VALUE_PARAMETER this@TestProperty: TestProperty
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestProperty>' type=TestProperty origin=null
+              receiver: GET_VAR 'this@TestProperty: TestProperty' type=TestProperty origin=null
     CONSTRUCTOR public constructor TestProperty()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -28,19 +28,19 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitBlock
-    $new: VALUE_PARAMETER <receiver: TestInitBlock>
+    $new: VALUE_PARAMETER this@TestInitBlock: TestInitBlock
     PROPERTY public final val x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestInitBlock>
+        $this: VALUE_PARAMETER this@TestInitBlock: TestInitBlock
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestInitBlock>' type=TestInitBlock origin=null
+              receiver: GET_VAR 'this@TestInitBlock: TestInitBlock' type=TestInitBlock origin=null
     ANONYMOUS_INITIALIZER TestInitBlock
       BLOCK_BODY
         SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-          receiver: GET_VAR '<receiver: TestInitBlock>' type=TestInitBlock origin=null
+          receiver: GET_VAR 'this@TestInitBlock: TestInitBlock' type=TestInitBlock origin=null
           value: CONST Int type=kotlin.Int value='0'
     CONSTRUCTOR public constructor TestInitBlock()
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructors.txt b/compiler/testData/ir/irText/classes/secondaryConstructors.txt
index d83892a2ad6..4039eafda46 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructors.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructors.txt
@@ -1,6 +1,6 @@
 FILE /secondaryConstructors.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor C(Int)'
diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt
index 4b0d9c242bc..dbb56bbf3f2 100644
--- a/compiler/testData/ir/irText/classes/superCalls.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.txt
@@ -1,44 +1,44 @@
 FILE /superCalls.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER <receiver: Base>
+    $new: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Base'
     FUN public open fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Base>
+      $this: VALUE_PARAMETER this@Base: Base
       BLOCK_BODY
     PROPERTY public open val bar: kotlin.String = ""
       FIELD PROPERTY_BACKING_FIELD public open val bar: kotlin.String = ""
         EXPRESSION_BODY
           CONST String type=kotlin.String value=''
       FUN DEFAULT_PROPERTY_ACCESSOR public open fun <get-bar>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Base>
+        $this: VALUE_PARAMETER this@Base: Base
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): String'
             GET_FIELD 'bar: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Base>' type=Base origin=null
+              receiver: GET_VAR 'this@Base: Base' type=Base origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Derived
-    $new: VALUE_PARAMETER <receiver: Derived>
+    $new: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Derived'
     FUN public open override fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Derived>
+      $this: VALUE_PARAMETER this@Derived: Derived
       BLOCK_BODY
         CALL 'foo(): Unit' superQualifier=Base type=kotlin.Unit origin=null
-          $this: GET_VAR '<receiver: Derived>' type=Derived origin=null
+          $this: GET_VAR 'this@Derived: Derived' type=Derived origin=null
     PROPERTY public open override val bar: kotlin.String
       FUN public open override fun <get-bar>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Derived>
+        $this: VALUE_PARAMETER this@Derived: Derived
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): String'
             CALL '<get-bar>(): String' superQualifier=Base type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Derived>' type=Derived origin=null
+              $this: GET_VAR 'this@Derived: Derived' type=Derived origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
index a27fed22493..6ec65026ac3 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
@@ -1,6 +1,6 @@
 FILE /classLevelProperties.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,14 +10,14 @@ FILE /classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test1>(): Int'
             GET_FIELD 'test1: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final val test2: kotlin.Int
       FUN public final fun <get-test2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             CONST Int type=kotlin.Int value='0'
@@ -26,62 +26,62 @@ FILE /classLevelProperties.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test3>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test3>(): Int'
             GET_FIELD 'test3: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'test3: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     PROPERTY public final var test4: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var test4: kotlin.Int
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='1'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test4>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test4>(): Int'
             GET_FIELD 'test4: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN public final fun <set-test4>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     PROPERTY public final var test5: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var test5: kotlin.Int
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='1'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test5>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test5>(): Int'
             GET_FIELD 'test5: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN private final fun <set-test5>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'test5: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     PROPERTY public final val test6: kotlin.Int = 1
       FIELD PROPERTY_BACKING_FIELD public final val test6: kotlin.Int = 1
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='1'
       FUN public final fun <get-test6>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test6>(): Int'
             GET_FIELD 'test6: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final val test7: kotlin.Int
       FIELD DELEGATE val `test7$delegate`: kotlin.Lazy<kotlin.Int>
         EXPRESSION_BODY
@@ -94,14 +94,14 @@ FILE /classLevelProperties.kt
                     CONST Int type=kotlin.Int value='42'
               FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test7>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test7>(): Int'
             CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
               <T>: Int
               $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test7: Int' field=null getter='<get-test7>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     PROPERTY public final var test8: kotlin.Int
       FIELD DELEGATE val `test8$delegate`: kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */
@@ -110,25 +110,25 @@ FILE /classLevelProperties.kt
             <K>: String
             <V>: Int
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test8>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test8>(): Int'
             CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Int>: Int' type=kotlin.Int origin=null
               <V>: Int
               $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
             CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit origin=null
               <V>: Int
               $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
index a45bbca9105..c433a999da2 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
@@ -19,7 +19,7 @@ FILE /delegatedProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'test1: Int' field=null getter='<get-test1>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>)
       VALUE_PARAMETER value-parameter map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
       BLOCK_BODY
@@ -30,11 +30,11 @@ FILE /delegatedProperties.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-map>(): kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-map>(): MutableMap<String, Any>'
             GET_FIELD 'map: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final val test2: kotlin.Int
       FIELD DELEGATE val `test2$delegate`: kotlin.Lazy<kotlin.Int>
         EXPRESSION_BODY
@@ -47,40 +47,40 @@ FILE /delegatedProperties.kt
                     CONST Int type=kotlin.Int value='42'
               FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
               <T>: Int
               $receiver: GET_FIELD '`test2$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test2: Int' field=null getter='<get-test2>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     PROPERTY public final var test3: kotlin.Any
       FIELD DELEGATE val `test3$delegate`: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
         EXPRESSION_BODY
           CALL '<get-map>(): MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: C>' type=C origin=null
+            $this: GET_VAR 'this@C: C' type=C origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test3>(): kotlin.Any
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test3>(): Any'
             CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, in Any>: Any' type=kotlin.Any origin=null
               <V>: Any
               $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test3: Any' field=null getter='<get-test3>(): Any' setter='<set-test3>(Any): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test3>(<set-?>: kotlin.Any): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Any
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<set-test3>(Any): Unit'
             CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit origin=null
               <V>: Any
               $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
-                receiver: GET_VAR '<receiver: C>' type=C origin=null
-              thisRef: GET_VAR '<receiver: C>' type=C origin=null
+                receiver: GET_VAR 'this@C: C' type=C origin=null
+              thisRef: GET_VAR 'this@C: C' type=C origin=null
               property: PROPERTY_REFERENCE 'test3: Any' field=null getter='<get-test3>(): Any' setter='<set-test3>(Any): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
index db1c34063ac..472bf789f64 100644
--- a/compiler/testData/ir/irText/declarations/fakeOverrides.txt
+++ b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
@@ -1,7 +1,7 @@
 FILE /fakeOverrides.kt
   CLASS INTERFACE IFooStr
     FUN public abstract fun foo(x: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IFooStr>
+      $this: VALUE_PARAMETER this@IFooStr: IFooStr
       VALUE_PARAMETER value-parameter x: kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -9,26 +9,26 @@ FILE /fakeOverrides.kt
   CLASS INTERFACE IBar
     PROPERTY public abstract val bar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IBar>
+        $this: VALUE_PARAMETER this@IBar: IBar
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS CFoo
-    $new: VALUE_PARAMETER <receiver: CFoo>
+    $new: VALUE_PARAMETER this@CFoo: CFoo<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor CFoo<T>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='CFoo'
     FUN public final fun foo(x: T): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: CFoo>
+      $this: VALUE_PARAMETER this@CFoo: CFoo<T>
       VALUE_PARAMETER value-parameter x: T
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor CFoo()'
@@ -39,11 +39,11 @@ FILE /fakeOverrides.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             GET_FIELD 'bar: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1 origin=null
+              receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN FAKE_OVERRIDE public final override fun foo(x: kotlin.String): kotlin.Unit
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/declarations/interfaceProperties.txt b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
index 6c1c97a3bfa..6702c6a977c 100644
--- a/compiler/testData/ir/irText/declarations/interfaceProperties.txt
+++ b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
@@ -2,27 +2,27 @@ FILE /interfaceProperties.kt
   CLASS INTERFACE C
     PROPERTY public abstract val test1: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-test1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
     PROPERTY public open val test2: kotlin.Int
       FUN public open fun <get-test2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             CONST Int type=kotlin.Int value='0'
     PROPERTY public abstract var test3: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-test3>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <set-test3>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     PROPERTY public open var test4: kotlin.Int
       FUN public open fun <get-test4>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test4>(): Int'
             CONST Int type=kotlin.Int value='0'
       FUN public open fun <set-test4>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.txt b/compiler/testData/ir/irText/declarations/parameters/class.txt
index d54b0f26f85..d440b20266c 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.txt
@@ -10,14 +10,14 @@ FILE /class.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test<T0>
     TYPE_PARAMETER <T0>
     CONSTRUCTOR public constructor Test<T0>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test'
     CLASS CLASS TestNested
-      $new: VALUE_PARAMETER <receiver: TestNested>
+      $new: VALUE_PARAMETER this@TestNested: TestNested<T1>
       TYPE_PARAMETER <T1>
       CONSTRUCTOR public constructor TestNested<T1>()
         BLOCK_BODY
@@ -27,10 +27,10 @@ FILE /class.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER <receiver: TestInner>
+      $new: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
       TYPE_PARAMETER <T2>
       CONSTRUCTOR public constructor TestInner<T2>()
-        $outer: VALUE_PARAMETER <receiver: Test>
+        $outer: VALUE_PARAMETER this@Test: Test<T0>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
index 1b8c6b8115c..5b81803376c 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
@@ -1,6 +1,6 @@
 FILE /constructor.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1<T1, T2>
     TYPE_PARAMETER <T1>
     TYPE_PARAMETER <T2>
     CONSTRUCTOR public constructor Test1<T1, T2>(x: T1, y: T2)
@@ -14,26 +14,26 @@ FILE /constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T1' type=T1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): T1
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1<T1, T2>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T1'
             GET_FIELD 'x: T1' type=T1 origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1<T1, T2> origin=null
+              receiver: GET_VAR 'this@Test1: Test1<T1, T2>' type=Test1<T1, T2> origin=null
     PROPERTY public final val y: T2
       FIELD PROPERTY_BACKING_FIELD public final val y: T2
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: T2' type=T2 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): T2
-        $this: VALUE_PARAMETER <receiver: Test1>
+        $this: VALUE_PARAMETER this@Test1: Test1<T1, T2>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): T2'
             GET_FIELD 'y: T2' type=T2 origin=null
-              receiver: GET_VAR '<receiver: Test1>' type=Test1<T1, T2> origin=null
+              receiver: GET_VAR 'this@Test1: Test1<T1, T2>' type=Test1<T1, T2> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.String)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String
@@ -45,16 +45,16 @@ FILE /constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $this: VALUE_PARAMETER this@Test2: Test2
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
             GET_FIELD 'y: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+              receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER <receiver: TestInner>
+      $new: VALUE_PARAMETER this@TestInner: TestInner<Z>
       TYPE_PARAMETER <Z>
       CONSTRUCTOR public constructor TestInner<Z>(z: Z)
-        $outer: VALUE_PARAMETER <receiver: Test2>
+        $outer: VALUE_PARAMETER this@Test2: Test2
         VALUE_PARAMETER value-parameter z: Z
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -64,19 +64,19 @@ FILE /constructor.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter z: Z' type=Z origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-z>(): Z
-          $this: VALUE_PARAMETER <receiver: TestInner>
+          $this: VALUE_PARAMETER this@TestInner: TestInner<Z>
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-z>(): Z'
               GET_FIELD 'z: Z' type=Z origin=null
-                receiver: GET_VAR '<receiver: TestInner>' type=Test2.TestInner<Z> origin=null
+                receiver: GET_VAR 'this@TestInner: TestInner<Z>' type=Test2.TestInner<Z> origin=null
       CONSTRUCTOR public constructor TestInner<Z>(z: Z, i: kotlin.Int)
-        $outer: VALUE_PARAMETER <receiver: Test2>
+        $outer: VALUE_PARAMETER this@Test2: Test2
         VALUE_PARAMETER value-parameter z: Z
         VALUE_PARAMETER value-parameter i: kotlin.Int
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor TestInner(Z)'
             <Z>: Z
-            $this: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+            $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             z: GET_VAR 'value-parameter z: Z' type=Z origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -85,7 +85,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER <receiver: Test3>
+    $new: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String = ...
@@ -99,26 +99,26 @@ FILE /constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test3>
+        $this: VALUE_PARAMETER this@Test3: Test3
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test3>' type=Test3 origin=null
+              receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
     PROPERTY public final val y: kotlin.String
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.String
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test3>
+        $this: VALUE_PARAMETER this@Test3: Test3
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
             GET_FIELD 'y: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Test3>' type=Test3 origin=null
+              receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test4
-    $new: VALUE_PARAMETER <receiver: Test4>
+    $new: VALUE_PARAMETER this@Test4: Test4<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test4<T>(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
@@ -130,11 +130,11 @@ FILE /constructor.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test4>
+        $this: VALUE_PARAMETER this@Test4: Test4<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test4>' type=Test4<T> origin=null
+              receiver: GET_VAR 'this@Test4: Test4<T>' type=Test4<T> origin=null
     CONSTRUCTOR public constructor Test4<T>(x: kotlin.Int, y: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int = ...
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
index 7f0d690bbae..628a088a89e 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
@@ -1,6 +1,6 @@
 FILE /dataClassMembers.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test<T>(x: T, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: T
@@ -15,64 +15,64 @@ FILE /dataClassMembers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): T
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): T'
             GET_FIELD 'x: T' type=T origin=null
-              receiver: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+              receiver: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
     PROPERTY public final val y: kotlin.String
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.String
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): String'
             GET_FIELD 'y: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+              receiver: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): T
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1(): T'
           CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+            $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component2(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component2(): String'
           CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+            $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: T = ..., y: kotlin.String = ...): Test<T>
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       VALUE_PARAMETER value-parameter x: T = ...
         EXPRESSION_BODY
           CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+            $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
       VALUE_PARAMETER value-parameter y: kotlin.String = ...
         EXPRESSION_BODY
           CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+            $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='copy(T = ..., String = ...): Test<T>'
           CALL 'constructor Test(T, String = ...)' type=Test<T> origin=null
             x: GET_VAR 'value-parameter x: T = ...' type=T origin=null
             y: GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='toString(): String'
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value='Test('
             CONST String type=kotlin.String value='x='
             CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+              $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
             CONST String type=kotlin.String value=', '
             CONST String type=kotlin.String value='y='
             CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+              $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
             CONST String type=kotlin.String value=')'
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       BLOCK_BODY
         VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
           CONST Int type=kotlin.Int value='0'
@@ -80,7 +80,7 @@ FILE /dataClassMembers.kt
           BLOCK type=kotlin.Int origin=null
             VAR IR_TEMPORARY_VARIABLE val tmp1: T
               CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+                $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
             WHEN type=kotlin.Int origin=null
               BRANCH
                 if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -99,17 +99,17 @@ FILE /dataClassMembers.kt
               other: CONST Int type=kotlin.Int value='31'
             other: CALL 'hashCode(): Int' type=kotlin.Int origin=null
               $this: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+                $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
         RETURN type=kotlin.Nothing from='hashCode(): Int'
           GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<T>
       VALUE_PARAMETER value-parameter other: kotlin.Any?
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
           BRANCH
             if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
-              arg0: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+              arg0: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
               arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               CONST Boolean type=kotlin.Boolean value='true'
@@ -127,7 +127,7 @@ FILE /dataClassMembers.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+                  $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
                 arg1: CALL '<get-x>(): T' type=T origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test<T>' type=Test<T> origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
@@ -137,7 +137,7 @@ FILE /dataClassMembers.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: Test>' type=Test<T> origin=null
+                  $this: GET_VAR 'this@Test: Test<T>' type=Test<T> origin=null
                 arg1: CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: Test<T>' type=Test<T> origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
index 84846c8f96f..50a70c92126 100644
--- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
@@ -21,7 +21,7 @@ FILE /defaultPropertyAccessors.kt
         SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
   CLASS CLASS Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -31,33 +31,33 @@ FILE /defaultPropertyAccessors.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-testMember1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember1>(): Int'
             GET_FIELD 'testMember1: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Host>' type=Host origin=null
+              receiver: GET_VAR 'this@Host: Host' type=Host origin=null
     PROPERTY public final var testMember2: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var testMember2: kotlin.Int
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-testMember2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember2>(): Int'
             GET_FIELD 'testMember2: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Host>' type=Host origin=null
+              receiver: GET_VAR 'this@Host: Host' type=Host origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-testMember2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'testMember2: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: Host>' type=Host origin=null
+            receiver: GET_VAR 'this@Host: Host' type=Host origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS InPrimaryCtor
-    $new: VALUE_PARAMETER <receiver: InPrimaryCtor>
+    $new: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor InPrimaryCtor<T>(testInPrimaryCtor1: T, testInPrimaryCtor2: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter testInPrimaryCtor1: T
@@ -72,27 +72,27 @@ FILE /defaultPropertyAccessors.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter testInPrimaryCtor1: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-testInPrimaryCtor1>(): T
-        $this: VALUE_PARAMETER <receiver: InPrimaryCtor>
+        $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testInPrimaryCtor1>(): T'
             GET_FIELD 'testInPrimaryCtor1: T' type=T origin=null
-              receiver: GET_VAR '<receiver: InPrimaryCtor>' type=InPrimaryCtor<T> origin=null
+              receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor<T>' type=InPrimaryCtor<T> origin=null
     PROPERTY public final var testInPrimaryCtor2: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var testInPrimaryCtor2: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter testInPrimaryCtor2: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-testInPrimaryCtor2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: InPrimaryCtor>
+        $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testInPrimaryCtor2>(): Int'
             GET_FIELD 'testInPrimaryCtor2: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: InPrimaryCtor>' type=InPrimaryCtor<T> origin=null
+              receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor<T>' type=InPrimaryCtor<T> origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-testInPrimaryCtor2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: InPrimaryCtor>
+        $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'testInPrimaryCtor2: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: InPrimaryCtor>' type=InPrimaryCtor<T> origin=null
+            receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor<T>' type=InPrimaryCtor<T> origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
index 55d53bcfc94..75568a5ffb4 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
@@ -2,21 +2,21 @@ FILE /delegatedMembers.kt
   CLASS INTERFACE IBase
     TYPE_PARAMETER <T>
     FUN public abstract fun foo(x: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase<T>
       VALUE_PARAMETER value-parameter x: kotlin.Int
     PROPERTY public abstract val bar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IBase>
+        $this: VALUE_PARAMETER this@IBase: IBase<T>
     FUN public abstract fun <X> qux(t: T, x: X): kotlin.Unit
       TYPE_PARAMETER <X>
-      $this: VALUE_PARAMETER <receiver: IBase>
+      $this: VALUE_PARAMETER this@IBase: IBase<T>
       VALUE_PARAMETER value-parameter t: T
       VALUE_PARAMETER value-parameter x: X
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test<TT>
     TYPE_PARAMETER <TT>
     CONSTRUCTOR public constructor Test<TT>(impl: IBase<TT>)
       VALUE_PARAMETER value-parameter impl: IBase<TT>
@@ -28,32 +28,32 @@ FILE /delegatedMembers.kt
         GET_VAR 'value-parameter impl: IBase<TT>' type=IBase<TT> origin=null
     FUN DELEGATED_MEMBER public open override fun <X> qux(t: TT, x: X): kotlin.Unit
       TYPE_PARAMETER <X>
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<TT>
       VALUE_PARAMETER value-parameter t: TT
       VALUE_PARAMETER value-parameter x: X
       BLOCK_BODY
         CALL 'qux(TT, X): Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
-            receiver: GET_VAR '<receiver: Test>' type=Test<TT> origin=null
+            receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
           t: GET_VAR 'value-parameter t: TT' type=TT origin=null
           x: TYPE_OP type=X origin=IMPLICIT_CAST typeOperand=X
             GET_VAR 'value-parameter x: X' type=X origin=null
     FUN DELEGATED_MEMBER public open override fun foo(x: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Test>
+      $this: VALUE_PARAMETER this@Test: Test<TT>
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
         CALL 'foo(Int): Unit' type=kotlin.Unit origin=null
           $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
-            receiver: GET_VAR '<receiver: Test>' type=Test<TT> origin=null
+            receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
           x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
     PROPERTY DELEGATED_MEMBER public open override val bar: kotlin.Int
       FUN DELEGATED_MEMBER public open override fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test<TT>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CALL '<get-bar>(): Int' type=kotlin.Int origin=null
               $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
-                receiver: GET_VAR '<receiver: Test>' type=Test<TT> origin=null
+                receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/parameters/fun.txt b/compiler/testData/ir/irText/declarations/parameters/fun.txt
index 77e31a18f2a..72accf30c18 100644
--- a/compiler/testData/ir/irText/declarations/parameters/fun.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/fun.txt
@@ -16,26 +16,26 @@ FILE /fun.kt
     VALUE_PARAMETER value-parameter vararg args: kotlin.String
     BLOCK_BODY
   FUN public fun kotlin.String.textExt1(i: kotlin.Int, j: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: textExt1(Int, String) on String: Unit>
+    $receiver: VALUE_PARAMETER this@textExt1: String
     VALUE_PARAMETER value-parameter i: kotlin.Int
     VALUE_PARAMETER value-parameter j: kotlin.String
     BLOCK_BODY
   CLASS CLASS Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     FUN public final fun kotlin.String.testMembetExt1(i: kotlin.Int, j: kotlin.String): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Host>
-      $receiver: VALUE_PARAMETER <receiver: testMembetExt1(Int, String) on String: Unit>
+      $this: VALUE_PARAMETER this@Host: Host
+      $receiver: VALUE_PARAMETER this@testMembetExt1: String
       VALUE_PARAMETER value-parameter i: kotlin.Int
       VALUE_PARAMETER value-parameter j: kotlin.String
       BLOCK_BODY
     FUN public final fun <T> kotlin.String.testMembetExt2(i: kotlin.Int, j: T): kotlin.Unit
       TYPE_PARAMETER <T>
-      $this: VALUE_PARAMETER <receiver: Host>
-      $receiver: VALUE_PARAMETER <receiver: testMembetExt2(Int, T) on String: Unit>
+      $this: VALUE_PARAMETER this@Host: Host
+      $receiver: VALUE_PARAMETER this@testMembetExt2: String
       VALUE_PARAMETER value-parameter i: kotlin.Int
       VALUE_PARAMETER value-parameter j: T
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt
new file mode 100644
index 00000000000..9860890d26d
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt
@@ -0,0 +1,5 @@
+class Outer<T1> {
+    inner class Inner<T2> {
+        fun foo(x1: T1, x2: T2) {}
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
new file mode 100644
index 00000000000..836adc8a50f
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
@@ -0,0 +1,27 @@
+FILE /genericInnerClass.kt
+  CLASS CLASS Outer
+    $new: VALUE_PARAMETER this@Outer: Outer<T1>
+    TYPE_PARAMETER <T1>
+    CONSTRUCTOR public constructor Outer<T1>()
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
+    CLASS CLASS Inner
+      $new: VALUE_PARAMETER this@Inner: Inner<T2, T1>
+      TYPE_PARAMETER <T2>
+      CONSTRUCTOR public constructor Inner<T2>()
+        $outer: VALUE_PARAMETER this@Outer: Outer<T1>
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
+      FUN public final fun foo(x1: T1, x2: T2): kotlin.Unit
+        $this: VALUE_PARAMETER this@Inner: Inner<T2, T1>
+        VALUE_PARAMETER value-parameter x1: T1
+        VALUE_PARAMETER value-parameter x2: T2
+        BLOCK_BODY
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
index 71b779ab384..384228f466f 100644
--- a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
@@ -18,7 +18,7 @@ FILE /lambdas.kt
       EXPRESSION_BODY
         BLOCK type=kotlin.Any.(kotlin.Any) -> kotlin.Int origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun kotlin.Any.<anonymous>(it: kotlin.Any): kotlin.Int
-            $receiver: VALUE_PARAMETER <receiver: <anonymous>(Any) on Any: Int>
+            $receiver: VALUE_PARAMETER this@<anonymous>: Any
             VALUE_PARAMETER value-parameter it: kotlin.Any
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<anonymous>(Any) on Any: Int'
diff --git a/compiler/testData/ir/irText/declarations/parameters/localFun.txt b/compiler/testData/ir/irText/declarations/parameters/localFun.txt
index 40edb4fe986..e4f06b5b497 100644
--- a/compiler/testData/ir/irText/declarations/parameters/localFun.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/localFun.txt
@@ -19,7 +19,7 @@ FILE /localFun.kt
         VALUE_PARAMETER value-parameter vararg args: kotlin.String
         BLOCK_BODY
       FUN local final fun kotlin.String.textExt1(i: kotlin.Int, j: TT): kotlin.Unit
-        $receiver: VALUE_PARAMETER <receiver: textExt1(Int, TT) on String: Unit>
+        $receiver: VALUE_PARAMETER this@textExt1: String
         VALUE_PARAMETER value-parameter i: kotlin.Int
         VALUE_PARAMETER value-parameter j: TT
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
index 99d29eeccc8..854fb9a9cc7 100644
--- a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
@@ -14,38 +14,38 @@ FILE /propertyAccessors.kt
       BLOCK_BODY
   PROPERTY public val kotlin.String.testExt1: kotlin.Int
     FUN public fun kotlin.String.<get-testExt1>(): kotlin.Int
-      $receiver: VALUE_PARAMETER <receiver: testExt1: Int on String>
+      $receiver: VALUE_PARAMETER this@testExt1: String
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt1>() on String: Int'
           CONST Int type=kotlin.Int value='42'
   PROPERTY public var kotlin.String.testExt2: kotlin.Int
     FUN public fun kotlin.String.<get-testExt2>(): kotlin.Int
-      $receiver: VALUE_PARAMETER <receiver: testExt2: Int on String>
+      $receiver: VALUE_PARAMETER this@testExt2: String
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt2>() on String: Int'
           CONST Int type=kotlin.Int value='42'
     FUN public fun kotlin.String.<set-testExt2>(value: kotlin.Int): kotlin.Unit
-      $receiver: VALUE_PARAMETER <receiver: testExt2: Int on String>
+      $receiver: VALUE_PARAMETER this@testExt2: String
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
   PROPERTY public val <T> T.testExt3: kotlin.Int
     FUN public fun T.<get-testExt3>(): kotlin.Int
-      $receiver: VALUE_PARAMETER <receiver: testExt3: Int on T>
+      $receiver: VALUE_PARAMETER this@testExt3: T
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt3>() on T: Int'
           CONST Int type=kotlin.Int value='42'
   PROPERTY public var <T> T.testExt4: kotlin.Int
     FUN public fun T.<get-testExt4>(): kotlin.Int
-      $receiver: VALUE_PARAMETER <receiver: testExt4: Int on T>
+      $receiver: VALUE_PARAMETER this@testExt4: T
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testExt4>() on T: Int'
           CONST Int type=kotlin.Int value='42'
     FUN public fun T.<set-testExt4>(value: kotlin.Int): kotlin.Unit
-      $receiver: VALUE_PARAMETER <receiver: testExt4: Int on T>
+      $receiver: VALUE_PARAMETER this@testExt4: T
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
   CLASS CLASS Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Host<T>()
       BLOCK_BODY
@@ -53,56 +53,56 @@ FILE /propertyAccessors.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     PROPERTY public final val testMem1: kotlin.Int
       FUN public final fun <get-testMem1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMem1>(): Int'
             CONST Int type=kotlin.Int value='42'
     PROPERTY public final var testMem2: kotlin.Int
       FUN public final fun <get-testMem2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host<T>
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMem2>(): Int'
             CONST Int type=kotlin.Int value='42'
       FUN public final fun <set-testMem2>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host<T>
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     PROPERTY public final val kotlin.String.testMemExt1: kotlin.Int
       FUN public final fun kotlin.String.<get-testMemExt1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt1: Int on String>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt1: String
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMemExt1>() on String: Int'
             CONST Int type=kotlin.Int value='42'
     PROPERTY public final var kotlin.String.testMemExt2: kotlin.Int
       FUN public final fun kotlin.String.<get-testMemExt2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt2: Int on String>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt2: String
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMemExt2>() on String: Int'
             CONST Int type=kotlin.Int value='42'
       FUN public final fun kotlin.String.<set-testMemExt2>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt2: Int on String>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt2: String
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     PROPERTY public final val <TT> TT.testMemExt3: kotlin.Int
       FUN public final fun TT.<get-testMemExt3>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt3: Int on TT>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt3: TT
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMemExt3>() on TT: Int'
             CONST Int type=kotlin.Int value='42'
     PROPERTY public final var <TT> TT.testMemExt4: kotlin.Int
       FUN public final fun TT.<get-testMemExt4>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt4: Int on TT>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt4: TT
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMemExt4>() on TT: Int'
             CONST Int type=kotlin.Int value='42'
       FUN public final fun TT.<set-testMemExt4>(value: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: testMemExt4: Int on TT>
+        $this: VALUE_PARAMETER this@Host: Host<T>
+        $receiver: VALUE_PARAMETER this@testMemExt4: TT
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
index 46f29824a9f..6e719d972f6 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
@@ -1,6 +1,6 @@
 FILE /primaryCtorDefaultArguments.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER <receiver: Test>
+    $new: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR public constructor Test(x: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY
@@ -13,11 +13,11 @@ FILE /primaryCtorDefaultArguments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Test>
+        $this: VALUE_PARAMETER this@Test: Test
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Test>' type=Test origin=null
+              receiver: GET_VAR 'this@Test: Test' type=Test origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
index 73b3cef30ee..3ad666e58f7 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
@@ -1,6 +1,6 @@
 FILE /primaryCtorProperties.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(test1: kotlin.Int, test2: kotlin.Int)
       VALUE_PARAMETER value-parameter test1: kotlin.Int
       VALUE_PARAMETER value-parameter test2: kotlin.Int
@@ -12,27 +12,27 @@ FILE /primaryCtorProperties.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter test1: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test1>(): Int'
             GET_FIELD 'test1: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     PROPERTY public final var test2: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var test2: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter test2: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test2>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
             GET_FIELD 'test2: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-test2>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
index 27f7614ff71..121b2baa99e 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
@@ -1,6 +1,6 @@
 FILE /differentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER <receiver: MyClass>
+    $new: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -11,29 +11,29 @@ FILE /differentReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: MyClass>
+        $this: VALUE_PARAMETER this@MyClass: MyClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: MyClass>' type=MyClass origin=null
+              receiver: GET_VAR 'this@MyClass: MyClass' type=MyClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public operator fun MyClass.provideDelegate(host: kotlin.Any?, p: kotlin.Any): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: provideDelegate(Any?, Any) on MyClass: String>
+    $receiver: VALUE_PARAMETER this@provideDelegate: MyClass
     VALUE_PARAMETER value-parameter host: kotlin.Any?
     VALUE_PARAMETER value-parameter p: kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any) on MyClass: String'
         CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-          $this: GET_VAR '<receiver: provideDelegate(Any?, Any) on MyClass: String>' type=MyClass origin=null
+          $this: GET_VAR 'this@provideDelegate: MyClass' type=MyClass origin=null
   FUN public operator fun kotlin.String.getValue(receiver: kotlin.Any?, p: kotlin.Any): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: getValue(Any?, Any) on String: String>
+    $receiver: VALUE_PARAMETER this@getValue: String
     VALUE_PARAMETER value-parameter receiver: kotlin.Any?
     VALUE_PARAMETER value-parameter p: kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='getValue(Any?, Any) on String: String'
-        GET_VAR '<receiver: getValue(Any?, Any) on String: String>' type=kotlin.String origin=null
+        GET_VAR 'this@getValue: String' type=kotlin.String origin=null
   PROPERTY public val testO: kotlin.String
     FIELD DELEGATE val `testO$delegate`: kotlin.String
       EXPRESSION_BODY
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
index b8499649768..2e7ad896982 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
@@ -1,6 +1,6 @@
 FILE /local.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER <receiver: Delegate>
+    $new: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -11,24 +11,24 @@ FILE /local.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Delegate>
+        $this: VALUE_PARAMETER this@Delegate: Delegate
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+              receiver: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN public final operator fun getValue(thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Delegate>
+      $this: VALUE_PARAMETER this@Delegate: Delegate
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='getValue(Any?, Any?): String'
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+            $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER <receiver: DelegateProvider>
+    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -39,20 +39,20 @@ FILE /local.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: DelegateProvider>
+        $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              receiver: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN public final operator fun provideDelegate(thisRef: kotlin.Any?, property: kotlin.Any?): Delegate
-      $this: VALUE_PARAMETER <receiver: DelegateProvider>
+      $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any?): Delegate'
           CALL 'constructor Delegate(String)' type=Delegate origin=null
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
index c5a74043809..d0decc651ce 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
@@ -1,6 +1,6 @@
 FILE /localDifferentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER <receiver: MyClass>
+    $new: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -11,29 +11,29 @@ FILE /localDifferentReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: MyClass>
+        $this: VALUE_PARAMETER this@MyClass: MyClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: MyClass>' type=MyClass origin=null
+              receiver: GET_VAR 'this@MyClass: MyClass' type=MyClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public operator fun MyClass.provideDelegate(host: kotlin.Any?, p: kotlin.Any): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: provideDelegate(Any?, Any) on MyClass: String>
+    $receiver: VALUE_PARAMETER this@provideDelegate: MyClass
     VALUE_PARAMETER value-parameter host: kotlin.Any?
     VALUE_PARAMETER value-parameter p: kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any) on MyClass: String'
         CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-          $this: GET_VAR '<receiver: provideDelegate(Any?, Any) on MyClass: String>' type=MyClass origin=null
+          $this: GET_VAR 'this@provideDelegate: MyClass' type=MyClass origin=null
   FUN public operator fun kotlin.String.getValue(receiver: kotlin.Any?, p: kotlin.Any): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: getValue(Any?, Any) on String: String>
+    $receiver: VALUE_PARAMETER this@getValue: String
     VALUE_PARAMETER value-parameter receiver: kotlin.Any?
     VALUE_PARAMETER value-parameter p: kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='getValue(Any?, Any) on String: String'
-        GET_VAR '<receiver: getValue(Any?, Any) on String: String>' type=kotlin.String origin=null
+        GET_VAR 'this@getValue: String' type=kotlin.String origin=null
   FUN public fun box(): kotlin.String
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY val testO: kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
index a8b17b24977..240c0846e56 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
@@ -1,6 +1,6 @@
 FILE /member.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER <receiver: Delegate>
+    $new: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -11,24 +11,24 @@ FILE /member.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Delegate>
+        $this: VALUE_PARAMETER this@Delegate: Delegate
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+              receiver: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN public final operator fun getValue(thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Delegate>
+      $this: VALUE_PARAMETER this@Delegate: Delegate
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='getValue(Any?, Any?): String'
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+            $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER <receiver: DelegateProvider>
+    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -39,25 +39,25 @@ FILE /member.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: DelegateProvider>
+        $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              receiver: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN public final operator fun provideDelegate(thisRef: kotlin.Any?, property: kotlin.Any?): Delegate
-      $this: VALUE_PARAMETER <receiver: DelegateProvider>
+      $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any?): Delegate'
           CALL 'constructor Delegate(String)' type=Delegate origin=null
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -68,16 +68,16 @@ FILE /member.kt
           CALL 'provideDelegate(Any?, Any?): Delegate' type=Delegate origin=null
             $this: CALL 'constructor DelegateProvider(String)' type=DelegateProvider origin=null
               value: CONST String type=kotlin.String value='OK'
-            thisRef: GET_VAR '<receiver: Host>' type=Host origin=null
+            thisRef: GET_VAR 'this@Host: Host' type=Host origin=null
             property: PROPERTY_REFERENCE 'testMember: String' field=null getter='<get-testMember>(): String' setter=null type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-testMember>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-testMember>(): String'
             CALL 'getValue(Any?, Any?): String' type=kotlin.String origin=null
               $this: GET_FIELD '`testMember$delegate`: Delegate' type=Delegate origin=null
-                receiver: GET_VAR '<receiver: Host>' type=Host origin=null
-              thisRef: GET_VAR '<receiver: Host>' type=Host origin=null
+                receiver: GET_VAR 'this@Host: Host' type=Host origin=null
+              thisRef: GET_VAR 'this@Host: Host' type=Host origin=null
               property: PROPERTY_REFERENCE 'testMember: String' field=null getter='<get-testMember>(): String' setter=null type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
index 448c481883a..23c40e70c52 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
@@ -1,12 +1,12 @@
 FILE /memberExtension.kt
   CLASS OBJECT Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR private constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     CLASS CLASS StringDelegate
-      $new: VALUE_PARAMETER <receiver: StringDelegate>
+      $new: VALUE_PARAMETER this@StringDelegate: StringDelegate
       CONSTRUCTOR public constructor StringDelegate(s: kotlin.String)
         VALUE_PARAMETER value-parameter s: kotlin.String
         BLOCK_BODY
@@ -17,13 +17,13 @@ FILE /memberExtension.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter s: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-s>(): kotlin.String
-          $this: VALUE_PARAMETER <receiver: StringDelegate>
+          $this: VALUE_PARAMETER this@StringDelegate: StringDelegate
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-s>(): String'
               GET_FIELD 's: String' type=kotlin.String origin=null
-                receiver: GET_VAR '<receiver: StringDelegate>' type=Host.StringDelegate origin=null
+                receiver: GET_VAR 'this@StringDelegate: StringDelegate' type=Host.StringDelegate origin=null
       FUN public final operator fun getValue(receiver: kotlin.String, p: kotlin.Any): kotlin.String
-        $this: VALUE_PARAMETER <receiver: StringDelegate>
+        $this: VALUE_PARAMETER this@StringDelegate: StringDelegate
         VALUE_PARAMETER value-parameter receiver: kotlin.String
         VALUE_PARAMETER value-parameter p: kotlin.Any
         BLOCK_BODY
@@ -31,49 +31,49 @@ FILE /memberExtension.kt
             CALL 'plus(Any?): String' type=kotlin.String origin=PLUS
               $this: GET_VAR 'value-parameter receiver: String' type=kotlin.String origin=null
               other: CALL '<get-s>(): String' type=kotlin.String origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: StringDelegate>' type=Host.StringDelegate origin=null
+                $this: GET_VAR 'this@StringDelegate: StringDelegate' type=Host.StringDelegate origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     FUN public final operator fun kotlin.String.provideDelegate(host: kotlin.Any?, p: kotlin.Any): Host.StringDelegate
-      $this: VALUE_PARAMETER <receiver: Host>
-      $receiver: VALUE_PARAMETER <receiver: provideDelegate(Any?, Any) on String: Host.StringDelegate>
+      $this: VALUE_PARAMETER this@Host: Host
+      $receiver: VALUE_PARAMETER this@provideDelegate: String
       VALUE_PARAMETER value-parameter host: kotlin.Any?
       VALUE_PARAMETER value-parameter p: kotlin.Any
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any) on String: Host.StringDelegate'
           CALL 'constructor StringDelegate(String)' type=Host.StringDelegate origin=null
-            s: GET_VAR '<receiver: provideDelegate(Any?, Any) on String: Host.StringDelegate>' type=kotlin.String origin=null
+            s: GET_VAR 'this@provideDelegate: String' type=kotlin.String origin=null
     PROPERTY public final val kotlin.String.plusK: kotlin.String
       FIELD DELEGATE val `plusK$delegate`: Host.StringDelegate
         EXPRESSION_BODY
           CALL 'provideDelegate(Any?, Any) on String: Host.StringDelegate' type=Host.StringDelegate origin=null
-            $this: GET_VAR '<receiver: Host>' type=Host origin=null
+            $this: GET_VAR 'this@Host: Host' type=Host origin=null
             $receiver: CONST String type=kotlin.String value='K'
-            host: GET_VAR '<receiver: Host>' type=Host origin=null
+            host: GET_VAR 'this@Host: Host' type=Host origin=null
             p: PROPERTY_REFERENCE 'plusK: String on String' field=null getter='<get-plusK>() on String: String' setter=null type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       FUN DELEGATED_PROPERTY_ACCESSOR public final fun kotlin.String.<get-plusK>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Host>
-        $receiver: VALUE_PARAMETER <receiver: plusK: String on String>
+        $this: VALUE_PARAMETER this@Host: Host
+        $receiver: VALUE_PARAMETER this@plusK: String
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-plusK>() on String: String'
             CALL 'getValue(String, Any): String' type=kotlin.String origin=null
               $this: GET_FIELD '`plusK$delegate`: Host.StringDelegate' type=Host.StringDelegate origin=null
-                receiver: GET_VAR '<receiver: Host>' type=Host origin=null
-              receiver: GET_VAR '<receiver: plusK: String on String>' type=kotlin.String origin=null
+                receiver: GET_VAR 'this@Host: Host' type=Host origin=null
+              receiver: GET_VAR 'this@plusK: String' type=kotlin.String origin=null
               p: PROPERTY_REFERENCE 'plusK: String on String' field=null getter='<get-plusK>() on String: String' setter=null type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     PROPERTY public final val ok: kotlin.String
       FIELD PROPERTY_BACKING_FIELD public final val ok: kotlin.String
         EXPRESSION_BODY
           CALL '<get-plusK>() on String: String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Host>' type=Host origin=null
+            $this: GET_VAR 'this@Host: Host' type=Host origin=null
             $receiver: CONST String type=kotlin.String value='O'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-ok>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Host>
+        $this: VALUE_PARAMETER this@Host: Host
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-ok>(): String'
             GET_FIELD 'ok: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Host>' type=Host origin=null
+              receiver: GET_VAR 'this@Host: Host' type=Host origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
index 1ff77156deb..2a9af06996f 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
@@ -1,6 +1,6 @@
 FILE /topLevel.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER <receiver: Delegate>
+    $new: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -11,24 +11,24 @@ FILE /topLevel.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: Delegate>
+        $this: VALUE_PARAMETER this@Delegate: Delegate
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+              receiver: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN public final operator fun getValue(thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String
-      $this: VALUE_PARAMETER <receiver: Delegate>
+      $this: VALUE_PARAMETER this@Delegate: Delegate
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='getValue(Any?, Any?): String'
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: Delegate>' type=Delegate origin=null
+            $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER <receiver: DelegateProvider>
+    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -39,20 +39,20 @@ FILE /topLevel.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.String
-        $this: VALUE_PARAMETER <receiver: DelegateProvider>
+        $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): String'
             GET_FIELD 'value: String' type=kotlin.String origin=null
-              receiver: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              receiver: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN public final operator fun provideDelegate(thisRef: kotlin.Any?, property: kotlin.Any?): Delegate
-      $this: VALUE_PARAMETER <receiver: DelegateProvider>
+      $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.Any?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any?): Delegate'
           CALL 'constructor Delegate(String)' type=Delegate origin=null
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: DelegateProvider>' type=DelegateProvider origin=null
+              $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/declarations/typeAlias.txt b/compiler/testData/ir/irText/declarations/typeAlias.txt
index 6bd85e536e4..863e0ef8bf0 100644
--- a/compiler/testData/ir/irText/declarations/typeAlias.txt
+++ b/compiler/testData/ir/irText/declarations/typeAlias.txt
@@ -4,7 +4,7 @@ FILE /typeAlias.kt
     BLOCK_BODY
       TYPEALIAS typealias TestLocal = String type=kotlin.String
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
index 75a7fccb0ae..209c2441b7a 100644
--- a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
+++ b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
@@ -1,18 +1,18 @@
 FILE /suppressedNonPublicCall.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='C'
     FUN internal final fun bar(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public inline fun C.foo(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: foo() on C: Unit>
+    $receiver: VALUE_PARAMETER this@foo: C
     BLOCK_BODY
       CALL 'bar(): Unit' type=kotlin.Unit origin=null
-        $this: GET_VAR '<receiver: foo() on C: Unit>' type=C origin=null
+        $this: GET_VAR 'this@foo: C' type=C origin=null
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
index 858ad74e063..04146bce23c 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
@@ -12,7 +12,7 @@ FILE /arrayAugmentedAssignment1.kt
       RETURN type=kotlin.Nothing from='bar(): Int'
         CONST Int type=kotlin.Int value='42'
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.IntArray)
       VALUE_PARAMETER value-parameter x: kotlin.IntArray
       BLOCK_BODY
@@ -23,11 +23,11 @@ FILE /arrayAugmentedAssignment1.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: IntArray' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.IntArray
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): IntArray'
             GET_FIELD 'x: IntArray' type=kotlin.IntArray origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
index 42ba0e69b61..15885b3f722 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
@@ -1,22 +1,22 @@
 FILE /arrayAugmentedAssignment2.kt
   CLASS INTERFACE IA
     FUN public abstract operator fun get(index: kotlin.String): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IA>
+      $this: VALUE_PARAMETER this@IA: IA
       VALUE_PARAMETER value-parameter index: kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IB
     FUN public abstract operator fun IA.set(index: kotlin.String, value: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: IB>
-      $receiver: VALUE_PARAMETER <receiver: set(String, Int) on IA: Unit>
+      $this: VALUE_PARAMETER this@IB: IB
+      $receiver: VALUE_PARAMETER this@set: IA
       VALUE_PARAMETER value-parameter index: kotlin.String
       VALUE_PARAMETER value-parameter value: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun IB.test(a: IA): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test(IA) on IB: Unit>
+    $receiver: VALUE_PARAMETER this@test: IB
     VALUE_PARAMETER value-parameter a: IA
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=PLUSEQ
@@ -25,7 +25,7 @@ FILE /arrayAugmentedAssignment2.kt
         VAR IR_TEMPORARY_VARIABLE val tmp1_index0: kotlin.String
           CONST String type=kotlin.String value=''
         CALL 'set(String, Int) on IA: Unit' type=kotlin.Unit origin=PLUSEQ
-          $this: GET_VAR '<receiver: test(IA) on IB: Unit>' type=IB origin=null
+          $this: GET_VAR 'this@test: IB' type=IB origin=null
           $receiver: GET_VAR 'tmp0_array: IA' type=IA origin=null
           index: GET_VAR 'tmp1_index0: String' type=kotlin.String origin=null
           value: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ
diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt
index 8b63deda760..540ea5e52be 100644
--- a/compiler/testData/ir/irText/expressions/assignments.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.txt
@@ -1,6 +1,6 @@
 FILE /assignments.kt
   CLASS CLASS Ref
-    $new: VALUE_PARAMETER <receiver: Ref>
+    $new: VALUE_PARAMETER this@Ref: Ref
     CONSTRUCTOR public constructor Ref(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -11,17 +11,17 @@ FILE /assignments.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Ref>
+        $this: VALUE_PARAMETER this@Ref: Ref
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Ref>' type=Ref origin=null
+              receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Ref>
+        $this: VALUE_PARAMETER this@Ref: Ref
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: Ref>' type=Ref origin=null
+            receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
index 3315e19fef8..46421721e5b 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
@@ -1,6 +1,6 @@
 FILE /augmentedAssignment2.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,23 +9,23 @@ FILE /augmentedAssignment2.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public operator fun A.plusAssign(s: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: plusAssign(String) on A: Unit>
+    $receiver: VALUE_PARAMETER this@plusAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
     BLOCK_BODY
   FUN public operator fun A.minusAssign(s: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: minusAssign(String) on A: Unit>
+    $receiver: VALUE_PARAMETER this@minusAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
     BLOCK_BODY
   FUN public operator fun A.timesAssign(s: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: timesAssign(String) on A: Unit>
+    $receiver: VALUE_PARAMETER this@timesAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
     BLOCK_BODY
   FUN public operator fun A.divAssign(s: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: divAssign(String) on A: Unit>
+    $receiver: VALUE_PARAMETER this@divAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
     BLOCK_BODY
   FUN public operator fun A.modAssign(s: kotlin.String): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: modAssign(String) on A: Unit>
+    $receiver: VALUE_PARAMETER this@modAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
     BLOCK_BODY
   PROPERTY public val p: A
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
index 377a1ef84ea..35e958c6c64 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
@@ -1,19 +1,19 @@
 FILE /augmentedAssignmentWithExpression.kt
   CLASS CLASS Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     FUN public final operator fun plusAssign(x: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Host>
+      $this: VALUE_PARAMETER this@Host: Host
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
     FUN public final fun test1(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Host>
+      $this: VALUE_PARAMETER this@Host: Host
       BLOCK_BODY
         CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-          $this: GET_VAR '<receiver: Host>' type=Host origin=PLUSEQ
+          $this: GET_VAR 'this@Host: Host' type=Host origin=PLUSEQ
           x: CONST Int type=kotlin.Int value='1'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -23,10 +23,10 @@ FILE /augmentedAssignmentWithExpression.kt
       RETURN type=kotlin.Nothing from='foo(): Host'
         CALL 'constructor Host()' type=Host origin=null
   FUN public fun Host.test2(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test2() on Host: Unit>
+    $receiver: VALUE_PARAMETER this@test2: Host
     BLOCK_BODY
       CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-        $this: GET_VAR '<receiver: test2() on Host: Unit>' type=Host origin=PLUSEQ
+        $this: GET_VAR 'this@test2: Host' type=Host origin=PLUSEQ
         x: CONST Int type=kotlin.Int value='1'
   FUN public fun test3(): kotlin.Unit
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
index 6ccb2ed776c..e6b610eb49c 100644
--- a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
+++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
@@ -1,28 +1,28 @@
 FILE /boundCallableReferences.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN public final fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
     PROPERTY public final val bar: kotlin.Int = 0
       FIELD PROPERTY_BACKING_FIELD public final val bar: kotlin.Int = 0
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             GET_FIELD 'bar: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun A.qux(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: qux() on A: Unit>
+    $receiver: VALUE_PARAMETER this@qux: A
     BLOCK_BODY
   PROPERTY public val test1: kotlin.reflect.KFunction0<kotlin.Unit>
     FIELD PROPERTY_BACKING_FIELD public val test1: kotlin.reflect.KFunction0<kotlin.Unit>
diff --git a/compiler/testData/ir/irText/expressions/calls.txt b/compiler/testData/ir/irText/expressions/calls.txt
index 6df64196b27..045f27e1e0e 100644
--- a/compiler/testData/ir/irText/expressions/calls.txt
+++ b/compiler/testData/ir/irText/expressions/calls.txt
@@ -22,24 +22,24 @@ FILE /calls.kt
             y: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
           y: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
   FUN public fun kotlin.Int.ext1(): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: ext1() on Int: Int>
+    $receiver: VALUE_PARAMETER this@ext1: Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='ext1() on Int: Int'
-        GET_VAR '<receiver: ext1() on Int: Int>' type=kotlin.Int origin=null
+        GET_VAR 'this@ext1: Int' type=kotlin.Int origin=null
   FUN public fun kotlin.Int.ext2(x: kotlin.Int): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: ext2(Int) on Int: Int>
+    $receiver: VALUE_PARAMETER this@ext2: Int
     VALUE_PARAMETER value-parameter x: kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='ext2(Int) on Int: Int'
         CALL 'foo(Int, Int): Int' type=kotlin.Int origin=null
-          x: GET_VAR '<receiver: ext2(Int) on Int: Int>' type=kotlin.Int origin=null
+          x: GET_VAR 'this@ext2: Int' type=kotlin.Int origin=null
           y: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
   FUN public fun kotlin.Int.ext3(x: kotlin.Int): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: ext3(Int) on Int: Int>
+    $receiver: VALUE_PARAMETER this@ext3: Int
     VALUE_PARAMETER value-parameter x: kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='ext3(Int) on Int: Int'
         CALL 'foo(Int, Int): Int' type=kotlin.Int origin=null
           x: CALL 'ext1() on Int: Int' type=kotlin.Int origin=null
-            $receiver: GET_VAR '<receiver: ext3(Int) on Int: Int>' type=kotlin.Int origin=null
+            $receiver: GET_VAR 'this@ext3: Int' type=kotlin.Int origin=null
           y: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
index 21066216ea3..4c67baef437 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
@@ -1,20 +1,20 @@
 FILE /chainOfSafeCalls.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='C'
     FUN public final fun foo(): C
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='foo(): C'
-          GET_VAR '<receiver: C>' type=C origin=null
+          GET_VAR 'this@C: C' type=C origin=null
     FUN public final fun bar(): C?
-      $this: VALUE_PARAMETER <receiver: C>
+      $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='bar(): C?'
-          GET_VAR '<receiver: C>' type=C origin=null
+          GET_VAR 'this@C: C' type=C origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/expressions/classReference.txt b/compiler/testData/ir/irText/expressions/classReference.txt
index 0843b8ee9a4..33fc870a3d7 100644
--- a/compiler/testData/ir/irText/expressions/classReference.txt
+++ b/compiler/testData/ir/irText/expressions/classReference.txt
@@ -1,6 +1,6 @@
 FILE /classReference.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
index 36099f901b6..1725c31606f 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
@@ -1,6 +1,6 @@
 FILE /complexAugmentedAssignment.kt
   CLASS OBJECT X1
-    $new: VALUE_PARAMETER <receiver: X1>
+    $new: VALUE_PARAMETER this@X1: X1
     CONSTRUCTOR private constructor X1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,20 +10,20 @@ FILE /complexAugmentedAssignment.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x1>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: X1>
+        $this: VALUE_PARAMETER this@X1: X1
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x1>(): Int'
             GET_FIELD 'x1: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: X1>' type=X1 origin=null
+              receiver: GET_VAR 'this@X1: X1' type=X1 origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x1>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: X1>
+        $this: VALUE_PARAMETER this@X1: X1
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x1: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: X1>' type=X1 origin=null
+            receiver: GET_VAR 'this@X1: X1' type=X1 origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     CLASS OBJECT X2
-      $new: VALUE_PARAMETER <receiver: X2>
+      $new: VALUE_PARAMETER this@X2: X2
       CONSTRUCTOR private constructor X2()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -33,20 +33,20 @@ FILE /complexAugmentedAssignment.kt
           EXPRESSION_BODY
             CONST Int type=kotlin.Int value='0'
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x2>(): kotlin.Int
-          $this: VALUE_PARAMETER <receiver: X2>
+          $this: VALUE_PARAMETER this@X2: X2
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x2>(): Int'
               GET_FIELD 'x2: Int' type=kotlin.Int origin=null
-                receiver: GET_VAR '<receiver: X2>' type=X1.X2 origin=null
+                receiver: GET_VAR 'this@X2: X2' type=X1.X2 origin=null
         FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x2>(<set-?>: kotlin.Int): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: X2>
+          $this: VALUE_PARAMETER this@X2: X2
           VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
           BLOCK_BODY
             SET_FIELD 'x2: Int' type=kotlin.Unit origin=null
-              receiver: GET_VAR '<receiver: X2>' type=X1.X2 origin=null
+              receiver: GET_VAR 'this@X2: X2' type=X1.X2 origin=null
               value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
       CLASS OBJECT X3
-        $new: VALUE_PARAMETER <receiver: X3>
+        $new: VALUE_PARAMETER this@X3: X3
         CONSTRUCTOR private constructor X3()
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -56,17 +56,17 @@ FILE /complexAugmentedAssignment.kt
             EXPRESSION_BODY
               CONST Int type=kotlin.Int value='0'
           FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x3>(): kotlin.Int
-            $this: VALUE_PARAMETER <receiver: X3>
+            $this: VALUE_PARAMETER this@X3: X3
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-x3>(): Int'
                 GET_FIELD 'x3: Int' type=kotlin.Int origin=null
-                  receiver: GET_VAR '<receiver: X3>' type=X1.X2.X3 origin=null
+                  receiver: GET_VAR 'this@X3: X3' type=X1.X2.X3 origin=null
           FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x3>(<set-?>: kotlin.Int): kotlin.Unit
-            $this: VALUE_PARAMETER <receiver: X3>
+            $this: VALUE_PARAMETER this@X3: X3
             VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
             BLOCK_BODY
               SET_FIELD 'x3: Int' type=kotlin.Unit origin=null
-                receiver: GET_VAR '<receiver: X3>' type=X1.X2.X3 origin=null
+                receiver: GET_VAR 'this@X3: X3' type=X1.X2.X3 origin=null
                 value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -146,7 +146,7 @@ FILE /complexAugmentedAssignment.kt
                 $this: GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
             GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
   CLASS CLASS B
-    $new: VALUE_PARAMETER <receiver: B>
+    $new: VALUE_PARAMETER this@B: B
     CONSTRUCTOR public constructor B(s: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter s: kotlin.Int = ...
         EXPRESSION_BODY
@@ -159,35 +159,35 @@ FILE /complexAugmentedAssignment.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter s: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-s>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: B>
+        $this: VALUE_PARAMETER this@B: B
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-s>(): Int'
             GET_FIELD 's: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: B>' type=B origin=null
+              receiver: GET_VAR 'this@B: B' type=B origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-s>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: B>
+        $this: VALUE_PARAMETER this@B: B
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 's: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: B>' type=B origin=null
+            receiver: GET_VAR 'this@B: B' type=B origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT Host
-    $new: VALUE_PARAMETER <receiver: Host>
+    $new: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR private constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     FUN public final operator fun B.plusAssign(b: B): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Host>
-      $receiver: VALUE_PARAMETER <receiver: plusAssign(B) on B: Unit>
+      $this: VALUE_PARAMETER this@Host: Host
+      $receiver: VALUE_PARAMETER this@plusAssign: B
       VALUE_PARAMETER value-parameter b: B
       BLOCK_BODY
         BLOCK type=kotlin.Unit origin=PLUSEQ
           VAR IR_TEMPORARY_VARIABLE val tmp0_this: B
-            GET_VAR '<receiver: plusAssign(B) on B: Unit>' type=B origin=null
+            GET_VAR 'this@plusAssign: B' type=B origin=null
           CALL '<set-s>(Int): Unit' type=kotlin.Unit origin=PLUSEQ
             $this: GET_VAR 'tmp0_this: B' type=B origin=null
             <set-?>: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ
@@ -199,11 +199,11 @@ FILE /complexAugmentedAssignment.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun Host.test3(v: B): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test3(B) on Host: Unit>
+    $receiver: VALUE_PARAMETER this@test3: Host
     VALUE_PARAMETER value-parameter v: B
     BLOCK_BODY
       CALL 'plusAssign(B) on B: Unit' type=kotlin.Unit origin=PLUSEQ
-        $this: GET_VAR '<receiver: test3(B) on Host: Unit>' type=Host origin=null
+        $this: GET_VAR 'this@test3: Host' type=Host origin=null
         $receiver: GET_VAR 'value-parameter v: B' type=B origin=PLUSEQ
         b: CALL 'constructor B(Int = ...)' type=B origin=null
           s: CONST Int type=kotlin.Int value='1000'
diff --git a/compiler/testData/ir/irText/expressions/contructorCall.txt b/compiler/testData/ir/irText/expressions/contructorCall.txt
index 700abb94265..2afe3f38c5d 100644
--- a/compiler/testData/ir/irText/expressions/contructorCall.txt
+++ b/compiler/testData/ir/irText/expressions/contructorCall.txt
@@ -1,6 +1,6 @@
 FILE /contructorCall.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.txt
index 691595eb624..ce080d5481f 100644
--- a/compiler/testData/ir/irText/expressions/conventionComparisons.txt
+++ b/compiler/testData/ir/irText/expressions/conventionComparisons.txt
@@ -5,53 +5,53 @@ FILE /conventionComparisons.kt
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IB
     FUN public abstract operator fun IA.compareTo(other: IA): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IB>
-      $receiver: VALUE_PARAMETER <receiver: compareTo(IA) on IA: Int>
+      $this: VALUE_PARAMETER this@IB: IB
+      $receiver: VALUE_PARAMETER this@compareTo: IA
       VALUE_PARAMETER value-parameter other: IA
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun IB.test1(a1: IA, a2: IA): kotlin.Boolean
-    $receiver: VALUE_PARAMETER <receiver: test1(IA, IA) on IB: Boolean>
+    $receiver: VALUE_PARAMETER this@test1: IB
     VALUE_PARAMETER value-parameter a1: IA
     VALUE_PARAMETER value-parameter a2: IA
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test1(IA, IA) on IB: Boolean'
         CALL 'GT0(Int): Boolean' type=kotlin.Boolean origin=GT
           arg0: CALL 'compareTo(IA) on IA: Int' type=kotlin.Int origin=GT
-            $this: GET_VAR '<receiver: test1(IA, IA) on IB: Boolean>' type=IB origin=null
+            $this: GET_VAR 'this@test1: IB' type=IB origin=null
             $receiver: GET_VAR 'value-parameter a1: IA' type=IA origin=null
             other: GET_VAR 'value-parameter a2: IA' type=IA origin=null
   FUN public fun IB.test2(a1: IA, a2: IA): kotlin.Boolean
-    $receiver: VALUE_PARAMETER <receiver: test2(IA, IA) on IB: Boolean>
+    $receiver: VALUE_PARAMETER this@test2: IB
     VALUE_PARAMETER value-parameter a1: IA
     VALUE_PARAMETER value-parameter a2: IA
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test2(IA, IA) on IB: Boolean'
         CALL 'GTEQ0(Int): Boolean' type=kotlin.Boolean origin=GTEQ
           arg0: CALL 'compareTo(IA) on IA: Int' type=kotlin.Int origin=GTEQ
-            $this: GET_VAR '<receiver: test2(IA, IA) on IB: Boolean>' type=IB origin=null
+            $this: GET_VAR 'this@test2: IB' type=IB origin=null
             $receiver: GET_VAR 'value-parameter a1: IA' type=IA origin=null
             other: GET_VAR 'value-parameter a2: IA' type=IA origin=null
   FUN public fun IB.test3(a1: IA, a2: IA): kotlin.Boolean
-    $receiver: VALUE_PARAMETER <receiver: test3(IA, IA) on IB: Boolean>
+    $receiver: VALUE_PARAMETER this@test3: IB
     VALUE_PARAMETER value-parameter a1: IA
     VALUE_PARAMETER value-parameter a2: IA
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test3(IA, IA) on IB: Boolean'
         CALL 'LT0(Int): Boolean' type=kotlin.Boolean origin=LT
           arg0: CALL 'compareTo(IA) on IA: Int' type=kotlin.Int origin=LT
-            $this: GET_VAR '<receiver: test3(IA, IA) on IB: Boolean>' type=IB origin=null
+            $this: GET_VAR 'this@test3: IB' type=IB origin=null
             $receiver: GET_VAR 'value-parameter a1: IA' type=IA origin=null
             other: GET_VAR 'value-parameter a2: IA' type=IA origin=null
   FUN public fun IB.test4(a1: IA, a2: IA): kotlin.Boolean
-    $receiver: VALUE_PARAMETER <receiver: test4(IA, IA) on IB: Boolean>
+    $receiver: VALUE_PARAMETER this@test4: IB
     VALUE_PARAMETER value-parameter a1: IA
     VALUE_PARAMETER value-parameter a2: IA
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test4(IA, IA) on IB: Boolean'
         CALL 'LTEQ0(Int): Boolean' type=kotlin.Boolean origin=LTEQ
           arg0: CALL 'compareTo(IA) on IA: Int' type=kotlin.Int origin=LTEQ
-            $this: GET_VAR '<receiver: test4(IA, IA) on IB: Boolean>' type=IB origin=null
+            $this: GET_VAR 'this@test4: IB' type=IB origin=null
             $receiver: GET_VAR 'value-parameter a1: IA' type=IA origin=null
             other: GET_VAR 'value-parameter a2: IA' type=IA origin=null
diff --git a/compiler/testData/ir/irText/expressions/destructuring1.txt b/compiler/testData/ir/irText/expressions/destructuring1.txt
index dd14766f166..4d7223e0c3f 100644
--- a/compiler/testData/ir/irText/expressions/destructuring1.txt
+++ b/compiler/testData/ir/irText/expressions/destructuring1.txt
@@ -1,6 +1,6 @@
 FILE /destructuring1.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,20 +9,20 @@ FILE /destructuring1.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT B
-    $new: VALUE_PARAMETER <receiver: B>
+    $new: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='B'
     FUN public final operator fun A.component1(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: B>
-      $receiver: VALUE_PARAMETER <receiver: component1() on A: Int>
+      $this: VALUE_PARAMETER this@B: B
+      $receiver: VALUE_PARAMETER this@component1: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1() on A: Int'
           CONST Int type=kotlin.Int value='1'
     FUN public final operator fun A.component2(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: B>
-      $receiver: VALUE_PARAMETER <receiver: component2() on A: Int>
+      $this: VALUE_PARAMETER this@B: B
+      $receiver: VALUE_PARAMETER this@component2: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component2() on A: Int'
           CONST Int type=kotlin.Int value='2'
@@ -30,16 +30,16 @@ FILE /destructuring1.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun B.test(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test() on B: Unit>
+    $receiver: VALUE_PARAMETER this@test: B
     BLOCK_BODY
       COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION
         VAR IR_TEMPORARY_VARIABLE val tmp0_container: A
           GET_OBJECT 'A' type=A
         VAR val x: kotlin.Int
           CALL 'component1() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=1)
-            $this: GET_VAR '<receiver: test() on B: Unit>' type=B origin=null
+            $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
         VAR val y: kotlin.Int
           CALL 'component2() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=2)
-            $this: GET_VAR '<receiver: test() on B: Unit>' type=B origin=null
+            $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
diff --git a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
index 963f12951c5..15802dc7c97 100644
--- a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
+++ b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
@@ -1,6 +1,6 @@
 FILE /destructuringWithUnderscore.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,26 +9,26 @@ FILE /destructuringWithUnderscore.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT B
-    $new: VALUE_PARAMETER <receiver: B>
+    $new: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='B'
     FUN public final operator fun A.component1(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: B>
-      $receiver: VALUE_PARAMETER <receiver: component1() on A: Int>
+      $this: VALUE_PARAMETER this@B: B
+      $receiver: VALUE_PARAMETER this@component1: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1() on A: Int'
           CONST Int type=kotlin.Int value='1'
     FUN public final operator fun A.component2(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: B>
-      $receiver: VALUE_PARAMETER <receiver: component2() on A: Int>
+      $this: VALUE_PARAMETER this@B: B
+      $receiver: VALUE_PARAMETER this@component2: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component2() on A: Int'
           CONST Int type=kotlin.Int value='2'
     FUN public final operator fun A.component3(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: B>
-      $receiver: VALUE_PARAMETER <receiver: component3() on A: Int>
+      $this: VALUE_PARAMETER this@B: B
+      $receiver: VALUE_PARAMETER this@component3: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component3() on A: Int'
           CONST Int type=kotlin.Int value='3'
@@ -36,16 +36,16 @@ FILE /destructuringWithUnderscore.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun B.test(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test() on B: Unit>
+    $receiver: VALUE_PARAMETER this@test: B
     BLOCK_BODY
       COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION
         VAR IR_TEMPORARY_VARIABLE val tmp0_container: A
           GET_OBJECT 'A' type=A
         VAR val x: kotlin.Int
           CALL 'component1() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=1)
-            $this: GET_VAR '<receiver: test() on B: Unit>' type=B origin=null
+            $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
         VAR val z: kotlin.Int
           CALL 'component3() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=3)
-            $this: GET_VAR '<receiver: test() on B: Unit>' type=B origin=null
+            $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
index 58356a7bb11..bff9012c1d1 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
@@ -1,6 +1,6 @@
 FILE /enumEntryAsReceiver.kt
   CLASS ENUM_CLASS X
-    $new: VALUE_PARAMETER <receiver: X>
+    $new: VALUE_PARAMETER this@X: X
     CONSTRUCTOR private constructor X()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -8,7 +8,7 @@ FILE /enumEntryAsReceiver.kt
     ENUM_ENTRY enum entry B
       init: ENUM_CONSTRUCTOR_CALL 'constructor B()'
       class: CLASS ENUM_ENTRY B
-        $new: VALUE_PARAMETER <receiver: B>
+        $new: VALUE_PARAMETER this@B: B
         CONSTRUCTOR private constructor B()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor X()'
@@ -18,11 +18,11 @@ FILE /enumEntryAsReceiver.kt
             EXPRESSION_BODY
               CONST String type=kotlin.String value='OK'
           FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value2>(): kotlin.String
-            $this: VALUE_PARAMETER <receiver: B>
+            $this: VALUE_PARAMETER this@B: B
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-value2>(): String'
                 GET_FIELD 'value2: String' type=kotlin.String origin=null
-                  receiver: GET_VAR '<receiver: B>' type=X.B origin=null
+                  receiver: GET_VAR 'this@B: B' type=X.B origin=null
         PROPERTY public open override val value: () -> kotlin.String
           FIELD PROPERTY_BACKING_FIELD public open override val value: () -> kotlin.String
             EXPRESSION_BODY
@@ -34,11 +34,11 @@ FILE /enumEntryAsReceiver.kt
                         $this: GET_ENUM 'B' type=X.B
                 FUNCTION_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
           FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-value>(): () -> kotlin.String
-            $this: VALUE_PARAMETER <receiver: B>
+            $this: VALUE_PARAMETER this@B: B
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<get-value>(): () -> String'
                 GET_FIELD 'value: () -> String' type=() -> kotlin.String origin=null
-                  receiver: GET_VAR '<receiver: B>' type=X.B origin=null
+                  receiver: GET_VAR 'this@B: B' type=X.B origin=null
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
@@ -52,7 +52,7 @@ FILE /enumEntryAsReceiver.kt
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     PROPERTY public abstract val value: () -> kotlin.String
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-value>(): () -> kotlin.String
-        $this: VALUE_PARAMETER <receiver: X>
+        $this: VALUE_PARAMETER this@X: X
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
index cb641fef80d..8fb961061dd 100644
--- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
+++ b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
@@ -1,13 +1,13 @@
 FILE /extensionPropertyGetterCall.kt
   PROPERTY public val kotlin.String.okext: kotlin.String
     FUN public fun kotlin.String.<get-okext>(): kotlin.String
-      $receiver: VALUE_PARAMETER <receiver: okext: String on String>
+      $receiver: VALUE_PARAMETER this@okext: String
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-okext>() on String: String'
           CONST String type=kotlin.String value='OK'
   FUN public fun kotlin.String.test5(): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: test5() on String: String>
+    $receiver: VALUE_PARAMETER this@test5: String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test5() on String: String'
         CALL '<get-okext>() on String: String' type=kotlin.String origin=GET_PROPERTY
-          $receiver: GET_VAR '<receiver: test5() on String: String>' type=kotlin.String origin=null
+          $receiver: GET_VAR 'this@test5: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
index 99617854eb7..025420e703e 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
@@ -1,6 +1,6 @@
 FILE /forWithImplicitReceivers.kt
   CLASS OBJECT FiveTimes
-    $new: VALUE_PARAMETER <receiver: FiveTimes>
+    $new: VALUE_PARAMETER this@FiveTimes: FiveTimes
     CONSTRUCTOR private constructor FiveTimes()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /forWithImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS IntCell
-    $new: VALUE_PARAMETER <receiver: IntCell>
+    $new: VALUE_PARAMETER this@IntCell: IntCell
     CONSTRUCTOR public constructor IntCell(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
@@ -20,47 +20,47 @@ FILE /forWithImplicitReceivers.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IntCell>
+        $this: VALUE_PARAMETER this@IntCell: IntCell
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: IntCell>' type=IntCell origin=null
+              receiver: GET_VAR 'this@IntCell: IntCell' type=IntCell origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-value>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: IntCell>
+        $this: VALUE_PARAMETER this@IntCell: IntCell
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'value: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: IntCell>' type=IntCell origin=null
+            receiver: GET_VAR 'this@IntCell: IntCell' type=IntCell origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IReceiver
     FUN public open operator fun FiveTimes.iterator(): IntCell
-      $this: VALUE_PARAMETER <receiver: IReceiver>
-      $receiver: VALUE_PARAMETER <receiver: iterator() on FiveTimes: IntCell>
+      $this: VALUE_PARAMETER this@IReceiver: IReceiver
+      $receiver: VALUE_PARAMETER this@iterator: FiveTimes
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='iterator() on FiveTimes: IntCell'
           CALL 'constructor IntCell(Int)' type=IntCell origin=null
             value: CONST Int type=kotlin.Int value='5'
     FUN public open operator fun IntCell.hasNext(): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: IReceiver>
-      $receiver: VALUE_PARAMETER <receiver: hasNext() on IntCell: Boolean>
+      $this: VALUE_PARAMETER this@IReceiver: IReceiver
+      $receiver: VALUE_PARAMETER this@hasNext: IntCell
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='hasNext() on IntCell: Boolean'
           CALL 'GT0(Int): Boolean' type=kotlin.Boolean origin=GT
             arg0: CALL 'compareTo(Int): Int' type=kotlin.Int origin=GT
               $this: CALL '<get-value>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: hasNext() on IntCell: Boolean>' type=IntCell origin=null
+                $this: GET_VAR 'this@hasNext: IntCell' type=IntCell origin=null
               other: CONST Int type=kotlin.Int value='0'
     FUN public open operator fun IntCell.next(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IReceiver>
-      $receiver: VALUE_PARAMETER <receiver: next() on IntCell: Int>
+      $this: VALUE_PARAMETER this@IReceiver: IReceiver
+      $receiver: VALUE_PARAMETER this@next: IntCell
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='next() on IntCell: Int'
           BLOCK type=kotlin.Int origin=POSTFIX_DECR
             VAR IR_TEMPORARY_VARIABLE val tmp0_this: IntCell
-              GET_VAR '<receiver: next() on IntCell: Int>' type=IntCell origin=null
+              GET_VAR 'this@next: IntCell' type=IntCell origin=null
             BLOCK type=kotlin.Int origin=POSTFIX_DECR
               VAR IR_TEMPORARY_VARIABLE val tmp1: kotlin.Int
                 CALL '<get-value>(): Int' type=kotlin.Int origin=POSTFIX_DECR
@@ -74,21 +74,21 @@ FILE /forWithImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public fun IReceiver.test(): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: test() on IReceiver: Unit>
+    $receiver: VALUE_PARAMETER this@test: IReceiver
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR IR_TEMPORARY_VARIABLE val tmp0_iterator: IntCell
           CALL 'iterator() on FiveTimes: IntCell' type=IntCell origin=FOR_LOOP_ITERATOR
-            $this: GET_VAR '<receiver: test() on IReceiver: Unit>' type=IReceiver origin=null
+            $this: GET_VAR 'this@test: IReceiver' type=IReceiver origin=null
             $receiver: GET_OBJECT 'FiveTimes' type=FiveTimes
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext() on IntCell: Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
-            $this: GET_VAR '<receiver: test() on IReceiver: Unit>' type=IReceiver origin=null
+            $this: GET_VAR 'this@test: IReceiver' type=IReceiver origin=null
             $receiver: GET_VAR 'tmp0_iterator: IntCell' type=IntCell origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR val i: kotlin.Int
               CALL 'next() on IntCell: Int' type=kotlin.Int origin=FOR_LOOP_NEXT
-                $this: GET_VAR '<receiver: test() on IReceiver: Unit>' type=IReceiver origin=null
+                $this: GET_VAR 'this@test: IReceiver' type=IReceiver origin=null
                 $receiver: GET_VAR 'tmp0_iterator: IntCell' type=IntCell origin=null
             BLOCK type=kotlin.Unit origin=null
               CALL 'println(Int): Unit' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
index 5b6a00f7346..daed07a8986 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
@@ -1,10 +1,10 @@
 FILE /genericPropertyCall.kt
   PROPERTY public val <T> T.id: T
     FUN public fun T.<get-id>(): T
-      $receiver: VALUE_PARAMETER <receiver: id: T on T>
+      $receiver: VALUE_PARAMETER this@id: T
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-id>() on T: T'
-          GET_VAR '<receiver: id: T on T>' type=T origin=null
+          GET_VAR 'this@id: T' type=T origin=null
   PROPERTY public val test: kotlin.String
     FIELD PROPERTY_BACKING_FIELD public val test: kotlin.String
       EXPRESSION_BODY
diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
index 179e630fe92..1df1c4c52f6 100644
--- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
+++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
@@ -1,6 +1,6 @@
 FILE /Derived.kt
   CLASS CLASS Derived
-    $new: VALUE_PARAMETER <receiver: Derived>
+    $new: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -8,20 +8,20 @@ FILE /Derived.kt
     ANONYMOUS_INITIALIZER Derived
       BLOCK_BODY
         SET_FIELD 'value: Int' type=kotlin.Unit origin=EQ
-          receiver: GET_VAR '<receiver: Derived>' type=Derived origin=null
+          receiver: GET_VAR 'this@Derived: Derived' type=Derived origin=null
           value: CONST Int type=kotlin.Int value='0'
     FUN public final fun getValue(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: Derived>
+      $this: VALUE_PARAMETER this@Derived: Derived
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='getValue(): Int'
           GET_FIELD 'value: Int' type=kotlin.Int origin=GET_PROPERTY
-            receiver: GET_VAR '<receiver: Derived>' type=Derived origin=null
+            receiver: GET_VAR 'this@Derived: Derived' type=Derived origin=null
     FUN public final fun setValue(value: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Derived>
+      $this: VALUE_PARAMETER this@Derived: Derived
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
         SET_FIELD 'value: Int' type=kotlin.Unit origin=EQ
-          receiver: GET_VAR '<receiver: Derived>' type=Derived origin=null
+          receiver: GET_VAR 'this@Derived: Derived' type=Derived origin=null
           value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     PROPERTY FAKE_OVERRIDE public final override var value: kotlin.Int
       FIELD FAKE_OVERRIDE public final override var value: kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
index 46faddf1076..a140213b2bf 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
@@ -22,7 +22,7 @@ FILE /jvmStaticFieldReference.kt
             GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY
           p0: CONST String type=kotlin.String value='testProp/set'
   CLASS CLASS TestClass
-    $new: VALUE_PARAMETER <receiver: TestClass>
+    $new: VALUE_PARAMETER this@TestClass: TestClass
     CONSTRUCTOR public constructor TestClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -40,11 +40,11 @@ FILE /jvmStaticFieldReference.kt
                   p0: CONST String type=kotlin.String value='TestClass/test'
                 CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-test>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: TestClass>
+        $this: VALUE_PARAMETER this@TestClass: TestClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test>(): Int'
             GET_FIELD 'test: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: TestClass>' type=TestClass origin=null
+              receiver: GET_VAR 'this@TestClass: TestClass' type=TestClass origin=null
     ANONYMOUS_INITIALIZER TestClass
       BLOCK_BODY
         CALL 'println(String!): Unit' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/kt16904.txt b/compiler/testData/ir/irText/expressions/kt16904.txt
index ad417563a01..acbeb57ec05 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.txt
@@ -1,6 +1,6 @@
 FILE /kt16904.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,60 +10,60 @@ FILE /kt16904.kt
         EXPRESSION_BODY
           CALL 'constructor B()' type=B origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): B
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): B'
             GET_FIELD 'x: B' type=B origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
     PROPERTY public final var y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var y: kotlin.Int
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='0'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'y: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: A>' type=A origin=null
+            receiver: GET_VAR 'this@A: A' type=A origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS B
-    $new: VALUE_PARAMETER <receiver: B>
+    $new: VALUE_PARAMETER this@B: B
     CONSTRUCTOR public constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='B'
     FUN public final operator fun plusAssign(x: kotlin.Int): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: B>
+      $this: VALUE_PARAMETER this@B: B
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER <receiver: Test1>
+    $new: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor A()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
         BLOCK type=kotlin.Unit origin=PLUSEQ
           VAR IR_TEMPORARY_VARIABLE val tmp0_this: Test1
-            GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            GET_VAR 'this@Test1: Test1' type=Test1 origin=null
           CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
             $this: CALL '<get-x>(): B' type=B origin=PLUSEQ
               $this: GET_VAR 'tmp0_this: Test1' type=Test1 origin=null
             x: CONST Int type=kotlin.Int value='42'
         BLOCK type=kotlin.Unit origin=PLUSEQ
           VAR IR_TEMPORARY_VARIABLE val tmp1_this: Test1
-            GET_VAR '<receiver: Test1>' type=Test1 origin=null
+            GET_VAR 'this@Test1: Test1' type=Test1 origin=null
           CALL '<set-y>(Int): Unit' type=kotlin.Unit origin=PLUSEQ
             $this: GET_VAR 'tmp1_this: Test1' type=Test1 origin=null
             <set-?>: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ
@@ -79,7 +79,7 @@ FILE /kt16904.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER <receiver: Test2>
+    $new: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor J()'
@@ -87,7 +87,7 @@ FILE /kt16904.kt
     ANONYMOUS_INITIALIZER Test2
       BLOCK_BODY
         SET_FIELD 'field: Int' type=kotlin.Unit origin=EQ
-          receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
+          receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
           value: CONST Int type=kotlin.Int value='42'
     PROPERTY FAKE_OVERRIDE public final override var field: kotlin.Int
       FIELD FAKE_OVERRIDE public final override var field: kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/kt16905.txt b/compiler/testData/ir/irText/expressions/kt16905.txt
index 7831e5b750d..9aee23d35c6 100644
--- a/compiler/testData/ir/irText/expressions/kt16905.txt
+++ b/compiler/testData/ir/irText/expressions/kt16905.txt
@@ -1,14 +1,14 @@
 FILE /kt16905.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER <receiver: Outer>
+    $new: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER <receiver: Inner>
+      $new: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
@@ -16,23 +16,23 @@ FILE /kt16905.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS InnerDerived0
-      $new: VALUE_PARAMETER <receiver: InnerDerived0>
+      $new: VALUE_PARAMETER this@InnerDerived0: InnerDerived0
       CONSTRUCTOR public constructor InnerDerived0()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
-            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+            $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived0'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS InnerDerived1
-      $new: VALUE_PARAMETER <receiver: InnerDerived1>
+      $new: VALUE_PARAMETER this@InnerDerived1: InnerDerived1
       CONSTRUCTOR public constructor InnerDerived1()
-        $outer: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
-            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
+            $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived1'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
index 8cd96d79ff7..3f813c0cbb5 100644
--- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
+++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
@@ -1,18 +1,18 @@
 FILE /membersImportedFromObject.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN public final fun foo(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='foo(): Int'
           CONST Int type=kotlin.Int value='1'
     FUN public final fun kotlin.Int.fooExt(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: A>
-      $receiver: VALUE_PARAMETER <receiver: fooExt() on Int: Int>
+      $this: VALUE_PARAMETER this@A: A
+      $receiver: VALUE_PARAMETER this@fooExt: Int
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='fooExt() on Int: Int'
           CONST Int type=kotlin.Int value='2'
@@ -21,15 +21,15 @@ FILE /membersImportedFromObject.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-bar>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             GET_FIELD 'bar: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
     PROPERTY public final val kotlin.Int.barExt: kotlin.Int
       FUN public final fun kotlin.Int.<get-barExt>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
-        $receiver: VALUE_PARAMETER <receiver: barExt: Int on Int>
+        $this: VALUE_PARAMETER this@A: A
+        $receiver: VALUE_PARAMETER this@barExt: Int
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-barExt>() on Int: Int'
             CONST Int type=kotlin.Int value='43'
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
index 9556ecf546f..a315e75773d 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
@@ -1,6 +1,6 @@
 FILE /objectAsCallable.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /objectAsCallable.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS ENUM_CLASS En
-    $new: VALUE_PARAMETER <receiver: En>
+    $new: VALUE_PARAMETER this@En: En
     CONSTRUCTOR private constructor En()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -32,13 +32,13 @@ FILE /objectAsCallable.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): En
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   FUN public operator fun A.invoke(i: kotlin.Int): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: invoke(Int) on A: Int>
+    $receiver: VALUE_PARAMETER this@invoke: A
     VALUE_PARAMETER value-parameter i: kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='invoke(Int) on A: Int'
         GET_VAR 'value-parameter i: Int' type=kotlin.Int origin=null
   FUN public operator fun En.invoke(i: kotlin.Int): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: invoke(Int) on En: Int>
+    $receiver: VALUE_PARAMETER this@invoke: En
     VALUE_PARAMETER value-parameter i: kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='invoke(Int) on En: Int'
diff --git a/compiler/testData/ir/irText/expressions/objectClassReference.txt b/compiler/testData/ir/irText/expressions/objectClassReference.txt
index 24c1beb47ba..e1e1e6ed331 100644
--- a/compiler/testData/ir/irText/expressions/objectClassReference.txt
+++ b/compiler/testData/ir/irText/expressions/objectClassReference.txt
@@ -1,6 +1,6 @@
 FILE /objectClassReference.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
index cb15c438d3a..803dee69f75 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
@@ -83,7 +83,7 @@ FILE /primitivesImplicitConversions.kt
             $this: CONST Int type=kotlin.Int value='1'
     BLOCK_BODY
   CLASS CLASS TestImplicitArguments
-    $new: VALUE_PARAMETER <receiver: TestImplicitArguments>
+    $new: VALUE_PARAMETER this@TestImplicitArguments: TestImplicitArguments
     CONSTRUCTOR public constructor TestImplicitArguments(x: kotlin.Long = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Long = ...
         EXPRESSION_BODY
@@ -98,11 +98,11 @@ FILE /primitivesImplicitConversions.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Long = ...' type=kotlin.Long origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Long
-        $this: VALUE_PARAMETER <receiver: TestImplicitArguments>
+        $this: VALUE_PARAMETER this@TestImplicitArguments: TestImplicitArguments
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Long'
             GET_FIELD 'x: Long' type=kotlin.Long origin=null
-              receiver: GET_VAR '<receiver: TestImplicitArguments>' type=TestImplicitArguments origin=null
+              receiver: GET_VAR 'this@TestImplicitArguments: TestImplicitArguments' type=TestImplicitArguments origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/expressions/references.txt b/compiler/testData/ir/irText/expressions/references.txt
index 36cf9ffeefb..8c627468501 100644
--- a/compiler/testData/ir/irText/expressions/references.txt
+++ b/compiler/testData/ir/irText/expressions/references.txt
@@ -41,13 +41,13 @@ FILE /references.kt
         CALL '<get-ok3>(): String' type=kotlin.String origin=GET_PROPERTY
   PROPERTY public val kotlin.String.okext: kotlin.String
     FUN public fun kotlin.String.<get-okext>(): kotlin.String
-      $receiver: VALUE_PARAMETER <receiver: okext: String on String>
+      $receiver: VALUE_PARAMETER this@okext: String
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-okext>() on String: String'
           CONST String type=kotlin.String value='OK'
   FUN public fun kotlin.String.test5(): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: test5() on String: String>
+    $receiver: VALUE_PARAMETER this@test5: String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test5() on String: String'
         CALL '<get-okext>() on String: String' type=kotlin.String origin=GET_PROPERTY
-          $receiver: GET_VAR '<receiver: test5() on String: String>' type=kotlin.String origin=null
+          $receiver: GET_VAR 'this@test5: String' type=kotlin.String origin=null
diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
index dbdf1181df4..ab813028a03 100644
--- a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
+++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
@@ -1,12 +1,12 @@
 FILE /reflectionLiterals.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN public final fun foo(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.txt b/compiler/testData/ir/irText/expressions/safeAssignment.txt
index 59f58423c9f..9db618a401a 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.txt
@@ -1,6 +1,6 @@
 FILE /safeAssignment.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -11,17 +11,17 @@ FILE /safeAssignment.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: C>' type=C origin=null
+              receiver: GET_VAR 'this@C: C' type=C origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-x>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: C>
+        $this: VALUE_PARAMETER this@C: C
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'x: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: C>' type=C origin=null
+            receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
index e6cdbb11b8f..71c86d38862 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
@@ -1,6 +1,6 @@
 FILE /safeCallWithIncrementDecrement.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER <receiver: C>
+    $new: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,21 +10,21 @@ FILE /safeCallWithIncrementDecrement.kt
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   PROPERTY public var test.C?.p: kotlin.Int
     FUN public fun test.C?.<get-p>(): kotlin.Int
-      $receiver: VALUE_PARAMETER <receiver: p: Int on C?>
+      $receiver: VALUE_PARAMETER this@p: C?
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-p>() on C?: Int'
           CONST Int type=kotlin.Int value='42'
     FUN public fun test.C?.<set-p>(value: kotlin.Int): kotlin.Unit
-      $receiver: VALUE_PARAMETER <receiver: p: Int on C?>
+      $receiver: VALUE_PARAMETER this@p: C?
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
   FUN public operator fun kotlin.Int?.inc(): kotlin.Int?
-    $receiver: VALUE_PARAMETER <receiver: inc() on Int?: Int?>
+    $receiver: VALUE_PARAMETER this@inc: Int?
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='inc() on Int?: Int?'
         BLOCK type=kotlin.Int? origin=SAFE_CALL
           VAR IR_TEMPORARY_VARIABLE val tmp0_safe_receiver: kotlin.Int?
-            GET_VAR '<receiver: inc() on Int?: Int?>' type=kotlin.Int? origin=null
+            GET_VAR 'this@inc: Int?' type=kotlin.Int? origin=null
           WHEN type=kotlin.Int? origin=SAFE_CALL
             BRANCH
               if: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -36,13 +36,13 @@ FILE /safeCallWithIncrementDecrement.kt
               then: CALL 'inc(): Int' type=kotlin.Int origin=null
                 $this: GET_VAR 'tmp0_safe_receiver: Int?' type=kotlin.Int? origin=null
   FUN public operator fun kotlin.Int?.get(index: kotlin.Int): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: get(Int) on Int?: Int>
+    $receiver: VALUE_PARAMETER this@get: Int?
     VALUE_PARAMETER value-parameter index: kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='get(Int) on Int?: Int'
         CONST Int type=kotlin.Int value='42'
   FUN public operator fun kotlin.Int?.set(index: kotlin.Int, value: kotlin.Int): kotlin.Unit
-    $receiver: VALUE_PARAMETER <receiver: set(Int, Int) on Int?: Unit>
+    $receiver: VALUE_PARAMETER this@set: Int?
     VALUE_PARAMETER value-parameter index: kotlin.Int
     VALUE_PARAMETER value-parameter value: kotlin.Int
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt
index 3be29c66dde..49e48cf496a 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.txt
@@ -1,6 +1,6 @@
 FILE /safeCalls.kt
   CLASS CLASS Ref
-    $new: VALUE_PARAMETER <receiver: Ref>
+    $new: VALUE_PARAMETER this@Ref: Ref
     CONSTRUCTOR public constructor Ref(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
@@ -11,29 +11,29 @@ FILE /safeCalls.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: Ref>
+        $this: VALUE_PARAMETER this@Ref: Ref
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: Ref>' type=Ref origin=null
+              receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-value>(<set-?>: kotlin.Int): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: Ref>
+        $this: VALUE_PARAMETER this@Ref: Ref
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'value: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: Ref>' type=Ref origin=null
+            receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IHost
     FUN public open fun kotlin.String.extLength(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IHost>
-      $receiver: VALUE_PARAMETER <receiver: extLength() on String: Int>
+      $this: VALUE_PARAMETER this@IHost: IHost
+      $receiver: VALUE_PARAMETER this@extLength: String
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='extLength() on String: Int'
           CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: extLength() on String: Int>' type=kotlin.String origin=null
+            $this: GET_VAR 'this@extLength: String' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
@@ -109,7 +109,7 @@ FILE /safeCalls.kt
               $this: GET_VAR 'tmp0_safe_receiver: Ref?' type=Ref? origin=null
               <set-?>: CONST Int type=kotlin.Int value='0'
   FUN public fun IHost.test5(s: kotlin.String?): kotlin.Int?
-    $receiver: VALUE_PARAMETER <receiver: test5(String?) on IHost: Int?>
+    $receiver: VALUE_PARAMETER this@test5: IHost
     VALUE_PARAMETER value-parameter s: kotlin.String?
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test5(String?) on IHost: Int?'
@@ -125,10 +125,10 @@ FILE /safeCalls.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CALL 'extLength() on String: Int' type=kotlin.Int origin=null
-                $this: GET_VAR '<receiver: test5(String?) on IHost: Int?>' type=IHost origin=null
+                $this: GET_VAR 'this@test5: IHost' type=IHost origin=null
                 $receiver: GET_VAR 'tmp0_safe_receiver: String?' type=kotlin.String? origin=null
   FUN public fun kotlin.Int.foo(): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: foo() on Int: Int>
+    $receiver: VALUE_PARAMETER this@foo: Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='foo() on Int: Int'
         CONST Int type=kotlin.Int value='239'
diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
index b71a83eb627..cb1aa2b5483 100644
--- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
+++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
@@ -1,12 +1,12 @@
 FILE /Derived.kt
   CLASS CLASS Derived
-    $new: VALUE_PARAMETER <receiver: Derived>
+    $new: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Derived'
     FUN public final fun setValue(v: kotlin.Any): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Derived>
+      $this: VALUE_PARAMETER this@Derived: Derived
       VALUE_PARAMETER value-parameter v: kotlin.Any
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
@@ -15,7 +15,7 @@ FILE /Derived.kt
               GET_VAR 'value-parameter v: Any' type=kotlin.Any origin=null
             then: BLOCK type=kotlin.Unit origin=null
               SET_FIELD 'value: String!' type=kotlin.Unit origin=EQ
-                receiver: GET_VAR '<receiver: Derived>' type=Derived origin=null
+                receiver: GET_VAR 'this@Derived: Derived' type=Derived origin=null
                 value: TYPE_OP type=kotlin.String! origin=IMPLICIT_CAST typeOperand=kotlin.String!
                   GET_VAR 'value-parameter v: Any' type=kotlin.Any origin=null
     PROPERTY FAKE_OVERRIDE public final override var value: kotlin.String!
diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
index bdc84347962..5b4064d9ad6 100644
--- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
+++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
@@ -8,12 +8,12 @@ FILE /smartCastsWithDestructuring.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public operator fun I1.component1(): kotlin.Int
-    $receiver: VALUE_PARAMETER <receiver: component1() on I1: Int>
+    $receiver: VALUE_PARAMETER this@component1: I1
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='component1() on I1: Int'
         CONST Int type=kotlin.Int value='1'
   FUN public operator fun I2.component2(): kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: component2() on I2: String>
+    $receiver: VALUE_PARAMETER this@component2: I2
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='component2() on I2: String'
         CONST String type=kotlin.String value=''
diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt
index fb740fdf83d..8b038cb8602 100644
--- a/compiler/testData/ir/irText/expressions/values.txt
+++ b/compiler/testData/ir/irText/expressions/values.txt
@@ -1,6 +1,6 @@
 FILE /values.kt
   CLASS ENUM_CLASS Enum
-    $new: VALUE_PARAMETER <receiver: Enum>
+    $new: VALUE_PARAMETER this@Enum: Enum
     CONSTRUCTOR private constructor Enum()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -23,7 +23,7 @@ FILE /values.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Enum
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -40,13 +40,13 @@ FILE /values.kt
         RETURN type=kotlin.Nothing from='<get-a>(): Int'
           GET_FIELD 'a: Int' type=kotlin.Int origin=null
   CLASS CLASS Z
-    $new: VALUE_PARAMETER <receiver: Z>
+    $new: VALUE_PARAMETER this@Z: Z
     CONSTRUCTOR public constructor Z()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Z'
     CLASS OBJECT companion object of Z
-      $new: VALUE_PARAMETER <receiver: companion object of Z>
+      $new: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
index f014e2be00e..dbc6ef911f2 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
@@ -1,13 +1,13 @@
 FILE /variableAsFunctionCall.kt
   FUN public fun kotlin.String.k(): () -> kotlin.String
-    $receiver: VALUE_PARAMETER <receiver: k() on String: () -> String>
+    $receiver: VALUE_PARAMETER this@k: String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='k() on String: () -> String'
         BLOCK type=() -> kotlin.String origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun <anonymous>(): kotlin.String
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<anonymous>(): String'
-                GET_VAR '<receiver: k() on String: () -> String>' type=kotlin.String origin=null
+                GET_VAR 'this@k: String' type=kotlin.String origin=null
           FUNCTION_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
   FUN public fun test1(f: () -> kotlin.Unit): kotlin.Unit
     VALUE_PARAMETER value-parameter f: () -> kotlin.Unit
diff --git a/compiler/testData/ir/irText/expressions/when.txt b/compiler/testData/ir/irText/expressions/when.txt
index 72c61058ac9..29b5456a115 100644
--- a/compiler/testData/ir/irText/expressions/when.txt
+++ b/compiler/testData/ir/irText/expressions/when.txt
@@ -1,6 +1,6 @@
 FILE /when.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
index 8dc3a12df85..4fce3836245 100644
--- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
@@ -1,6 +1,6 @@
 FILE /destructuringInLambda.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -12,71 +12,71 @@ FILE /destructuringInLambda.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-x>(): Int'
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
     PROPERTY public final val y: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
         EXPRESSION_BODY
           GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-y>(): Int'
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component1(): Int'
           CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: A>' type=A origin=null
+            $this: GET_VAR 'this@A: A' type=A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component2(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='component2(): Int'
           CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: A>' type=A origin=null
+            $this: GET_VAR 'this@A: A' type=A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public final fun copy(x: kotlin.Int = ..., y: kotlin.Int = ...): A
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY
           CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: A>' type=A origin=null
+            $this: GET_VAR 'this@A: A' type=A origin=null
       VALUE_PARAMETER value-parameter y: kotlin.Int = ...
         EXPRESSION_BODY
           CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: A>' type=A origin=null
+            $this: GET_VAR 'this@A: A' type=A origin=null
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='copy(Int = ..., Int = ...): A'
           CALL 'constructor A(Int, Int)' type=A origin=null
             x: GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=null
             y: GET_VAR 'value-parameter y: Int = ...' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun toString(): kotlin.String
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='toString(): String'
           STRING_CONCATENATION type=kotlin.String
             CONST String type=kotlin.String value='A('
             CONST String type=kotlin.String value='x='
             CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: A>' type=A origin=null
+              $this: GET_VAR 'this@A: A' type=A origin=null
             CONST String type=kotlin.String value=', '
             CONST String type=kotlin.String value='y='
             CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: A>' type=A origin=null
+              $this: GET_VAR 'this@A: A' type=A origin=null
             CONST String type=kotlin.String value=')'
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun hashCode(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
         VAR IR_TEMPORARY_VARIABLE var tmp0_result: kotlin.Int
           CONST Int type=kotlin.Int value='0'
         SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
           CALL 'hashCode(): Int' type=kotlin.Int origin=null
             $this: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-              $this: GET_VAR '<receiver: A>' type=A origin=null
+              $this: GET_VAR 'this@A: A' type=A origin=null
         SET_VAR 'tmp0_result: Int' type=kotlin.Unit origin=EQ
           CALL 'plus(Int): Int' type=kotlin.Int origin=null
             $this: CALL 'times(Int): Int' type=kotlin.Int origin=null
@@ -84,17 +84,17 @@ FILE /destructuringInLambda.kt
               other: CONST Int type=kotlin.Int value='31'
             other: CALL 'hashCode(): Int' type=kotlin.Int origin=null
               $this: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                $this: GET_VAR '<receiver: A>' type=A origin=null
+                $this: GET_VAR 'this@A: A' type=A origin=null
         RETURN type=kotlin.Nothing from='hashCode(): Int'
           GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER public open override fun equals(other: kotlin.Any?): kotlin.Boolean
-      $this: VALUE_PARAMETER <receiver: A>
+      $this: VALUE_PARAMETER this@A: A
       VALUE_PARAMETER value-parameter other: kotlin.Any?
       BLOCK_BODY
         WHEN type=kotlin.Unit origin=null
           BRANCH
             if: CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
-              arg0: GET_VAR '<receiver: A>' type=A origin=null
+              arg0: GET_VAR 'this@A: A' type=A origin=null
               arg1: GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               CONST Boolean type=kotlin.Boolean value='true'
@@ -112,7 +112,7 @@ FILE /destructuringInLambda.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: A>' type=A origin=null
+                  $this: GET_VAR 'this@A: A' type=A origin=null
                 arg1: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: A' type=A origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
@@ -122,7 +122,7 @@ FILE /destructuringInLambda.kt
             if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
                 arg0: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                  $this: GET_VAR '<receiver: A>' type=A origin=null
+                  $this: GET_VAR 'this@A: A' type=A origin=null
                 arg1: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
                   $this: GET_VAR 'tmp0_other_with_cast: A' type=A origin=null
             then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
index c50b322b47a..b9e5c3812cd 100644
--- a/compiler/testData/ir/irText/lambdas/extensionLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
@@ -8,9 +8,9 @@ FILE /extensionLambda.kt
           $receiver: CONST String type=kotlin.String value='42'
           block: BLOCK type=kotlin.String.() -> kotlin.Int origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun kotlin.String.<anonymous>(): kotlin.Int
-              $receiver: VALUE_PARAMETER <receiver: <anonymous>() on String: Int>
+              $receiver: VALUE_PARAMETER this@<anonymous>: String
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='<anonymous>() on String: Int'
                   CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
-                    $this: GET_VAR '<receiver: <anonymous>() on String: Int>' type=kotlin.String origin=null
+                    $this: GET_VAR 'this@<anonymous>: String' type=kotlin.String origin=null
             FUNCTION_REFERENCE '<anonymous>() on String: Int' type=kotlin.String.() -> kotlin.Int origin=LAMBDA
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
index e08769e1cc8..2ddeda8df1e 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
@@ -1,6 +1,6 @@
 FILE /multipleImplicitReceivers.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER <receiver: A>
+    $new: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /multipleImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT B
-    $new: VALUE_PARAMETER <receiver: B>
+    $new: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -20,8 +20,8 @@ FILE /multipleImplicitReceivers.kt
   CLASS INTERFACE IFoo
     PROPERTY public open val A.foo: B
       FUN public open fun A.<get-foo>(): B
-        $this: VALUE_PARAMETER <receiver: IFoo>
-        $receiver: VALUE_PARAMETER <receiver: foo: B on A>
+        $this: VALUE_PARAMETER this@IFoo: IFoo
+        $receiver: VALUE_PARAMETER this@foo: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-foo>() on A: B'
             GET_OBJECT 'B' type=B
@@ -30,8 +30,8 @@ FILE /multipleImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IInvoke
     FUN public open operator fun B.invoke(): kotlin.Int
-      $this: VALUE_PARAMETER <receiver: IInvoke>
-      $receiver: VALUE_PARAMETER <receiver: invoke() on B: Int>
+      $this: VALUE_PARAMETER this@IInvoke: IInvoke
+      $receiver: VALUE_PARAMETER this@invoke: B
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='invoke() on B: Int'
           CONST Int type=kotlin.Int value='42'
@@ -49,7 +49,7 @@ FILE /multipleImplicitReceivers.kt
           receiver: GET_OBJECT 'A' type=A
           block: BLOCK type=A.() -> kotlin.Int origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun A.<anonymous>(): kotlin.Int
-              $receiver: VALUE_PARAMETER <receiver: <anonymous>() on A: Int>
+              $receiver: VALUE_PARAMETER this@<anonymous>: A
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='<anonymous>() on A: Int'
                   CALL 'with(IFoo, IFoo.() -> Int): Int' type=kotlin.Int origin=null
@@ -58,7 +58,7 @@ FILE /multipleImplicitReceivers.kt
                     receiver: GET_VAR 'value-parameter fooImpl: IFoo' type=IFoo origin=null
                     block: BLOCK type=IFoo.() -> kotlin.Int origin=LAMBDA
                       FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun IFoo.<anonymous>(): kotlin.Int
-                        $receiver: VALUE_PARAMETER <receiver: <anonymous>() on IFoo: Int>
+                        $receiver: VALUE_PARAMETER this@<anonymous>: IFoo
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='<anonymous>() on IFoo: Int'
                             CALL 'with(IInvoke, IInvoke.() -> Int): Int' type=kotlin.Int origin=null
@@ -67,14 +67,14 @@ FILE /multipleImplicitReceivers.kt
                               receiver: GET_VAR 'value-parameter invokeImpl: IInvoke' type=IInvoke origin=null
                               block: BLOCK type=IInvoke.() -> kotlin.Int origin=LAMBDA
                                 FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun IInvoke.<anonymous>(): kotlin.Int
-                                  $receiver: VALUE_PARAMETER <receiver: <anonymous>() on IInvoke: Int>
+                                  $receiver: VALUE_PARAMETER this@<anonymous>: IInvoke
                                   BLOCK_BODY
                                     RETURN type=kotlin.Nothing from='<anonymous>() on IInvoke: Int'
                                       CALL 'invoke() on B: Int' type=kotlin.Int origin=INVOKE
-                                        $this: GET_VAR '<receiver: <anonymous>() on IInvoke: Int>' type=IInvoke origin=null
+                                        $this: GET_VAR 'this@<anonymous>: IInvoke' type=IInvoke origin=null
                                         $receiver: CALL '<get-foo>() on A: B' type=B origin=GET_PROPERTY
-                                          $this: GET_VAR '<receiver: <anonymous>() on IFoo: Int>' type=IFoo origin=null
-                                          $receiver: GET_VAR '<receiver: <anonymous>() on A: Int>' type=A origin=null
+                                          $this: GET_VAR 'this@<anonymous>: IFoo' type=IFoo origin=null
+                                          $receiver: GET_VAR 'this@<anonymous>: A' type=A origin=null
                                 FUNCTION_REFERENCE '<anonymous>() on IInvoke: Int' type=IInvoke.() -> kotlin.Int origin=LAMBDA
                       FUNCTION_REFERENCE '<anonymous>() on IFoo: Int' type=IFoo.() -> kotlin.Int origin=LAMBDA
             FUNCTION_REFERENCE '<anonymous>() on A: Int' type=A.() -> kotlin.Int origin=LAMBDA
diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
index da144a1b9af..a3bf9a297ad 100644
--- a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
+++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
@@ -5,12 +5,12 @@ FILE /integerCoercionToT.kt
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   FUN public inline fun <reified T : CPointed> CPointed.reinterpret(): T
     TYPE_PARAMETER <reified T : CPointed>
-    $receiver: VALUE_PARAMETER <receiver: reinterpret() on CPointed: T>
+    $receiver: VALUE_PARAMETER this@reinterpret: CPointed
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='reinterpret() on CPointed: T'
         CALL 'TODO(): Nothing' type=kotlin.Nothing origin=null
   CLASS CLASS CInt32VarX
-    $new: VALUE_PARAMETER <receiver: CInt32VarX>
+    $new: VALUE_PARAMETER this@CInt32VarX: CInt32VarX<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor CInt32VarX<T>()
       BLOCK_BODY
@@ -22,16 +22,16 @@ FILE /integerCoercionToT.kt
   TYPEALIAS typealias CInt32Var = CInt32VarX<Int> type=CInt32VarX<kotlin.Int>
   PROPERTY public var <T_INT : kotlin.Int> CInt32VarX<T_INT>.value: T_INT
     FUN public fun CInt32VarX<T_INT>.<get-value>(): T_INT
-      $receiver: VALUE_PARAMETER <receiver: value: T_INT on CInt32VarX<T_INT>>
+      $receiver: VALUE_PARAMETER this@value: CInt32VarX<T_INT>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-value>() on CInt32VarX<T_INT>: T_INT'
           CALL 'TODO(): Nothing' type=kotlin.Nothing origin=null
     FUN public fun CInt32VarX<T_INT>.<set-value>(value: T_INT): kotlin.Unit
-      $receiver: VALUE_PARAMETER <receiver: value: T_INT on CInt32VarX<T_INT>>
+      $receiver: VALUE_PARAMETER this@value: CInt32VarX<T_INT>
       VALUE_PARAMETER value-parameter value: T_INT
       BLOCK_BODY
   CLASS CLASS IdType
-    $new: VALUE_PARAMETER <receiver: IdType>
+    $new: VALUE_PARAMETER this@IdType: IdType
     CONSTRUCTOR public constructor IdType(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
@@ -42,11 +42,11 @@ FILE /integerCoercionToT.kt
         EXPRESSION_BODY
           GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value>(): kotlin.Int
-        $this: VALUE_PARAMETER <receiver: IdType>
+        $this: VALUE_PARAMETER this@IdType: IdType
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-value>(): Int'
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: IdType>' type=IdType origin=null
+              receiver: GET_VAR 'this@IdType: IdType' type=IdType origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
diff --git a/compiler/testData/ir/irText/singletons/companion.txt b/compiler/testData/ir/irText/singletons/companion.txt
index e8907a9f181..e07fdd4be79 100644
--- a/compiler/testData/ir/irText/singletons/companion.txt
+++ b/compiler/testData/ir/irText/singletons/companion.txt
@@ -1,23 +1,23 @@
 FILE /companion.kt
   CLASS CLASS Z
-    $new: VALUE_PARAMETER <receiver: Z>
+    $new: VALUE_PARAMETER this@Z: Z
     CONSTRUCTOR public constructor Z()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Z'
     FUN public final fun test2(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Z>
+      $this: VALUE_PARAMETER this@Z: Z
       BLOCK_BODY
         CALL 'test(): Unit' type=kotlin.Unit origin=null
           $this: GET_OBJECT 'companion object of Z' type=Z.Companion
     CLASS OBJECT companion object of Z
-      $new: VALUE_PARAMETER <receiver: companion object of Z>
+      $new: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='companion object of Z'
       FUN public final fun test(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: companion object of Z>
+        $this: VALUE_PARAMETER this@Companion: Companion
         BLOCK_BODY
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.txt b/compiler/testData/ir/irText/singletons/enumEntry.txt
index a475e9d12c1..45cfb770b93 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.txt
@@ -1,6 +1,6 @@
 FILE /enumEntry.kt
   CLASS ENUM_CLASS Z
-    $new: VALUE_PARAMETER <receiver: Z>
+    $new: VALUE_PARAMETER this@Z: Z
     CONSTRUCTOR private constructor Z()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -8,22 +8,22 @@ FILE /enumEntry.kt
     ENUM_ENTRY enum entry ENTRY
       init: ENUM_CONSTRUCTOR_CALL 'constructor ENTRY()'
       class: CLASS ENUM_ENTRY ENTRY
-        $new: VALUE_PARAMETER <receiver: ENTRY>
+        $new: VALUE_PARAMETER this@ENTRY: ENTRY
         CONSTRUCTOR private constructor ENTRY()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor Z()'
             INSTANCE_INITIALIZER_CALL classDescriptor='ENTRY'
         FUN public final fun test(): kotlin.Unit
-          $this: VALUE_PARAMETER <receiver: ENTRY>
+          $this: VALUE_PARAMETER this@ENTRY: ENTRY
           BLOCK_BODY
         CLASS CLASS A
-          $new: VALUE_PARAMETER <receiver: A>
+          $new: VALUE_PARAMETER this@A: A
           CONSTRUCTOR public constructor A()
             BLOCK_BODY
               DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
               INSTANCE_INITIALIZER_CALL classDescriptor='A'
           FUN public final fun test2(): kotlin.Unit
-            $this: VALUE_PARAMETER <receiver: A>
+            $this: VALUE_PARAMETER this@A: A
             BLOCK_BODY
               CALL 'test(): Unit' type=kotlin.Unit origin=null
                 $this: GET_ENUM 'ENTRY' type=Z.ENTRY
diff --git a/compiler/testData/ir/irText/singletons/object.txt b/compiler/testData/ir/irText/singletons/object.txt
index c0415dd5def..28a2701eec2 100644
--- a/compiler/testData/ir/irText/singletons/object.txt
+++ b/compiler/testData/ir/irText/singletons/object.txt
@@ -1,21 +1,21 @@
 FILE /object.kt
   CLASS OBJECT Z
-    $new: VALUE_PARAMETER <receiver: Z>
+    $new: VALUE_PARAMETER this@Z: Z
     CONSTRUCTOR private constructor Z()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Z'
     FUN public final fun test(): kotlin.Unit
-      $this: VALUE_PARAMETER <receiver: Z>
+      $this: VALUE_PARAMETER this@Z: Z
       BLOCK_BODY
     CLASS CLASS A
-      $new: VALUE_PARAMETER <receiver: A>
+      $new: VALUE_PARAMETER this@A: A
       CONSTRUCTOR public constructor A()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='A'
       FUN public final fun test2(): kotlin.Unit
-        $this: VALUE_PARAMETER <receiver: A>
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           CALL 'test(): Unit' type=kotlin.Unit origin=null
             $this: GET_OBJECT 'Z' type=Z
diff --git a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
index 25736d52cdb..c010e3f9105 100644
--- a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
@@ -343,6 +343,12 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
                 doTest(fileName);
             }
 
+            @TestMetadata("genericInnerClass.kt")
+            public void testGenericInnerClass() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("lambdas.kt")
             public void testLambdas() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/ir/irText/declarations/parameters/lambdas.kt");