diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index d8324967275..9b239791d92 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiCompiledElement
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierSymbol
+import org.jetbrains.kotlin.fir.symbols.ConeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.IrElement
@@ -101,24 +102,28 @@ fun ConeClassifierSymbol.toIrSymbol(session: FirSession, declarationStorage: Fir
 }
 
 fun FirReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol? {
-    if (this is FirNamedReference) {
-        return toSymbol(declarationStorage)
+    return when (this) {
+        is FirResolvedCallableReference -> coneSymbol.toSymbol(declarationStorage)
+        is FirThisReference -> {
+            when (val ownerSymbol = candidateOwner?.toSymbol(declarationStorage)) {
+                is IrClassSymbol -> ownerSymbol.owner.thisReceiver?.symbol
+                is IrFunctionSymbol -> ownerSymbol.owner.extensionReceiverParameter?.symbol
+                else -> null
+            }
+        }
+        else -> null
     }
-    return null
 }
 
-fun FirNamedReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol? {
-    if (this is FirResolvedCallableReference) {
-        when (val callableSymbol = this.coneSymbol) {
-            is FirFunctionSymbol<*> -> return callableSymbol.toFunctionSymbol(declarationStorage)
-            is FirPropertySymbol -> return callableSymbol.toPropertyOrFieldSymbol(declarationStorage)
-            is FirFieldSymbol -> return callableSymbol.toPropertyOrFieldSymbol(declarationStorage)
-            is FirBackingFieldSymbol -> return callableSymbol.toBackingFieldSymbol(declarationStorage)
-            is FirDelegateFieldSymbol<*> -> return callableSymbol.toBackingFieldSymbol(declarationStorage)
-            is FirVariableSymbol<*> -> return callableSymbol.toValueSymbol(declarationStorage)
-        }
-    }
-    return null
+private fun ConeSymbol.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol? = when (this) {
+    is FirClassSymbol -> toClassSymbol(declarationStorage)
+    is FirFunctionSymbol<*> -> toFunctionSymbol(declarationStorage)
+    is FirPropertySymbol -> toPropertyOrFieldSymbol(declarationStorage)
+    is FirFieldSymbol -> toPropertyOrFieldSymbol(declarationStorage)
+    is FirBackingFieldSymbol -> toBackingFieldSymbol(declarationStorage)
+    is FirDelegateFieldSymbol<*> -> toBackingFieldSymbol(declarationStorage)
+    is FirVariableSymbol<*> -> toValueSymbol(declarationStorage)
+    else -> null
 }
 
 fun FirClassSymbol.toClassSymbol(declarationStorage: Fir2IrDeclarationStorage): IrClassSymbol {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
index 1191a3a3c6b..8bf10fdc4c8 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
@@ -765,6 +765,15 @@ internal class Fir2IrVisitor(
                 }
                 this
             }
+            is IrFieldExpressionBase -> {
+                val explicitReceiver = qualifiedAccess.explicitReceiver?.toIrExpression()
+                if (explicitReceiver != null) {
+                    receiver = explicitReceiver
+                } else {
+                    // TODO: implicit receiver
+                }
+                this
+            }
             else -> this
         }
     }
@@ -823,7 +832,7 @@ internal class Fir2IrVisitor(
             if (symbol != null && symbol.isBound) {
                 when (symbol) {
                     is IrFieldSymbol -> IrSetFieldImpl(
-                        startOffset, endOffset, symbol, symbol.owner.type
+                        startOffset, endOffset, symbol, unitType
                     ).apply {
                         value = variableAssignment.rValue.toIrExpression()
                     }
@@ -832,7 +841,7 @@ internal class Fir2IrVisitor(
                         val backingField = irProperty.backingField
                         if (backingField != null) {
                             IrSetFieldImpl(
-                                startOffset, endOffset, backingField.symbol, backingField.symbol.owner.type
+                                startOffset, endOffset, backingField.symbol, unitType
                             ).apply {
                                 value = variableAssignment.rValue.toIrExpression()
                             }
@@ -850,7 +859,7 @@ internal class Fir2IrVisitor(
             } else {
                 generateErrorCallExpression(startOffset, endOffset, calleeReference)
             }
-        }
+        }.applyReceivers(variableAssignment)
     }
 
     override fun <T> visitConstExpression(constExpression: FirConstExpression<T>, data: Any?): IrElement {
diff --git a/compiler/testData/ir/irText/classes/enum.fir.txt b/compiler/testData/ir/irText/classes/enum.fir.txt
index d609e6df118..478068334f3 100644
--- a/compiler/testData/ir/irText/classes/enum.fir.txt
+++ b/compiler/testData/ir/irText/classes/enum.fir.txt
@@ -320,7 +320,7 @@ FILE fqName:<root> fileName:/enum.kt
                 receiver: GET_VAR '<this>: <root>.TestEnum4.TEST2 declared in <root>.TestEnum4.TEST2.<get-z>' type=<root>.TestEnum4.TEST2 origin=null
       ANONYMOUS_INITIALIZER isStatic=false
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null
             value: CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.TestEnum4' type=kotlin.Int origin=null
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.TestEnum4.TEST2) returnType:kotlin.Unit
         $this: VALUE_PARAMETER name:<this> type:<root>.TestEnum4.TEST2
diff --git a/compiler/testData/ir/irText/classes/initVal.fir.txt b/compiler/testData/ir/irText/classes/initVal.fir.txt
index c0964180444..d7307148cd5 100644
--- a/compiler/testData/ir/irText/classes/initVal.fir.txt
+++ b/compiler/testData/ir/irText/classes/initVal.fir.txt
@@ -77,7 +77,7 @@ FILE fqName:<root> fileName:/initVal.kt
               receiver: GET_VAR '<this>: <root>.TestInitValInInitBlock declared in <root>.TestInitValInInitBlock.<get-x>' type=<root>.TestInitValInInitBlock origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=0
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/classes/initVar.fir.txt b/compiler/testData/ir/irText/classes/initVar.fir.txt
index f19304f90c5..ba415b73fa1 100644
--- a/compiler/testData/ir/irText/classes/initVar.fir.txt
+++ b/compiler/testData/ir/irText/classes/initVar.fir.txt
@@ -101,7 +101,7 @@ FILE fqName:<root> fileName:/initVar.kt
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.TestInitVarInInitBlock.<set-x>' type=kotlin.Int origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=0
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
@@ -138,7 +138,7 @@ FILE fqName:<root> fileName:/initVar.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetter
         VALUE_PARAMETER name:value index:0 type:kotlin.Int
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetter.<set-x>' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
@@ -169,11 +169,11 @@ FILE fqName:<root> fileName:/initVar.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterWithExplicitCtor
         VALUE_PARAMETER name:value index:0 type:kotlin.Int
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetterWithExplicitCtor.<set-x>' type=kotlin.Int origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=0
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterWithExplicitCtor
       BLOCK_BODY
@@ -208,11 +208,11 @@ FILE fqName:<root> fileName:/initVar.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.TestInitVarWithCustomSetterInCtor
         VALUE_PARAMETER name:value index:0 type:kotlin.Int
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetterInCtor.<set-x>' type=kotlin.Int origin=null
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterInCtor
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=42
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetterInCtor modality:FINAL visibility:public superTypes:[kotlin.Any]'
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
index 077578ca5b5..2109fc8a362 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/objectWithInitializers.kt
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.<get-y>' type=<root>.Test origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null
           value: CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.Test' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt b/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt
deleted file mode 100644
index e92205779e8..00000000000
--- a/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-FILE fqName:<root> fileName:/primaryConstructor.kt
-  CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Test1 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]
-        EXPRESSION_BODY
-          GET_VAR 'x: kotlin.Int declared in <root>.Test1.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test1'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-x>' type=<root>.Test1 origin=null
-    PROPERTY name:y visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]
-        EXPRESSION_BODY
-          GET_VAR 'y: kotlin.Int declared in <root>.Test1.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Test1'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-y>' type=<root>.Test1 origin=null
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Test2 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:y visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]
-        EXPRESSION_BODY
-          GET_VAR 'y: kotlin.Int declared in <root>.Test2.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Test2'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-y>' type=<root>.Test2 origin=null
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]
-        EXPRESSION_BODY
-          GET_VAR 'x: kotlin.Int declared in <root>.Test2.<init>' type=kotlin.Int origin=null
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test2'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Test3 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:y visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]
-        EXPRESSION_BODY
-          GET_VAR 'y: kotlin.Int declared in <root>.Test3.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Test3'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-y>' type=<root>.Test3 origin=null
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test3'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-x>' type=<root>.Test3 origin=null
-    ANONYMOUS_INITIALIZER isStatic=false
-      BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
-          value: GET_VAR 'x: kotlin.Int declared in <root>.Test3.<init>' type=kotlin.Int origin=null
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.kt b/compiler/testData/ir/irText/classes/primaryConstructor.kt
index a59485957a4..512b4a8ba73 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.kt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class Test1(val x: Int, val y: Int)
 
 class Test2(x: Int, val y: Int) {
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
index e186bb2b5e6..fc78d0c1b53 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
@@ -61,7 +61,7 @@ FILE fqName:<root> fileName:/secondaryConstructorWithInitializersFromClassBody.k
               receiver: GET_VAR '<this>: <root>.TestInitBlock declared in <root>.TestInitBlock.<get-x>' type=<root>.TestInitBlock origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=0
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitBlock
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
index 39cf9634331..8639ad7e5d4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
@@ -66,7 +66,7 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       VALUE_PARAMETER name:kProp index:1 type:kotlin.Any?
       VALUE_PARAMETER name:newValue index:2 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: GET_VAR 'newValue: kotlin.Int declared in <root>.Cell.setValue' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
index 73658efd2c5..e1f5623a91b 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
@@ -58,7 +58,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.C
         VALUE_PARAMETER name:value index:0 type:kotlin.Int
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: GET_VAR 'value: kotlin.Int declared in <root>.C.<set-test4>' type=kotlin.Int origin=null
     PROPERTY name:test5 visibility:public modality:FINAL [var]
       FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public
@@ -98,7 +98,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
           RETURN type=kotlin.Nothing from='public final fun <get-test7> (): kotlin.Int declared in <root>.C'
             CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): T of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Int origin=null
               $receiver: GET_FIELD 'FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private [final]' type=kotlin.Lazy<kotlin.Int> origin=GET_PROPERTY
-              thisRef: ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+              thisRef: GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
               property: PROPERTY_REFERENCE 'public final test7: kotlin.Int [delegated,val]' field='FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
     PROPERTY name:test8 visibility:public modality:FINAL [delegated,var]
       FIELD DELEGATE name:test8$delegate type:java.util.HashMap<kotlin.String, kotlin.Int> visibility:private [final]
@@ -110,7 +110,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-test8> (): IrErrorType declared in <root>.C'
             ERROR_CALL 'Unresolved reference: <Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>#' type=IrErrorType
-              ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+              GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
               PROPERTY_REFERENCE 'public final test8: IrErrorType [delegated,var]' field='FIELD DELEGATE name:test8$delegate type:java.util.HashMap<kotlin.String, kotlin.Int> visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test8> visibility:public modality:FINAL <> ($this:<root>.C, <set-?>:IrErrorType) returnType:kotlin.Unit
         correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [delegated,var]
@@ -118,7 +118,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         VALUE_PARAMETER name:<set-?> index:0 type:IrErrorType
         BLOCK_BODY
           ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/collections/setValue]>#' type=IrErrorType
-            ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+            GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
             PROPERTY_REFERENCE 'public final test8: IrErrorType [delegated,var]' field='FIELD DELEGATE name:test8$delegate type:java.util.HashMap<kotlin.String, kotlin.Int> visibility:private [final]' getter='public final fun <get-test8> (): IrErrorType declared in <root>.C' setter=null type=kotlin.reflect.KProperty<*> origin=null
             GET_VAR '<set-?>: IrErrorType declared in <root>.C.<set-test8>' type=IrErrorType origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
index 115d8e4892a..b624250710c 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
           RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>.C'
             CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): T of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Int origin=null
               $receiver: GET_FIELD 'FIELD DELEGATE name:test2$delegate type:kotlin.Lazy<kotlin.Int> visibility:private [final]' type=kotlin.Lazy<kotlin.Int> origin=GET_PROPERTY
-              thisRef: ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+              thisRef: GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
               property: PROPERTY_REFERENCE 'public final test2: kotlin.Int [delegated,val]' field='FIELD DELEGATE name:test2$delegate type:kotlin.Lazy<kotlin.Int> visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
     PROPERTY name:test3 visibility:public modality:FINAL [delegated,var]
       FIELD DELEGATE name:test3$delegate type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:private [final]
@@ -61,7 +61,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-test3> (): IrErrorType declared in <root>.C'
             ERROR_CALL 'Unresolved reference: <Ambiguity: getValue, [kotlin/collections/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>#' type=IrErrorType
-              ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+              GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
               PROPERTY_REFERENCE 'public final test3: IrErrorType [delegated,var]' field='FIELD DELEGATE name:test3$delegate type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<set-test3> visibility:public modality:FINAL <> ($this:<root>.C, <set-?>:IrErrorType) returnType:kotlin.Unit
         correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [delegated,var]
@@ -69,7 +69,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         VALUE_PARAMETER name:<set-?> index:0 type:IrErrorType
         BLOCK_BODY
           ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/collections/setValue]>#' type=IrErrorType
-            ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+            GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
             PROPERTY_REFERENCE 'public final test3: IrErrorType [delegated,var]' field='FIELD DELEGATE name:test3$delegate type:kotlin.collections.MutableMap<kotlin.String, kotlin.Any> visibility:private [final]' getter='public final fun <get-test3> (): IrErrorType declared in <root>.C' setter=null type=kotlin.reflect.KProperty<*> origin=null
             GET_VAR '<set-?>: IrErrorType declared in <root>.C.<set-test3>' type=IrErrorType origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
diff --git a/compiler/testData/ir/irText/declarations/kt29833.fir.txt b/compiler/testData/ir/irText/declarations/kt29833.fir.txt
index aa0ba8a8566..89f537e1d37 100644
--- a/compiler/testData/ir/irText/declarations/kt29833.fir.txt
+++ b/compiler/testData/ir/irText/declarations/kt29833.fir.txt
@@ -9,6 +9,7 @@ FILE fqName:interop fileName:/Definitions.kt
       FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String? visibility:public [final]
         EXPRESSION_BODY
           GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String? visibility:public [final,static]' type=kotlin.String? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:Interface modality:OPEN visibility:public/*package*/ superTypes:[kotlin.Any]' type=kotlin.Unit
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-KT_CONSTANT> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String?
         correspondingProperty: PROPERTY name:KT_CONSTANT visibility:public modality:FINAL [const,val]
         $this: VALUE_PARAMETER name:<this> type:interop.Definitions
@@ -20,6 +21,7 @@ FILE fqName:interop fileName:/Definitions.kt
       FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String? visibility:public [final]
         EXPRESSION_BODY
           GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String? visibility:public [final,static]' type=kotlin.String? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:Interface modality:OPEN visibility:public/*package*/ superTypes:[kotlin.Any]' type=kotlin.Unit
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ktValue> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String?
         correspondingProperty: PROPERTY name:ktValue visibility:public modality:FINAL [val]
         $this: VALUE_PARAMETER name:<this> type:interop.Definitions
diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
index e01bdb9c120..32c2c13eabb 100644
--- a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
@@ -42,7 +42,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var]
       VALUE_PARAMETER name:value index:0 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
           value: GET_VAR 'value: kotlin.Int declared in <root>.<set-test4>' type=kotlin.Int origin=null
   PROPERTY name:test5 visibility:public modality:FINAL [var]
     FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static]
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
index aa99860961a..37ae51be392 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
@@ -37,14 +37,14 @@ FILE fqName:<root> fileName:/differentReceivers.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): kotlin.String declared in <root>'
         CALL 'public final fun <get-value> (): kotlin.String declared in <root>.MyClass' type=kotlin.String origin=null
-          $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.MyClass
+          $this: GET_VAR '<this>: <root>.MyClass declared in <root>.provideDelegate' type=<root>.MyClass origin=null
   FUN name:getValue visibility:public modality:FINAL <> ($receiver:kotlin.String, receiver:kotlin.Any?, p:kotlin.Any) returnType:kotlin.String
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any?
     VALUE_PARAMETER name:p index:1 type:kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun getValue (receiver: kotlin.Any?, p: kotlin.Any): kotlin.String declared in <root>'
-        ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+        GET_VAR '<this>: kotlin.String declared in <root>.getValue' type=kotlin.String origin=null
   PROPERTY name:testO visibility:public modality:FINAL [delegated,val]
     FIELD DELEGATE name:testO$delegate type:kotlin.String visibility:private [final,static]
       EXPRESSION_BODY
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
index ca561bc2c29..99e572c2950 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
@@ -37,14 +37,14 @@ FILE fqName:<root> fileName:/localDifferentReceivers.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): kotlin.String declared in <root>'
         CALL 'public final fun <get-value> (): kotlin.String declared in <root>.MyClass' type=kotlin.String origin=null
-          $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.MyClass
+          $this: GET_VAR '<this>: <root>.MyClass declared in <root>.provideDelegate' type=<root>.MyClass origin=null
   FUN name:getValue visibility:public modality:FINAL <> ($receiver:kotlin.String, receiver:kotlin.Any?, p:kotlin.Any) returnType:kotlin.String
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any?
     VALUE_PARAMETER name:p index:1 type:kotlin.Any
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun getValue (receiver: kotlin.Any?, p: kotlin.Any): kotlin.String declared in <root>'
-        ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+        GET_VAR '<this>: kotlin.String declared in <root>.getValue' type=kotlin.String origin=null
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:testO type:kotlin.String [val]
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
index 938ea11b1b5..5497ba36f1f 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
@@ -88,7 +88,7 @@ FILE fqName:<root> fileName:/member.kt
           CALL 'public final fun provideDelegate (thisRef: kotlin.Any?, property: kotlin.Any?): <root>.Delegate declared in <root>.DelegateProvider' type=<root>.Delegate origin=null
             $this: CONSTRUCTOR_CALL 'public constructor <init> (value: kotlin.String) [primary] declared in <root>.DelegateProvider' type=<root>.DelegateProvider origin=null
               value: CONST String type=kotlin.String value="OK"
-            thisRef: ERROR_CALL 'Unresolved reference: this#' type=<root>.Host
+            thisRef: GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host origin=null
             property: PROPERTY_REFERENCE 'public final testMember: kotlin.String [delegated,val]' field=null getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-testMember> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:kotlin.String
         correspondingProperty: PROPERTY name:testMember visibility:public modality:FINAL [delegated,val]
@@ -97,7 +97,7 @@ FILE fqName:<root> fileName:/member.kt
           RETURN type=kotlin.Nothing from='public final fun <get-testMember> (): kotlin.String declared in <root>.Host'
             CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String declared in <root>.Delegate' type=kotlin.String origin=null
               $this: GET_FIELD 'FIELD DELEGATE name:testMember$delegate type:<root>.Delegate visibility:private [final]' type=<root>.Delegate origin=GET_PROPERTY
-              thisRef: ERROR_CALL 'Unresolved reference: this#' type=<root>.Host
+              thisRef: GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host origin=null
               property: PROPERTY_REFERENCE 'public final testMember: kotlin.String [delegated,val]' field='FIELD DELEGATE name:testMember$delegate type:<root>.Delegate visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
index 8e495ec5350..3102ef43fd9 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
@@ -53,13 +53,13 @@ FILE fqName:<root> fileName:/memberExtension.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): <root>.Host.StringDelegate declared in <root>.Host'
           CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) [primary] declared in <root>.Host.StringDelegate' type=<root>.Host.StringDelegate origin=null
-            s: ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+            s: GET_VAR '<this>: kotlin.String declared in <root>.Host.provideDelegate' type=kotlin.String origin=null
     PROPERTY name:plusK visibility:public modality:FINAL [delegated,val]
       FIELD DELEGATE name:plusK$delegate type:<root>.Host.StringDelegate visibility:private [final]
         EXPRESSION_BODY
           CALL 'public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): <root>.Host.StringDelegate declared in <root>.Host' type=<root>.Host.StringDelegate origin=null
             $this: CONST String type=kotlin.String value="K"
-            host: ERROR_CALL 'Unresolved reference: this#' type=<root>.Host
+            host: GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host origin=null
             p: PROPERTY_REFERENCE 'public final plusK: IrErrorType [delegated,val]' field=null getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-plusK> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:IrErrorType
         correspondingProperty: PROPERTY name:plusK visibility:public modality:FINAL [delegated,val]
@@ -67,7 +67,7 @@ FILE fqName:<root> fileName:/memberExtension.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-plusK> (): IrErrorType declared in <root>.Host'
             ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Host.StringDelegate.getValue]>#' type=IrErrorType
-              ERROR_CALL 'Unresolved reference: this#' type=<root>.Host
+              GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host origin=null
               PROPERTY_REFERENCE 'public final plusK: IrErrorType [delegated,val]' field='FIELD DELEGATE name:plusK$delegate type:<root>.Host.StringDelegate visibility:private [final]' getter=null setter=null type=kotlin.reflect.KProperty<*> origin=null
     PROPERTY name:ok visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:ok type:IrErrorType visibility:public [final]
diff --git a/compiler/testData/ir/irText/expressions/assignments.fir.txt b/compiler/testData/ir/irText/expressions/assignments.fir.txt
index 006b3424d22..61f46f42ff1 100644
--- a/compiler/testData/ir/irText/expressions/assignments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.fir.txt
@@ -51,5 +51,6 @@ FILE fqName:<root> fileName:/assignments.kt
   FUN name:test2 visibility:public modality:FINAL <> (r:<root>.Ref) returnType:kotlin.Unit
     VALUE_PARAMETER name:r index:0 type:<root>.Ref
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_VAR 'r: <root>.Ref declared in <root>.test2' type=<root>.Ref origin=null
         value: CONST Int type=kotlin.Int value=0
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
index 3820fc7f431..fff46ebdb27 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
@@ -30,13 +30,13 @@ FILE fqName:<root> fileName:/augmentedAssignment1.kt
         CONST Int type=kotlin.Int value=5
   FUN name:testProperty visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=1
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=2
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=3
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=4
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=5
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
index 05c9c05a60e..166b8899456 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
@@ -63,13 +63,13 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
         CONST String type=<root>.A value="*="
   FUN name:testProperty visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=<root>.A origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=kotlin.Unit origin=null
         value: CONST String type=<root>.A value="+="
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=<root>.A origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=kotlin.Unit origin=null
         value: CONST String type=<root>.A value="-="
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=<root>.A origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=kotlin.Unit origin=null
         value: CONST String type=<root>.A value="*="
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=<root>.A origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=kotlin.Unit origin=null
         value: CONST String type=<root>.A value="/="
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=<root>.A origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static]' type=kotlin.Unit origin=null
         value: CONST String type=<root>.A value="%="
diff --git a/compiler/testData/ir/irText/expressions/calls.fir.txt b/compiler/testData/ir/irText/expressions/calls.fir.txt
index e330d0c166a..bb3055ec700 100644
--- a/compiler/testData/ir/irText/expressions/calls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/calls.fir.txt
@@ -25,14 +25,14 @@ FILE fqName:<root> fileName:/calls.kt
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun ext1 (): kotlin.Int declared in <root>'
-        ERROR_CALL 'Unresolved reference: this#' type=kotlin.Int
+        GET_VAR '<this>: kotlin.Int declared in <root>.ext1' type=kotlin.Int origin=null
   FUN name:ext2 visibility:public modality:FINAL <> ($receiver:kotlin.Int, x:kotlin.Int) returnType:kotlin.Int
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
     VALUE_PARAMETER name:x index:0 type:kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun ext2 (x: kotlin.Int): kotlin.Int declared in <root>'
         CALL 'public final fun foo (x: kotlin.Int, y: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          x: ERROR_CALL 'Unresolved reference: this#' type=kotlin.Int
+          x: GET_VAR '<this>: kotlin.Int declared in <root>.ext2' type=kotlin.Int origin=null
           y: GET_VAR 'x: kotlin.Int declared in <root>.ext2' type=kotlin.Int origin=null
   FUN name:ext3 visibility:public modality:FINAL <> ($receiver:kotlin.Int, x:kotlin.Int) returnType:kotlin.Int
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt b/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
index d9f18977b5b..ddd987d97ee 100644
--- a/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
+++ b/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun castExtFun <T> (): T of <root>.castExtFun declared in <root>'
         TYPE_OP type=T of <root>.castExtFun origin=CAST typeOperand=T of <root>.castExtFun
-          ERROR_CALL 'Unresolved reference: this#' type=kotlin.Any
+          GET_VAR '<this>: kotlin.Any declared in <root>.castExtFun' type=kotlin.Any origin=null
   PROPERTY name:castExtVal visibility:public modality:FINAL [val]
     FUN name:<get-castExtVal> visibility:public modality:FINAL <> () returnType:T of <uninitialized parent>
       correspondingProperty: PROPERTY name:castExtVal visibility:public modality:FINAL [val]
@@ -48,7 +48,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun castMemberExtFun (): T of <root>.Host declared in <root>.Host'
           TYPE_OP type=T of <root>.Host origin=CAST typeOperand=T of <root>.Host
-            ERROR_CALL 'Unresolved reference: this#' type=kotlin.Any
+            GET_VAR '<this>: kotlin.Any declared in <root>.Host.castMemberExtFun' type=kotlin.Any origin=null
     FUN name:castGenericMemberExtFun visibility:public modality:FINAL <TF> ($this:<root>.Host, $receiver:kotlin.Any) returnType:TF of <root>.Host.castGenericMemberExtFun
       TYPE_PARAMETER name:TF index:0 variance: superTypes:[]
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
@@ -56,7 +56,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun castGenericMemberExtFun <TF> (): TF of <root>.Host.castGenericMemberExtFun declared in <root>.Host'
           TYPE_OP type=TF of <root>.Host.castGenericMemberExtFun origin=CAST typeOperand=TF of <root>.Host.castGenericMemberExtFun
-            ERROR_CALL 'Unresolved reference: this#' type=kotlin.Any
+            GET_VAR '<this>: kotlin.Any declared in <root>.Host.castGenericMemberExtFun' type=kotlin.Any origin=null
     PROPERTY name:castMemberExtVal visibility:public modality:FINAL [val]
       FUN name:<get-castMemberExtVal> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:T of <root>.Host
         correspondingProperty: PROPERTY name:castMemberExtVal visibility:public modality:FINAL [val]
@@ -64,7 +64,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-castMemberExtVal> (): T of <root>.Host declared in <root>.Host'
             TYPE_OP type=T of <root>.Host origin=CAST typeOperand=T of <root>.Host
-              ERROR_CALL 'Unresolved reference: this#' type=<root>.Host<T of <root>.Host>
+              GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host<T of <root>.Host> origin=null
     PROPERTY name:castGenericMemberExtVal visibility:public modality:FINAL [val]
       FUN name:<get-castGenericMemberExtVal> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:TV of <uninitialized parent>
         correspondingProperty: PROPERTY name:castGenericMemberExtVal visibility:public modality:FINAL [val]
@@ -72,7 +72,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-castGenericMemberExtVal> (): TV of <uninitialized parent> declared in <root>.Host'
             TYPE_OP type=TV of <uninitialized parent> origin=CAST typeOperand=TV of <uninitialized parent>
-              ERROR_CALL 'Unresolved reference: this#' type=<root>.Host<T of <root>.Host>
+              GET_VAR '<this>: <root>.Host declared in <root>.Host' type=<root>.Host<T of <root>.Host> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
index ae5d0adaaa2..5be2d34b4a2 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
@@ -9,12 +9,12 @@ FILE fqName:<root> fileName:/chainOfSafeCalls.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.C
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun foo (): <root>.C declared in <root>.C'
-          ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+          GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
     FUN name:bar visibility:public modality:FINAL <> ($this:<root>.C) returnType:<root>.C?
       $this: VALUE_PARAMETER name:<this> type:<root>.C
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun bar (): <root>.C? declared in <root>.C'
-          ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+          GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
index 4554a665f4c..a552e17e9ff 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
@@ -21,7 +21,9 @@ FILE fqName:<root> fileName:/coercionToUnit.kt
     BLOCK_BODY
       CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
         $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+          receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
         x: CONST String type=kotlin.String value="Hello,"
       CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
         $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+          receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
         x: CONST String type=kotlin.String value="world!"
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
index 60427ba3139..8983688dfae 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
@@ -145,21 +145,24 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
       VAR name:<unary> type:kotlin.Int [val]
         CALL 'public final fun <get-x1> (): kotlin.Int declared in <root>.X1' type=kotlin.Int origin=null
           $this: GET_OBJECT 'CLASS OBJECT name:X1 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_OBJECT 'CLASS OBJECT name:X1 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1
         value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
       VAR name:<unary> type:kotlin.Int [val]
         CALL 'public final fun <get-x2> (): kotlin.Int declared in <root>.X1.X2' type=kotlin.Int origin=null
           $this: GET_OBJECT 'CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1.X2
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_OBJECT 'CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1.X2
         value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
       VAR name:<unary> type:kotlin.Int [val]
         CALL 'public final fun <get-x3> (): kotlin.Int declared in <root>.X1.X2.X3' type=kotlin.Int origin=null
           $this: GET_OBJECT 'CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1.X2.X3
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_OBJECT 'CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.X1.X2.X3
         value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
@@ -215,7 +218,8 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
       $receiver: VALUE_PARAMETER name:<this> type:<root>.B
       VALUE_PARAMETER name:b index:0 type:<root>.B
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+          receiver: GET_VAR '<this>: <root>.B declared in <root>.Host.plusAssign' type=<root>.B origin=null
           value: CALL 'public final fun <get-s> (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
             $this: GET_VAR 'b: <root>.B declared in <root>.Host.plusAssign' type=<root>.B origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
index e8c3dd5becc..161c735182a 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
@@ -37,7 +37,7 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
       FUN name:bar visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:kotlin.Unit
         $this: VALUE_PARAMETER name:<this> type:<root>.MyEnum.Z
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: CONST Int type=kotlin.Int value=1
           CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
       PROPERTY name:aLambda visibility:public modality:FINAL [val]
@@ -47,7 +47,7 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:kotlin.Unit
                 $this: VALUE_PARAMETER name:<this> type:<root>.MyEnum.Z
                 BLOCK_BODY
-                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aLambda> visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:kotlin.Function0<kotlin.Unit>
@@ -69,13 +69,13 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
                     INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
                 ANONYMOUS_INITIALIZER isStatic=false
                   BLOCK_BODY
-                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                       value: CONST Int type=kotlin.Int value=1
                     CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
                 FUN name:test visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z.anObject.<no name provided>) returnType:kotlin.Unit
                   $this: VALUE_PARAMETER name:<this> type:<root>.MyEnum.Z.anObject.<no name provided>
                   BLOCK_BODY
-                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                       value: CONST Int type=kotlin.Int value=1
                     CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
               CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.MyEnum.Z.anObject.<no name provided>' type=<root>.MyEnum.Z.anObject.<no name provided> origin=null
diff --git a/compiler/testData/ir/irText/expressions/field.fir.txt b/compiler/testData/ir/irText/expressions/field.fir.txt
index 00096ff9bc2..5e83710d0f5 100644
--- a/compiler/testData/ir/irText/expressions/field.fir.txt
+++ b/compiler/testData/ir/irText/expressions/field.fir.txt
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/field.kt
       correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var]
       VALUE_PARAMETER name:value index:0 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
           value: GET_VAR 'value: kotlin.Int declared in <root>.<set-testSimple>' type=kotlin.Int origin=null
   PROPERTY name:testAugmented visibility:public modality:FINAL [var]
     FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]
@@ -27,5 +27,5 @@ FILE fqName:<root> fileName:/field.kt
       correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var]
       VALUE_PARAMETER name:value index:0 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
           value: GET_VAR 'value: kotlin.Int declared in <root>.<set-testAugmented>' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
index c504e11c56d..da0f81300f9 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
@@ -82,7 +82,7 @@ FILE fqName:<root> fileName:/forWithImplicitReceivers.kt
           BLOCK type=kotlin.Int origin=null
             VAR name:<unary> type:kotlin.Int [val]
               CALL 'public final fun <get-value> (): kotlin.Int declared in <root>.IntCell' type=kotlin.Int origin=null
-            SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+            SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
               value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
                 $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.IReceiver.next' type=kotlin.Int origin=null
             GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.IReceiver.next' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
index f6b27dc62f9..62845df2d3c 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
@@ -168,9 +168,9 @@ FILE fqName:<root> fileName:/genericPropertyRef.kt
       correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [var]
       VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent>
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:public [static]' type=kotlin.Any? origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:public [static]' type=kotlin.Unit origin=null
           value: ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:public [static]' type=kotlin.Any? origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:public [static]' type=kotlin.Unit origin=null
           value: GET_VAR 'value: T of <uninitialized parent> declared in <root>.<set-bar>' type=T of <uninitialized parent> origin=null
   PROPERTY name:barRef visibility:public modality:FINAL [val]
     FIELD PROPERTY_BACKING_FIELD name:barRef type:kotlin.String.Companion visibility:public [final,static]
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
index 85189d22e39..281b4715245 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
@@ -7,8 +7,8 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
         WHEN type=kotlin.Any? origin=IF
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=T of <root>.test1
-              ERROR_CALL 'Unresolved reference: this#' type=kotlin.Any
-            then: ERROR_CALL 'Unresolved reference: this#' type=kotlin.Any
+              GET_VAR '<this>: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
+            then: GET_VAR '<this>: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Null type=kotlin.Nothing? value=null
diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
index a6567b26b60..a10f29e63c2 100644
--- a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
+++ b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
@@ -72,7 +72,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val]
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
             value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPrefix' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
@@ -80,7 +80,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val]
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
             value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPrefix' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
@@ -90,7 +90,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val]
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
             value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
@@ -98,7 +98,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val]
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
             value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
index 0f519e80993..8208b45f5f4 100644
--- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/Derived.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.Base]'
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=0
     FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.Derived) returnType:kotlin.Int
       $this: VALUE_PARAMETER name:<this> type:<root>.Derived
@@ -18,7 +18,8 @@ FILE fqName:<root> fileName:/Derived.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.Derived
       VALUE_PARAMETER name:value index:0 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+          receiver: GET_VAR '<this>: <root>.Derived declared in <root>.Derived' type=<root>.Derived origin=null
           value: GET_VAR 'value: kotlin.Int declared in <root>.Derived.setValue' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
index cf5f0f0784f..778e2bd9adf 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
@@ -3,6 +3,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
     BLOCK_BODY
       CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
         $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+          receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
         x: CONST String type=kotlin.String value="testFun"
   PROPERTY name:testProp visibility:public modality:FINAL [var]
     FUN name:<get-testProp> visibility:public modality:FINAL <> () returnType:kotlin.Any
@@ -10,6 +11,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
       BLOCK_BODY
         CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           x: CONST String type=kotlin.String value="testProp/get"
         RETURN type=kotlin.Nothing from='public final fun <get-testProp> (): kotlin.Any declared in <root>'
           CONST Int type=kotlin.Any value=42
@@ -19,6 +21,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
       BLOCK_BODY
         CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           x: CONST String type=kotlin.String value="testProp/set"
   CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass
@@ -35,6 +38,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
               then: BLOCK type=kotlin.Int origin=null
                 CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
                   $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+                    receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
                   x: CONST String type=kotlin.String value="TestClass/test"
                 CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> ($this:<root>.TestClass) returnType:kotlin.Int
@@ -48,6 +52,7 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
       BLOCK_BODY
         CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
           $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:System modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           x: CONST String type=kotlin.String value="TestClass/init"
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/expressions/kt16904.fir.txt b/compiler/testData/ir/irText/expressions/kt16904.fir.txt
index a6e84b1f61e..1608ce5f6b3 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.fir.txt
@@ -75,9 +75,9 @@ FILE fqName:<root> fileName:/kt16904.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
     CONSTRUCTOR visibility:public <> () returnType:<root>.Test1
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:<root>.B visibility:public [final]' type=<root>.B origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:<root>.B visibility:public [final]' type=kotlin.Unit origin=null
           value: CONST Int type=<root>.B value=42
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=42
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[<root>.A]'
@@ -102,7 +102,7 @@ FILE fqName:<root> fileName:/kt16904.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.J]'
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:field type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:field type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=42
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/expressions/kt30020.fir.txt b/compiler/testData/ir/irText/expressions/kt30020.fir.txt
index 36c91365d41..6e59fe7419b 100644
--- a/compiler/testData/ir/irText/expressions/kt30020.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt30020.fir.txt
@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/kt30020.kt
       FUN name:testOuterThis visibility:public modality:FINAL <> ($this:<root>.AML.Inner) returnType:kotlin.Unit
         $this: VALUE_PARAMETER name:<this> type:<root>.AML.Inner
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: this@AML' type=IrErrorType
+          ERROR_CALL 'Unresolved reference: this@AML#' type=IrErrorType
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/objectReference.fir.txt b/compiler/testData/ir/irText/expressions/objectReference.fir.txt
index e46e9888e73..9fe4f187de2 100644
--- a/compiler/testData/ir/irText/expressions/objectReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectReference.fir.txt
@@ -30,10 +30,11 @@ FILE fqName:<root> fileName:/objectReference.kt
     FUN name:bar visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Z
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
           value: CONST Int type=kotlin.Int value=1
         CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+          receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
           value: CONST Int type=kotlin.Int value=1
         CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
           $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
@@ -45,20 +46,22 @@ FILE fqName:<root> fileName:/objectReference.kt
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Nested modality:FINAL visibility:public superTypes:[kotlin.Any]'
       ANONYMOUS_INITIALIZER isStatic=false
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: CONST Int type=kotlin.Int value=1
           CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+            receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
             value: CONST Int type=kotlin.Int value=1
           CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
             $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
       FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.Nested) returnType:kotlin.Unit
         $this: VALUE_PARAMETER name:<this> type:<root>.Z.Nested
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
             value: CONST Int type=kotlin.Int value=1
           CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+            receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
             value: CONST Int type=kotlin.Int value=1
           CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
             $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
@@ -82,10 +85,11 @@ FILE fqName:<root> fileName:/objectReference.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
               $this: VALUE_PARAMETER name:<this> type:<root>.Z
               BLOCK_BODY
-                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                   value: CONST Int type=kotlin.Int value=1
                 CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+                  receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
                   value: CONST Int type=kotlin.Int value=1
                 CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
                   $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
@@ -108,20 +112,22 @@ FILE fqName:<root> fileName:/objectReference.kt
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
               ANONYMOUS_INITIALIZER isStatic=false
                 BLOCK_BODY
-                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+                    receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
                     $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
               FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.anObject.<no name provided>) returnType:kotlin.Unit
                 $this: VALUE_PARAMETER name:<this> type:<root>.Z.anObject.<no name provided>
                 BLOCK_BODY
-                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+                    receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
                     $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
@@ -149,10 +155,11 @@ FILE fqName:<root> fileName:/objectReference.kt
   FUN name:test visibility:public modality:FINAL <> ($receiver:<root>.Z) returnType:kotlin.Unit
     $receiver: VALUE_PARAMETER name:<this> type:<root>.Z
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=1
       CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
         value: CONST Int type=kotlin.Int value=1
       CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
         $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
index e2533a2f314..042aafd71b7 100644
--- a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
+++ b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
@@ -135,7 +135,7 @@ FILE fqName:<root> fileName:/propertyReferences.kt
       correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var]
       VALUE_PARAMETER name:value index:0 type:kotlin.Int
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null
           value: GET_VAR 'value: kotlin.Int declared in <root>.<set-varWithBackingFieldAndAccessors>' type=kotlin.Int origin=null
   PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val]
     FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [final,static]
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt b/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
index 5fbb602d307..91a6f542596 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
@@ -41,5 +41,6 @@ FILE fqName:<root> fileName:/safeAssignment.kt
   FUN name:test visibility:public modality:FINAL <> (nc:<root>.C?) returnType:kotlin.Unit
     VALUE_PARAMETER name:nc index:0 type:<root>.C?
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_VAR 'nc: <root>.C? declared in <root>.test' type=<root>.C? origin=null
         value: CONST Int type=kotlin.Int? value=42
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
index 46cd1b835af..00d8591045f 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
@@ -33,7 +33,7 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun inc (): kotlin.Int? declared in test'
         CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-          $this: ERROR_CALL 'Unresolved reference: this#' type=kotlin.Int?
+          $this: GET_VAR '<this>: kotlin.Int? declared in test.inc' type=kotlin.Int? origin=null
   FUN name:get visibility:public modality:FINAL <> ($receiver:kotlin.Int?, index:kotlin.Int) returnType:kotlin.Int
     $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int?
     VALUE_PARAMETER name:index index:0 type:kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
index 996e7d83c1d..67fcbe69f31 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
@@ -81,7 +81,8 @@ FILE fqName:<root> fileName:/safeCalls.kt
   FUN name:test4 visibility:public modality:FINAL <> (x:<root>.Ref?) returnType:kotlin.Unit
     VALUE_PARAMETER name:x index:0 type:<root>.Ref?
     BLOCK_BODY
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
+        receiver: GET_VAR 'x: <root>.Ref? declared in <root>.test4' type=<root>.Ref? origin=null
         value: CONST Int type=kotlin.Int? value=0
   FUN name:test5 visibility:public modality:FINAL <> ($receiver:<root>.IHost, s:kotlin.String?) returnType:kotlin.Int
     $receiver: VALUE_PARAMETER name:<this> type:<root>.IHost
diff --git a/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt b/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
index 4ceef152aca..9fe1ea2dde6 100644
--- a/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
@@ -5,21 +5,21 @@ FILE fqName:<root> fileName:/samOperators.kt
     $receiver: VALUE_PARAMETER name:<this> type:<root>.J
     BLOCK_BODY
       CALL 'public open fun get (k: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.J
+        $this: GET_VAR '<this>: <root>.J declared in <root>.test1' type=<root>.J origin=null
         k: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
       CALL 'public open fun get (k: java.lang.Runnable?, m: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.J
+        $this: GET_VAR '<this>: <root>.J declared in <root>.test1' type=<root>.J origin=null
         k: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
         m: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
   FUN name:test2 visibility:public modality:FINAL <> ($receiver:<root>.J) returnType:kotlin.Unit
     $receiver: VALUE_PARAMETER name:<this> type:<root>.J
     BLOCK_BODY
       CALL 'public open fun set (k: java.lang.Runnable?, v: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.J
+        $this: GET_VAR '<this>: <root>.J declared in <root>.test2' type=<root>.J origin=null
         k: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
         v: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
       CALL 'public open fun set (k: java.lang.Runnable?, m: java.lang.Runnable?, v: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        $this: ERROR_CALL 'Unresolved reference: this#' type=<root>.J
+        $this: GET_VAR '<this>: <root>.J declared in <root>.test2' type=<root>.J origin=null
         k: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
         m: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
         v: ERROR_CALL 'Unsupported callable reference: ::<Unresolved name: f>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
index 2f9245e4bf9..2d4e13b6e43 100644
--- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
+++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
@@ -14,7 +14,7 @@ FILE fqName:<root> fileName:/Derived.kt
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String
               GET_VAR 'v: kotlin.Any declared in <root>.Derived.setValue' type=kotlin.Any origin=null
             then: BLOCK type=kotlin.Unit origin=null
-              SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.String? origin=null
+              SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=null
                 value: GET_VAR 'v: kotlin.Any declared in <root>.Derived.setValue' type=kotlin.Any origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
diff --git a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
index fedbd73d770..298140214b4 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
@@ -17,7 +17,7 @@ FILE fqName:<root> fileName:/temporaryInInitBlock.kt
               receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<get-s>' type=<root>.C origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final]' type=kotlin.String? origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final]' type=kotlin.Unit origin=null
           value: CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
             $this: GET_VAR 'x: kotlin.Any? declared in <root>.C.<init>' type=kotlin.Any? origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
diff --git a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
index 3b49a1a2b2d..51d4fdf7a29 100644
--- a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
+++ b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
@@ -9,7 +9,7 @@ FILE fqName:<root> fileName:/thisReferenceBeforeClassDeclared.kt
             CONSTRUCTOR visibility:private <> () returnType:<root>.WithCompanion [primary]
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (a: <root>.WithCompanion.Companion) [primary] declared in <root>.WithCompanion'
-                  a: ERROR_CALL 'Unresolved reference: this#' type=<root>.WithCompanion
+                  a: GET_VAR '<this>: <root>.WithCompanion declared in <root>.test' type=<root>.WithCompanion origin=null
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.WithCompanion]'
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=null
       VAR name:test2 type:<root>.WithCompanion [val]
@@ -39,7 +39,7 @@ FILE fqName:<root> fileName:/thisReferenceBeforeClassDeclared.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.WithCompanion.Companion
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun foo (): <root>.WithCompanion.Companion declared in <root>.WithCompanion.Companion'
-            ERROR_CALL 'Unresolved reference: this#' type=<root>.WithCompanion.Companion
+            GET_VAR '<this>: <root>.WithCompanion.Companion declared in <root>.WithCompanion.Companion' type=<root>.WithCompanion.Companion origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
index 331d57eca61..6b93d896063 100644
--- a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
+++ b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
       $receiver: VALUE_PARAMETER name:<this> type:T of <root>.I.fromInterface
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun fromInterface <T> (): T of <root>.I.fromInterface declared in <root>.I'
-          ERROR_CALL 'Unresolved reference: this#' type=T of <root>.I.fromInterface
+          GET_VAR '<this>: T of <root>.I.fromInterface declared in <root>.I.fromInterface' type=T of <root>.I.fromInterface origin=null
     FUN name:genericFromSuper visibility:public modality:OPEN <> ($this:<root>.I, g:G of <root>.I) returnType:G of <root>.I
       $this: VALUE_PARAMETER name:<this> type:<root>.I
       VALUE_PARAMETER name:g index:0 type:G of <root>.I
@@ -40,7 +40,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.BaseClass
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-fromClass> (): T of <uninitialized parent> declared in <root>.BaseClass'
-            ERROR_CALL 'Unresolved reference: this#' type=<root>.BaseClass
+            GET_VAR '<this>: <root>.BaseClass declared in <root>.BaseClass' type=<root>.BaseClass origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -117,7 +117,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.C
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-g2> (): T of <uninitialized parent> declared in <root>.C'
-            ERROR_CALL 'Unresolved reference: this#' type=<root>.C
+            GET_VAR '<this>: <root>.C declared in <root>.C' type=<root>.C origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -178,7 +178,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
               arg1: CONST Int type=kotlin.Int value=4
           then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
             CONST String type=kotlin.String value="4"
-      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Unit origin=null
         value: CONST Int type=kotlin.Int value=5
       WHEN type=kotlin.Unit origin=IF
         BRANCH
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
index a00aef9ba84..aeaddff6437 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/variableAsFunctionCall.kt
         FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
             BLOCK_BODY
-              ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+              GET_VAR '<this>: kotlin.String declared in <root>.k' type=kotlin.String origin=null
   FUN name:test1 visibility:public modality:FINAL <> (f:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:f index:0 type:kotlin.Function0<kotlin.Unit>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
index 70a270ca63d..b14c20e7178 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
@@ -9,7 +9,7 @@ FILE fqName:<root> fileName:/builtinMap.kt
         WHEN type=kotlin.collections.Map<K1 of <root>.plus, V1 of <root>.plus> origin=IF
           BRANCH
             if: CALL 'public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Map' type=kotlin.Boolean origin=null
-              $this: ERROR_CALL 'Unresolved reference: this#' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus>
+              $this: GET_VAR '<this>: kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> origin=null
             then: CALL 'public final fun mapOf (pair: kotlin.Pair<K of <uninitialized parent>, V of <uninitialized parent>>): kotlin.collections.Map<K of <uninitialized parent>, V of <uninitialized parent>> declared in kotlin.collections' type=kotlin.collections.Map<K1 of <root>.plus, V1 of <root>.plus> origin=null
               pair: GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
           BRANCH
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/builtinMap.kt
               $receiver: CONSTRUCTOR_CALL 'public constructor <init> (<anonymous Java parameter>: kotlin.collections.Map<out K of java.util.LinkedHashMap, out V of java.util.LinkedHashMap>?) declared in java.util.LinkedHashMap' type=java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus> origin=null
                 <class: K>: <none>
                 <class: V>: <none>
-                <anonymous Java parameter>: ERROR_CALL 'Unresolved reference: this#' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus>
+                <anonymous Java parameter>: GET_VAR '<this>: kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.collections.Map<out K1 of <root>.plus, V1 of <root>.plus> origin=null
               block: FUN_EXPR type=kotlin.Function2<java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>, java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>, kotlin.Unit> origin=LAMBDA
                 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>) returnType:kotlin.Unit
                   VALUE_PARAMETER name:it index:0 type:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
index cafbcf9c988..0d4cbd54a4e 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
@@ -3,6 +3,7 @@ FILE fqName:<root> fileName:/javaEnum.kt
     FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum? visibility:public [final,static]
       EXPRESSION_BODY
         GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:ONE type:<root>.JEnum? visibility:public [final,static]' type=<root>.JEnum? origin=GET_PROPERTY
+          receiver: GET_OBJECT 'CLASS ENUM_CLASS name:JEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.JEnum>]' type=kotlin.Unit
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:<root>.JEnum?
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
       BLOCK_BODY
diff --git a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
index d7b37e0e0d6..071cc03ed7a 100644
--- a/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
+++ b/compiler/testData/ir/irText/types/asOnPlatformType.fir.txt
@@ -19,11 +19,11 @@ FILE fqName:<root> fileName:/asOnPlatformType.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo <T> (): T of <root>.foo [inline] declared in <root>'
         TYPE_OP type=T of <root>.foo origin=CAST typeOperand=T of <root>.foo
-          ERROR_CALL 'Unresolved reference: this#' type=T of <root>.foo
+          GET_VAR '<this>: T of <root>.foo declared in <root>.foo' type=T of <root>.foo origin=null
   FUN name:fooN visibility:public modality:FINAL <T> ($receiver:T of <root>.fooN) returnType:T of <root>.fooN? [inline]
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     $receiver: VALUE_PARAMETER name:<this> type:T of <root>.fooN
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun fooN <T> (): T of <root>.fooN? [inline] declared in <root>'
         TYPE_OP type=T of <root>.fooN? origin=CAST typeOperand=T of <root>.fooN?
-          ERROR_CALL 'Unresolved reference: this#' type=T of <root>.fooN
+          GET_VAR '<this>: T of <root>.fooN declared in <root>.fooN' type=T of <root>.fooN origin=null
diff --git a/compiler/testData/ir/irText/types/intersectionType3_NI.fir.txt b/compiler/testData/ir/irText/types/intersectionType3_NI.fir.txt
index 07938c7dafe..706512e887a 100644
--- a/compiler/testData/ir/irText/types/intersectionType3_NI.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType3_NI.fir.txt
@@ -21,13 +21,13 @@ FILE fqName:<root> fileName:/intersectionType3_NI.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun isT <T> (): kotlin.Boolean [inline] declared in <root>'
         TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=T of <root>.isT
-          ERROR_CALL 'Unresolved reference: this#' type=<root>.In<T of <root>.isT>
+          GET_VAR '<this>: <root>.In<T of <root>.isT> declared in <root>.isT' type=<root>.In<T of <root>.isT> origin=null
   FUN name:asT visibility:public modality:FINAL <T> ($receiver:<root>.In<T of <root>.asT>) returnType:kotlin.Unit [inline]
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     $receiver: VALUE_PARAMETER name:<this> type:<root>.In<T of <root>.asT>
     BLOCK_BODY
       TYPE_OP type=T of <root>.asT origin=CAST typeOperand=T of <root>.asT
-        ERROR_CALL 'Unresolved reference: this#' type=<root>.In<T of <root>.asT>
+        GET_VAR '<this>: <root>.In<T of <root>.asT> declared in <root>.asT' type=<root>.In<T of <root>.asT> origin=null
   FUN name:sel visibility:public modality:FINAL <S> (x:S of <root>.sel, y:S of <root>.sel) returnType:S of <root>.sel
     TYPE_PARAMETER name:S index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:S of <root>.sel
diff --git a/compiler/testData/ir/irText/types/intersectionType3_OI.fir.txt b/compiler/testData/ir/irText/types/intersectionType3_OI.fir.txt
index 49f69cdef24..371fbe5ef0e 100644
--- a/compiler/testData/ir/irText/types/intersectionType3_OI.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType3_OI.fir.txt
@@ -21,13 +21,13 @@ FILE fqName:<root> fileName:/intersectionType3_OI.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun isT <T> (): kotlin.Boolean [inline] declared in <root>'
         TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=T of <root>.isT
-          ERROR_CALL 'Unresolved reference: this#' type=<root>.In<T of <root>.isT>
+          GET_VAR '<this>: <root>.In<T of <root>.isT> declared in <root>.isT' type=<root>.In<T of <root>.isT> origin=null
   FUN name:asT visibility:public modality:FINAL <T> ($receiver:<root>.In<T of <root>.asT>) returnType:kotlin.Unit [inline]
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     $receiver: VALUE_PARAMETER name:<this> type:<root>.In<T of <root>.asT>
     BLOCK_BODY
       TYPE_OP type=T of <root>.asT origin=CAST typeOperand=T of <root>.asT
-        ERROR_CALL 'Unresolved reference: this#' type=<root>.In<T of <root>.asT>
+        GET_VAR '<this>: <root>.In<T of <root>.asT> declared in <root>.asT' type=<root>.In<T of <root>.asT> origin=null
   FUN name:sel visibility:public modality:FINAL <S> (x:S of <root>.sel, y:S of <root>.sel) returnType:S of <root>.sel
     TYPE_PARAMETER name:S index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:S of <root>.sel
diff --git a/compiler/testData/ir/irText/types/platformTypeReceiver.fir.txt b/compiler/testData/ir/irText/types/platformTypeReceiver.fir.txt
index 809e2ea1a62..2ee02e1e886 100644
--- a/compiler/testData/ir/irText/types/platformTypeReceiver.fir.txt
+++ b/compiler/testData/ir/irText/types/platformTypeReceiver.fir.txt
@@ -4,6 +4,7 @@ FILE fqName:<root> fileName:/platformTypeReceiver.kt
       RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Boolean declared in <root>'
         CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
           $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:kotlin.Boolean? visibility:public [static]' type=kotlin.Boolean? origin=GET_PROPERTY
+            receiver: GET_OBJECT 'CLASS CLASS name:J modality:OPEN visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           other: CONST Null type=kotlin.Nothing? value=null
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Boolean
     BLOCK_BODY