diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
index 50bf2187fed..a6073165cec 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
@@ -1,13 +1,13 @@
 FILE: F.kt
-    public? open class A : kotlin/Any {
+    public? open class A : R|kotlin/Any| {
         public? constructor(): R|A| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
     public? final? class B : A {
         public? constructor(): R|B| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
index 17be018586d..e5f4290faa3 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
@@ -1,12 +1,12 @@
 FILE: NestedOfAliasedType.kt
-    public? abstract class A : kotlin/Any {
+    public? abstract class A : R|kotlin/Any| {
         public? constructor(): R|A| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
-        public? abstract class Nested : kotlin/Any {
+        public? abstract class Nested : R|kotlin/Any| {
             public? constructor(): R|A.Nested| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
index 4142b5d64c5..c317afc75d0 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
@@ -1,7 +1,7 @@
 FILE: NestedSuperType.kt
-    public? abstract class My : kotlin/Any {
+    public? abstract class My : R|kotlin/Any| {
         public? constructor(): R|p/My| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? abstract class NestedOne : My {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
index 909197e2332..3b1647e8fa1 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -1,18 +1,18 @@
 FILE: complexTypes.kt
-    public? final? class C<T, out S> : kotlin/Any {
+    public? final? class C<T, out S> : R|kotlin/Any| {
         public? constructor<T, S>(): R|a/b/C<T, S>| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
-        public? final? inner class D<R, in P> : kotlin/Any {
+        public? final? inner class D<R, in P> : R|kotlin/Any| {
             public? constructor<R, P>(): R|a/b/C.D<R, P>| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
 
     }
-    public? final? interface Test : kotlin/Any {
+    public? final? interface Test : R|kotlin/Any| {
         public? final? val x: a.b.C<out CharSequence, *>.D<in List<*>, *>
             public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
index 0bc36e1adfd..a62783e521f 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
@@ -1,7 +1,7 @@
 FILE: derivedClass.kt
-    public? open class Base<T> : kotlin/Any {
+    public? open class Base<T> : R|kotlin/Any| {
         public? constructor<T>(x: T): R|Base<T>| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val x: T = R|<local>/x|
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
index 247eeee974d..4ec202412c1 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
@@ -1,34 +1,34 @@
 FILE: enums.kt
-    public? final? enum class Order : kotlin/Enum {
+    public? final? enum class Order : R|kotlin/Enum| {
         private constructor(): R|Order| {
-            super<kotlin/Enum>()
+            super<R|kotlin/Enum|>()
         }
 
-        public? final enum entry FIRST : kotlin/Any {
+        public? final enum entry FIRST : R|kotlin/Any| {
             public? constructor(): R|Order.FIRST| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
 
-        public? final enum entry SECOND : kotlin/Any {
+        public? final enum entry SECOND : R|kotlin/Any| {
             public? constructor(): R|Order.SECOND| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
 
-        public? final enum entry THIRD : kotlin/Any {
+        public? final enum entry THIRD : R|kotlin/Any| {
             public? constructor(): R|Order.THIRD| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
 
     }
-    public? final? enum class Planet : kotlin/Enum {
+    public? final? enum class Planet : R|kotlin/Enum| {
         public? constructor(m: Double, r: Double): R|Planet| {
-            super<kotlin/Enum>()
+            super<R|kotlin/Enum|>()
         }
 
         public? final? val m: Double = R|<local>/m|
@@ -42,7 +42,7 @@ FILE: enums.kt
                 super<Planet>(Double(1.0), Double(2.0))
             }
 
-            public? open? override fun sayHello(): kotlin/Unit {
+            public? open? override fun sayHello(): R|kotlin/Unit| {
                 println#(String(Hello!!!))
             }
 
@@ -53,7 +53,7 @@ FILE: enums.kt
                 super<Planet>(Double(3.0), Double(4.0))
             }
 
-            public? open? override fun sayHello(): kotlin/Unit {
+            public? open? override fun sayHello(): R|kotlin/Unit| {
                 println#(String(Ola!!!))
             }
 
@@ -64,7 +64,7 @@ FILE: enums.kt
                 super<Planet>(Double(5.0), Double(6.0))
             }
 
-            public? open? override fun sayHello(): kotlin/Unit {
+            public? open? override fun sayHello(): R|kotlin/Unit| {
                 println#(String(Privet!!!))
             }
 
@@ -73,11 +73,11 @@ FILE: enums.kt
         public? final? val g: Double = G#.times#(m#).div#(r#.times#(r#))
             public? get(): Double
 
-        public? abstract fun sayHello(): kotlin/Unit
+        public? abstract fun sayHello(): R|kotlin/Unit|
 
-        public? final? companion object Companion : kotlin/Any {
+        public? final? companion object Companion : R|kotlin/Any| {
             private constructor(): R|Planet.Companion| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
             public? final? const val G: <implicit> = Double(6.67E-11)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
index ec6db087c3d..24327963f58 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
@@ -1,21 +1,21 @@
 FILE: enums2.kt
-    public? final? interface Some : kotlin/Any {
+    public? final? interface Some : R|kotlin/Any| {
     }
     public? final? object O1 : Some {
         private constructor(): R|O1| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
     public? final? object O2 : Some {
         private constructor(): R|O2| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    public? final? enum class SomeEnum : kotlin/Enum {
+    public? final? enum class SomeEnum : R|kotlin/Enum| {
         public? constructor(x: Some): R|SomeEnum| {
-            super<kotlin/Enum>()
+            super<R|kotlin/Enum|>()
         }
 
         public? final? val x: Some = R|<local>/x|
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
index 7c1050dd840..848d81038e7 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
@@ -1,16 +1,16 @@
 FILE: expectActual.kt
-    public? final? expect class MyClass : kotlin/Any {
+    public? final? expect class MyClass : R|kotlin/Any| {
         public? constructor(): R|MyClass| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
     public? final? expect fun foo(): String
     public? final? expect val x: Int
         public? get(): Int
-    public? final? actual class MyClass : kotlin/Any {
+    public? final? actual class MyClass : R|kotlin/Any| {
         public? constructor(): R|MyClass| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
index 93876005dea..dce2180005d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
@@ -1,12 +1,12 @@
 FILE: genericFunctions.kt
-    public? final? interface Any : kotlin/Any {
+    public? final? interface Any : R|kotlin/Any| {
     }
     public? final? inline fun <reified T : Any> Any.safeAs(): T? {
         ^safeAs (this# as? T)
     }
-    public? abstract class Summator : kotlin/Any {
+    public? abstract class Summator : R|kotlin/Any| {
         public? constructor(): R|Summator| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? abstract fun <T> plus(first: T, second: T): T
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
index e640bbe7e2c..95071a2c119 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
@@ -1,16 +1,16 @@
 FILE: nestedClass.kt
-    public? abstract class Base : kotlin/Any {
+    public? abstract class Base : R|kotlin/Any| {
         public? constructor(s: String): R|Base| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val s: String = R|<local>/s|
             public? get(): String
 
     }
-    public? final? class Outer : kotlin/Any {
+    public? final? class Outer : R|kotlin/Any| {
         public? constructor(): R|Outer| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? class Derived : Base {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
index 8ef4ec0c976..ff9575ff5ef 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
@@ -1,10 +1,10 @@
 FILE: noPrimaryConstructor.kt
-    public? final? class NoPrimary : kotlin/Any {
+    public? final? class NoPrimary : R|kotlin/Any| {
         public? final? val x: String
             public? get(): String
 
         public? constructor(x: String): R|NoPrimary| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
             this#.x# = x#
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
index 1741285159f..dc4b7568277 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
@@ -1,5 +1,5 @@
 FILE: simpleClass.kt
-    public? final? interface SomeInterface : kotlin/Any {
+    public? final? interface SomeInterface : R|kotlin/Any| {
         public? final? fun foo(x: Int, y: String): String
 
         public? final? val bar: Boolean
@@ -8,7 +8,7 @@ FILE: simpleClass.kt
     }
     public? final? class SomeClass : SomeInterface {
         public? constructor(): R|SomeClass| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         private final? val baz: <implicit> = Int(42)
@@ -22,17 +22,17 @@ FILE: simpleClass.kt
             public? get(): Boolean {
                 ^ Boolean(true)
             }
-            public? set(value: Boolean): kotlin/Unit {
+            public? set(value: Boolean): R|kotlin/Unit| {
             }
 
         public? final? lateinit var fau: Double
             public? get(): Double
-            public? set(value: Double): kotlin/Unit
+            public? set(value: Double): R|kotlin/Unit|
 
     }
-    public? final? inline class InlineClass : kotlin/Any {
+    public? final? inline class InlineClass : R|kotlin/Any| {
         public? constructor(): R|InlineClass| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt
index 215967222aa..4cf57f30962 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt
@@ -1,5 +1,5 @@
 FILE: simpleFun.kt
-    public? final? fun foo(): kotlin/Unit {
+    public? final? fun foo(): R|kotlin/Unit| {
     }
-    public? final? suspend fun bar(): kotlin/Unit {
+    public? final? suspend fun bar(): R|kotlin/Unit| {
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
index dcec09ff45c..ab1e1c8ec85 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
@@ -1,10 +1,10 @@
 FILE: simpleTypeAlias.kt
-    public? final? interface B : kotlin/Any {
+    public? final? interface B : R|kotlin/Any| {
     }
     public? final typealias C = B
     public? final? class D : C {
         public? constructor(): R|D| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
index 97718fc93d2..023a934a6c7 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
@@ -1,16 +1,16 @@
 FILE: typeAliasWithGeneric.kt
-    public? open class A : kotlin/Any {
+    public? open class A : R|kotlin/Any| {
         public? constructor(): R|A| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    public? final? interface B<S, T : A> : kotlin/Any {
+    public? final? interface B<S, T : A> : R|kotlin/Any| {
     }
     public? final typealias C<T> = B<T, A>
     public? final? class D : C<A> {
         public? constructor(): R|D| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
index 0eb2186ef52..a36b1ab3daa 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -1,14 +1,14 @@
 FILE: typeParameterVsNested.kt
-    public? final? interface Some : kotlin/Any {
+    public? final? interface Some : R|kotlin/Any| {
     }
-    public? abstract class My<T : Some> : kotlin/Any {
+    public? abstract class My<T : Some> : R|kotlin/Any| {
         public? constructor<T : Some>(): R|test/My<T>| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
-        public? final? inner class T : kotlin/Any {
+        public? final? inner class T : R|kotlin/Any| {
             public? constructor(): R|test/My.T| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
         }
@@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt
         public? abstract val x: T
             public? get(): T
 
-        public? abstract fun foo(arg: T): kotlin/Unit
+        public? abstract fun foo(arg: T): R|kotlin/Unit|
 
         public? abstract val y: My.T
             public? get(): My.T
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
index d10cbd0509f..bcc413e419c 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    public? final? interface List<out T : Any> : kotlin/Any {
+    public? final? interface List<out T : Any> : R|kotlin/Any| {
         public? final? operator fun get(index: Int): T
 
         public? final? infix fun concat(other: List<T>): List<T>
@@ -9,7 +9,7 @@ FILE: typeParameters.kt
     public? final typealias AnyList = List<*>
     public? abstract class AbstractList<out T : Any> : List<T> {
         public? constructor<T : Any>(): R|AbstractList<T>| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
index 18ca68bda3f..0ac732679f3 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
@@ -1,11 +1,11 @@
 FILE: where.kt
-    public? final? interface A : kotlin/Any {
+    public? final? interface A : R|kotlin/Any| {
     }
-    public? final? interface B : kotlin/Any {
+    public? final? interface B : R|kotlin/Any| {
     }
-    public? final? class C<T : A, B> : kotlin/Any {
+    public? final? class C<T : A, B> : R|kotlin/Any| {
         public? constructor<T : A, B>(): R|C<T>| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
index f4ca57a9f3e..0478f1951a7 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
@@ -1,7 +1,7 @@
 FILE: annotated.kt
-    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Annotation {
+    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : R|kotlin/Annotation| {
         public? constructor(): R|Ann| {
-            super<kotlin/Annotation>()
+            super<R|kotlin/Annotation|>()
         }
 
     }
@@ -20,16 +20,16 @@ FILE: annotated.kt
 
         ^foo Int(42)
     }
-    public? final? data class Two : kotlin/Any {
+    public? final? data class Two : R|kotlin/Any| {
         public? constructor(x: Int, y: Int): R|Two| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public final fun copy(): R|Two| {
         }
 
     }
-    public? final? fun bar(two: Two): kotlin/Unit {
+    public? final? fun bar(two: Two): R|kotlin/Unit| {
         lval <destruct>: <implicit> = two#
         @Ann() lval x: <implicit> = R|<local>/<destruct>|.component1()
         @Ann() lval y: <implicit> = R|<local>/<destruct>|.component2()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
index 32ea59fe6e4..a4c2fef1518 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
@@ -4,9 +4,9 @@ FILE: arrayAccess.kt
     public? final? fun foo(): <implicit> {
         ^foo Int(1)
     }
-    public? final? class Wrapper : kotlin/Any {
+    public? final? class Wrapper : R|kotlin/Any| {
         public? constructor(v: IntArray): R|Wrapper| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val v: IntArray = R|<local>/v|
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt
index 492c8f8775e..4594ef549f9 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt
@@ -1,11 +1,11 @@
 FILE: arrayAssignment.kt
-    public? final? fun test(): kotlin/Unit {
+    public? final? fun test(): R|kotlin/Unit| {
         lval x: <implicit> = intArrayOf#(Int(1), Int(2), Int(3))
         x#.set#(Int(1), Int(0))
     }
     public? final? fun foo(): <implicit> {
         ^foo Int(1)
     }
-    public? final? fun test2(): kotlin/Unit {
+    public? final? fun test2(): R|kotlin/Unit| {
         intArrayOf#(Int(1), Int(2), Int(3)).set#(foo#(), Int(1))
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
index 5432560c1ed..ee1b1f931cc 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
@@ -1,19 +1,19 @@
 FILE: callableReferences.kt
-    public? final? class A : kotlin/Any {
+    public? final? class A : R|kotlin/Any| {
         public? constructor(): R|A| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
-        public? final? fun foo(): kotlin/Unit {
+        public? final? fun foo(): R|kotlin/Unit| {
         }
 
         public? final? val bar: <implicit> = Int(0)
             public? get(): <implicit>
 
     }
-    public? final? fun A.qux(): kotlin/Unit {
+    public? final? fun A.qux(): R|kotlin/Unit| {
     }
-    public? final? fun baz(): kotlin/Unit {
+    public? final? fun baz(): R|kotlin/Unit| {
     }
     public? final? val test1: <implicit> = A#()::foo#
         public? get(): <implicit>
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
index 1ae6cfa4a0d..4159c2f1f40 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
@@ -8,20 +8,20 @@ FILE: calls.kt
     public? final? fun testRegular(): Int {
         ^testRegular distance#(Int(3), Int(4))
     }
-    public? final? class My : kotlin/Any {
+    public? final? class My : R|kotlin/Any| {
         public? constructor(x: Int): R|My| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? var x: Int = R|<local>/x|
             public? get(): Int
-            public? set(value: Int): kotlin/Unit
+            public? set(value: Int): R|kotlin/Unit|
 
         public? final? operator fun invoke(): <implicit> {
             ^invoke x#
         }
 
-        public? final? fun foo(): kotlin/Unit {
+        public? final? fun foo(): R|kotlin/Unit| {
         }
 
         public? final? fun copy(): <implicit> {
@@ -32,7 +32,7 @@ FILE: calls.kt
     public? final? fun testInvoke(): Int {
         ^testInvoke invoke#(My#(Int(13)))
     }
-    public? final? fun testQualified(first: My, second: My?): kotlin/Unit {
+    public? final? fun testQualified(first: My, second: My?): R|kotlin/Unit| {
         println#(first#.x#)
         println#(second#?.x#)
         first#.foo#()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
index 04d94a1072c..d1e1881c15e 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
@@ -1,11 +1,11 @@
 FILE: classReference.kt
-    public? final? class A : kotlin/Any {
+    public? final? class A : R|kotlin/Any| {
         public? constructor(): R|test/A| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    public? final? fun test(): kotlin/Unit {
+    public? final? fun test(): R|kotlin/Unit| {
         <getClass>(A#)
         <getClass>(test#.A#)
         <getClass>(A#())
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
index 5647767fb33..5233e7a9732 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
@@ -1,52 +1,52 @@
 FILE: collectionLiterals.kt
-    public? final? annotation class Ann1 : kotlin/Annotation {
+    public? final? annotation class Ann1 : R|kotlin/Annotation| {
         public? constructor(arr: IntArray): R|Ann1| {
-            super<kotlin/Annotation>()
+            super<R|kotlin/Annotation|>()
         }
 
         public? final? val arr: IntArray = R|<local>/arr|
             public? get(): IntArray
 
     }
-    public? final? annotation class Ann2 : kotlin/Annotation {
+    public? final? annotation class Ann2 : R|kotlin/Annotation| {
         public? constructor(arr: DoubleArray): R|Ann2| {
-            super<kotlin/Annotation>()
+            super<R|kotlin/Annotation|>()
         }
 
         public? final? val arr: DoubleArray = R|<local>/arr|
             public? get(): DoubleArray
 
     }
-    public? final? annotation class Ann3 : kotlin/Annotation {
+    public? final? annotation class Ann3 : R|kotlin/Annotation| {
         public? constructor(arr: Array<String>): R|Ann3| {
-            super<kotlin/Annotation>()
+            super<R|kotlin/Annotation|>()
         }
 
         public? final? val arr: Array<String> = R|<local>/arr|
             public? get(): Array<String>
 
     }
-    @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : kotlin/Any {
+    @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : R|kotlin/Any| {
         public? constructor(): R|Zero| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First : kotlin/Any {
+    @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First : R|kotlin/Any| {
         public? constructor(): R|First| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second : kotlin/Any {
+    @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second : R|kotlin/Any| {
         public? constructor(): R|Second| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
-    @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third : kotlin/Any {
+    @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third : R|kotlin/Any| {
         public? constructor(): R|Third| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
index 9b35f5b5fdc..45629a37ef0 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
@@ -1,7 +1,7 @@
 FILE: destructuring.kt
-    public? final? data class Some : kotlin/Any {
+    public? final? data class Some : R|kotlin/Any| {
         public? constructor(first: Int, second: Double, third: String): R|Some| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val first: Int = R|<local>/first|
@@ -29,7 +29,7 @@ FILE: destructuring.kt
         }
 
     }
-    public? final? fun foo(some: Some): kotlin/Unit {
+    public? final? fun foo(some: Some): R|kotlin/Unit| {
         lval <destruct>: <implicit> = some#
         lvar x: <implicit> = R|<local>/<destruct>|.component1()
         lvar y: <implicit> = R|<local>/<destruct>|.component2()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
index 4cf12709064..70e667ff056 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
@@ -1,5 +1,5 @@
 FILE: for.kt
-    public? final? fun foo(): kotlin/Unit {
+    public? final? fun foo(): R|kotlin/Unit| {
         lval <range>: <implicit> = Int(1).rangeTo#(Int(10))
         lval <iterator>: <implicit> = R|<local>/<range>|.iterator#()
         while(R|<local>/<iterator>|.hasNext#()) {
@@ -8,7 +8,7 @@ FILE: for.kt
         }
 
     }
-    public? final? fun bar(list: List<String>): kotlin/Unit {
+    public? final? fun bar(list: List<String>): R|kotlin/Unit| {
         lval <range>: <implicit> = list#.subList#(Int(0), Int(10))
         lval <iterator>: <implicit> = R|<local>/<range>|.iterator#()
         while(R|<local>/<iterator>|.hasNext#()) {
@@ -24,9 +24,9 @@ FILE: for.kt
         }
 
     }
-    public? final? data class Some : kotlin/Any {
+    public? final? data class Some : R|kotlin/Any| {
         public? constructor(x: Int, y: Int): R|Some| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val x: Int = R|<local>/x|
@@ -47,7 +47,7 @@ FILE: for.kt
         }
 
     }
-    public? final? fun baz(set: Set<Some>): kotlin/Unit {
+    public? final? fun baz(set: Set<Some>): R|kotlin/Unit| {
         lval <range>: <implicit> = set#
         lval <iterator>: <implicit> = R|<local>/<range>|.iterator#()
         while(R|<local>/<iterator>|.hasNext#()) {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
index 4e485f4ecdd..39a7b4b654e 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
@@ -2,7 +2,7 @@ FILE: genericCalls.kt
     public? final? fun <T> nullableValue(): T? {
         ^nullableValue Null(null)
     }
-    public? final? fun test(): kotlin/Unit {
+    public? final? fun test(): R|kotlin/Unit| {
         lval n: <implicit> = nullableValue#<Int>()
         lval x: <implicit> = nullableValue#<Double>()
         lval s: <implicit> = nullableValue#<String>()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
index c131e376400..3c557658477 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
@@ -1,7 +1,7 @@
 FILE: init.kt
-    public? final? class WithInit : kotlin/Any {
+    public? final? class WithInit : R|kotlin/Any| {
         public? constructor(x: Int): R|WithInit| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val x: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
index 8c1c3fd5e6a..80a0625bc07 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
@@ -1,7 +1,7 @@
 FILE: lambda.kt
-    public? final? data class Tuple : kotlin/Any {
+    public? final? data class Tuple : R|kotlin/Any| {
         public? constructor(x: Int, y: Int): R|Tuple| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val x: Int = R|<local>/x|
@@ -61,7 +61,7 @@ FILE: lambda.kt
         }
         )
     }
-    public? final? fun test(list: List<Int>): kotlin/Unit {
+    public? final? fun test(list: List<Int>): R|kotlin/Unit| {
         lval map: <implicit> = mutableMapOf#<Int, String>()
         list#.forEach#(<L> = forEach@fun <implicit>.<anonymous>(): <implicit> {
             lval <complex-set>: <implicit> = map#.getOrPut#(it#, getOrPut@fun <implicit>.<anonymous>(): <implicit> {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
index cba4b93c1e6..29d6b43549f 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
@@ -1,8 +1,8 @@
 FILE: locals.kt
     public? final? fun withLocals(p: Int): Int {
-        local final? class Local : kotlin/Any {
+        local final? class Local : R|kotlin/Any| {
             public? constructor(pp: Int): R|Local| {
-                super<kotlin/Any>()
+                super<R|kotlin/Any|>()
             }
 
             public? final? val pp: Int = R|<local>/pp|
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt
index e7bf81c09e5..62ab63d6241 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt
@@ -1,16 +1,16 @@
 FILE: modifications.kt
-    public? final? fun simple(): kotlin/Unit {
+    public? final? fun simple(): R|kotlin/Unit| {
         lvar x: <implicit> = Int(10)
         +=(x#, Int(20))
         -=(x#, Int(5))
         /=(x#, Int(5))
         *=(x#, Int(10))
     }
-    public? final? fun List<String>.modify(): kotlin/Unit {
+    public? final? fun List<String>.modify(): R|kotlin/Unit| {
         +=(this#, String(Alpha))
         +=(this#, String(Omega))
     }
-    public? final? fun Any.modify(): kotlin/Unit {
+    public? final? fun Any.modify(): R|kotlin/Unit| {
         lval <complex-set>: <implicit> = (this# as List<Int>)
         <complex-set># += Int(42)
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt
index 786d20a8ef3..1dc8ecff215 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt
@@ -1,7 +1,7 @@
 FILE: namedArgument.kt
-    public? final? fun foo(first: String = String(), second: Boolean = Boolean(true), third: Double = Double(3.1415)): kotlin/Unit {
+    public? final? fun foo(first: String = String(), second: Boolean = Boolean(true), third: Double = Double(3.1415)): R|kotlin/Unit| {
     }
-    public? final? fun test(): kotlin/Unit {
+    public? final? fun test(): R|kotlin/Unit| {
         foo#()
         foo#(String(Alpha), Boolean(false), Double(2.71))
         foo#(first = String(Hello), second = Boolean(true))
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt
index 981a07ce8b1..94e3dc223e8 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt
@@ -1,5 +1,5 @@
 FILE: simpleReturns.kt
-    public? final? fun foo(): kotlin/Unit {
+    public? final? fun foo(): R|kotlin/Unit| {
         ^foo Unit
     }
     public? final? fun bar(): String {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
index 2838f9e488d..9ccc1157d44 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
@@ -1,27 +1,27 @@
 FILE: super.kt
-    public? final? interface A : kotlin/Any {
-        public? final? fun foo(): kotlin/Unit {
+    public? final? interface A : R|kotlin/Any| {
+        public? final? fun foo(): R|kotlin/Unit| {
         }
 
     }
-    public? final? interface B : kotlin/Any {
-        public? final? fun foo(): kotlin/Unit {
+    public? final? interface B : R|kotlin/Any| {
+        public? final? fun foo(): R|kotlin/Unit| {
         }
 
-        public? final? fun bar(): kotlin/Unit {
+        public? final? fun bar(): R|kotlin/Unit| {
         }
 
     }
     public? final? class C : A, B {
         public? constructor(): R|C| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
-        public? open? override fun bar(): kotlin/Unit {
+        public? open? override fun bar(): R|kotlin/Unit| {
             super<<implicit>>.bar#()
         }
 
-        public? open? override fun foo(): kotlin/Unit {
+        public? open? override fun foo(): R|kotlin/Unit| {
             super<A>.foo#()
             super<B>.foo#()
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
index 3c28f5184fa..7fd039d8852 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
@@ -1,7 +1,7 @@
 FILE: these.kt
-    public? final? class Some : kotlin/Any {
+    public? final? class Some : R|kotlin/Any| {
         public? constructor(): R|Some| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? fun foo(): Int {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt
index 7e4630b960f..e12d53e1fb0 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt
@@ -1,5 +1,5 @@
 FILE: try.kt
-    public? final? fun some(): kotlin/Unit {
+    public? final? fun some(): R|kotlin/Unit| {
         try {
             throw KotlinNullPointerException#()
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt
index 230b76df5fe..b8af0dd3bf6 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt
@@ -1,5 +1,5 @@
 FILE: typeOperators.kt
-    public? final? interface IThing : kotlin/Any {
+    public? final? interface IThing : R|kotlin/Any| {
     }
     public? final? fun test1(x: Any): <implicit> {
         ^test1 (x# is IThing)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
index caae01d4417..e553661738f 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
@@ -1,5 +1,5 @@
 FILE: unary.kt
-    public? final? fun test(): kotlin/Unit {
+    public? final? fun test(): R|kotlin/Unit| {
         lvar x: <implicit> = Int(0)
         lval x1: <implicit> =  {
             lval <unary>: <implicit> = x#
@@ -32,16 +32,16 @@ FILE: unary.kt
         }
 
     }
-    public? final? class X : kotlin/Any {
+    public? final? class X : R|kotlin/Any| {
         public? constructor(i: Int): R|X| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val i: Int = R|<local>/i|
             public? get(): Int
 
     }
-    public? final? fun test2(x: X): kotlin/Unit {
+    public? final? fun test2(x: X): R|kotlin/Unit| {
         lval x1: <implicit> =  {
             lval <unary>: <implicit> = x#.i#
             x#.i# = R|<local>/<unary>|.inc#()
@@ -56,7 +56,7 @@ FILE: unary.kt
         }
 
     }
-    public? final? fun test3(arr: Array<Int>): kotlin/Unit {
+    public? final? fun test3(arr: Array<Int>): R|kotlin/Unit| {
         lval x1: <implicit> =  {
             lval <unary>: <implicit> = arr#.get#(Int(0))
             arr#.set#(Int(0), R|<local>/<unary>|.inc#())
@@ -71,16 +71,16 @@ FILE: unary.kt
         }
 
     }
-    public? final? class Y : kotlin/Any {
+    public? final? class Y : R|kotlin/Any| {
         public? constructor(arr: Array<Int>): R|Y| {
-            super<kotlin/Any>()
+            super<R|kotlin/Any|>()
         }
 
         public? final? val arr: Array<Int> = R|<local>/arr|
             public? get(): Array<Int>
 
     }
-    public? final? fun test4(y: Y): kotlin/Unit {
+    public? final? fun test4(y: Y): R|kotlin/Unit| {
         lval x1: <implicit> =  {
             lval <unary>: <implicit> = y#.arr#.get#(Int(0))
             y#.arr#.set#(Int(0), R|<local>/<unary>|.inc#())
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt
index f897022abee..693d9151568 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt
@@ -1,5 +1,5 @@
 FILE: variables.kt
-    public? final? fun foo(): kotlin/Unit {
+    public? final? fun foo(): R|kotlin/Unit| {
         lval x: <implicit> = Int(1)
         lvar y: <implicit> = x#.plus#(Int(1))
         lval z: <implicit> = y#.times#(Int(2))
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt
index 03ba3dc93b7..7a6125889fa 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt
@@ -1,5 +1,5 @@
 FILE: while.kt
-    public? final? fun foo(limit: Int): kotlin/Unit {
+    public? final? fun foo(limit: Int): R|kotlin/Unit| {
         lvar k: <implicit> = Int(0)
         some@while(<(k#, limit#)) {
             lval <unary>: <implicit> = k#
@@ -27,7 +27,7 @@ FILE: while.kt
         }
 
     }
-    public? final? fun bar(limit: Int): kotlin/Unit {
+    public? final? fun bar(limit: Int): R|kotlin/Unit| {
         lvar k: <implicit> = limit#
         do {
             lval <unary>: <implicit> = k#
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index 3fa5d79edd5..87a3ff62781 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -39,11 +39,11 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     private final var hasNext: R|kotlin/Boolean|
         private get(): R|kotlin/Boolean|
-        private set(value: R|kotlin/Boolean|): kotlin/Unit
+        private set(value: R|kotlin/Boolean|): R|kotlin/Unit|
 
     private final var next: R|kotlin/Int|
         private get(): R|kotlin/Int|
-        private set(value: R|kotlin/Int|): kotlin/Unit
+        private set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final val step: R|kotlin/Int|
         public get(): R|kotlin/Int|
@@ -135,11 +135,11 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     private final var hasNext: R|kotlin/Boolean|
         private get(): R|kotlin/Boolean|
-        private set(value: R|kotlin/Boolean|): kotlin/Unit
+        private set(value: R|kotlin/Boolean|): R|kotlin/Unit|
 
     private final var next: R|kotlin/Int|
         private get(): R|kotlin/Int|
-        private set(value: R|kotlin/Int|): kotlin/Unit
+        private set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final val step: R|kotlin/Int|
         public get(): R|kotlin/Int|
@@ -218,11 +218,11 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     private final var hasNext: R|kotlin/Boolean|
         private get(): R|kotlin/Boolean|
-        private set(value: R|kotlin/Boolean|): kotlin/Unit
+        private set(value: R|kotlin/Boolean|): R|kotlin/Unit|
 
     private final var next: R|kotlin/Long|
         private get(): R|kotlin/Long|
-        private set(value: R|kotlin/Long|): kotlin/Unit
+        private set(value: R|kotlin/Long|): R|kotlin/Unit|
 
     public final val step: R|kotlin/Long|
         public get(): R|kotlin/Long|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index 0806b90e50d..97afcc13c7c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -9,7 +9,7 @@ public final class Class : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final var property: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         private constructor(): R|test/Class.Companion|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
index 19dc8205563..d663dc82291 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
@@ -11,7 +11,7 @@ public final class Class : R|kotlin/Any| {
 
     public final var bar: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
index 9e5c6401bf8..3088661cbb9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var property: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
index 9e5c6401bf8..3088661cbb9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var property: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index cf8f76cb6b5..997f3fd76be 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var R|kotlin/Int|.foo: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
index 201c9a4b651..329880ad087 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var foo: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
index 9e5c6401bf8..3088661cbb9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
@@ -6,7 +6,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var property: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
index 65ad9643ec3..fc899f9dd0e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
@@ -17,14 +17,14 @@ public final annotation class B : R|kotlin/Annotation| {
 public abstract interface I : R|kotlin/Any| {
     public abstract var getterAndSetter: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public abstract var propertyAndGetter: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public abstract var propertyAndSetter: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
index 32d6edecd9a..df9e7dfa2d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
@@ -6,7 +6,7 @@ public final class A : R|kotlin/Any| {
 
     public final var R|kotlin/String|.myLength3: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/A|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
index 41f3177ac24..0e112a592c7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -4,7 +4,7 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final var s: R|kotlin/String|
             public get(): R|kotlin/String|
-            public set(value: R|kotlin/String|): kotlin/Unit
+            public set(value: R|kotlin/String|): R|kotlin/Unit|
 
         private constructor(): R|test/ClassObjectDeclaresProperty.Companion|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
index 8c52f6c7bb9..2aebb26c584 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
@@ -12,22 +12,22 @@ public final class Test : R|kotlin/Any| {
 
         public final var prop2: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            protected set(value: R|kotlin/Int|): kotlin/Unit
+            protected set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final val prop3: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
         public final var prop4: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final var prop5: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final var prop7: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         private constructor(): R|test/Test.Companion|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
index a058161d743..bc0a1859613 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
@@ -10,22 +10,22 @@ public abstract interface Test : R|kotlin/Any| {
 
         public final var prop2: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            protected set(value: R|kotlin/Int|): kotlin/Unit
+            protected set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final val prop3: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
         public final var prop4: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final var prop5: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         public final var prop7: R|kotlin/Int|
             public get(): R|kotlin/Int|
-            public set(value: R|kotlin/Int|): kotlin/Unit
+            public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
         private constructor(): R|test/Test.Companion|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
index 5e6e044822f..c8c70e91089 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
@@ -13,7 +13,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final var x: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final val z: R|kotlin/Double|
         public get(): R|kotlin/Double|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
index 3f2493721a8..8f923409f6d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
@@ -13,11 +13,11 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final var x: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final var y: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
index d8e0472a5ba..03a8728eccd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
@@ -1,7 +1,7 @@
 public final class FieldAsVar : R|kotlin/Any| {
     public final var f: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/FieldAsVar|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
index 1dfeb2f1bcf..6a9891e3321 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
@@ -1,7 +1,7 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
     public final var files: R|kotlin/Array<java/io/File>?|
         public get(): R|kotlin/Array<java/io/File>?|
-        public set(value: R|kotlin/Array<java/io/File>?|): kotlin/Unit
+        public set(value: R|kotlin/Array<java/io/File>?|): R|kotlin/Unit|
 
     public constructor(): R|test/FieldOfArrayType|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
index 32488c73545..03ae6af37df 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
@@ -1,11 +1,11 @@
 public final class TwoFields : R|kotlin/Any| {
     public final var a: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final var b: R|kotlin/Short|
         public get(): R|kotlin/Short|
-        public set(value: R|kotlin/Short|): kotlin/Unit
+        public set(value: R|kotlin/Short|): R|kotlin/Unit|
 
     public constructor(): R|test/TwoFields|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
index e4564575059..3331e3fd07a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,15 +1,15 @@
 public open class PropertyArrayTypes<T> : R|kotlin/Any| {
     public final var array: R|kotlin/Array<kotlin/String>|
         public get(): R|kotlin/Array<kotlin/String>|
-        public set(value: R|kotlin/Array<kotlin/String>|): kotlin/Unit
+        public set(value: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit|
 
     public final var arrayOfArrays: R|kotlin/Array<kotlin/Array<kotlin/String>>|
         public get(): R|kotlin/Array<kotlin/Array<kotlin/String>>|
-        public set(value: R|kotlin/Array<kotlin/Array<kotlin/String>>|): kotlin/Unit
+        public set(value: R|kotlin/Array<kotlin/Array<kotlin/String>>|): R|kotlin/Unit|
 
     public final var genericArray: R|kotlin/Array<T>|
         public get(): R|kotlin/Array<T>|
-        public set(value: R|kotlin/Array<T>|): kotlin/Unit
+        public set(value: R|kotlin/Array<T>|): R|kotlin/Unit|
 
     public constructor<T>(): R|test/PropertyArrayTypes<T>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
index da65917da28..fb6d923032a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,19 +1,19 @@
 public open class PropertyComplexTypes<T> : R|kotlin/Any| {
     public final var genericType: R|T|
         public get(): R|T|
-        public set(value: R|T|): kotlin/Unit
+        public set(value: R|T|): R|kotlin/Unit|
 
     public final var listDefinedGeneric: R|java/util/ArrayList<kotlin/String>|
         public get(): R|java/util/ArrayList<kotlin/String>|
-        public set(value: R|java/util/ArrayList<kotlin/String>|): kotlin/Unit
+        public set(value: R|java/util/ArrayList<kotlin/String>|): R|kotlin/Unit|
 
     public final var listGeneric: R|java/util/ArrayList<T>|
         public get(): R|java/util/ArrayList<T>|
-        public set(value: R|java/util/ArrayList<T>|): kotlin/Unit
+        public set(value: R|java/util/ArrayList<T>|): R|kotlin/Unit|
 
     public final var listOfGenericList: R|java/util/ArrayList<java/util/ArrayList<T>>|
         public get(): R|java/util/ArrayList<java/util/ArrayList<T>>|
-        public set(value: R|java/util/ArrayList<java/util/ArrayList<T>>|): kotlin/Unit
+        public set(value: R|java/util/ArrayList<java/util/ArrayList<T>>|): R|kotlin/Unit|
 
     public constructor<T>(): R|test/PropertyComplexTypes<T>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
index 6e3854ebf30..f520effc503 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
@@ -1,11 +1,11 @@
 public open class PropertySimpleType : R|kotlin/Any| {
     public final var fieldOne: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final var fieldTwo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/PropertySimpleType|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index ca79d9ed8a2..434ed7c5611 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,7 +1,7 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
     public final var foo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/ExplicitFieldGettersAndSetters|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
index fa7156eec7b..48457d50a5e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,7 +1,7 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
     public final var foo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/NoFieldTypeRef|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index fc5eb689fac..baf7c0d74cb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,7 +1,7 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
     public final var foo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/SyntaxErrorInFieldAnnotation|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
index d41a74c6369..920ef6f9ce0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,7 +1,7 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
     public final var foo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongFieldInitializer|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
index 5b425d9530d..48f0812db81 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -4,7 +4,7 @@ public open class WrongFieldMutability : R|kotlin/Any| {
 
     public final var fooNotFinal: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongFieldMutability|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
index 7cac7455288..08ba5cae0b9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,7 +1,7 @@
 public open class WrongFieldName : R|kotlin/Any| {
     public final var foo: R|kotlin/String?|
         public get(): R|kotlin/String?|
-        public set(value: R|kotlin/String?|): kotlin/Unit
+        public set(value: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongFieldName|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
index 1219a841687..1a5ebadb4a4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
@@ -1,7 +1,7 @@
 public open class NotNullField : R|kotlin/Any| {
     public final var hi: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public constructor(): R|test/NotNullField|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
index df08afbf004..7d60959274e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InheritValAndVar.txt
@@ -7,14 +7,14 @@ public abstract interface Super1 : R|kotlin/Any| {
 
     public abstract var y: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
 }
 
 public abstract interface Super2 : R|kotlin/Any| {
     public abstract var x: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public abstract val y: R|kotlin/String|
         public get(): R|kotlin/String|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
index 49e5b57088d..4fa4c3b1d52 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
@@ -1,7 +1,7 @@
 public final class ClassVar : R|kotlin/Any| {
     public final var aa: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVar|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
index 8789b1cb3b6..2d682a51c57 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
@@ -1,7 +1,7 @@
 public final class ExtPropInClass : R|kotlin/Any| {
     public final var R|kotlin/Int|.itIs: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ExtPropInClass|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
index d98794df222..2307e36a632 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
@@ -1,7 +1,7 @@
 public final class ExtValInClass<P> : R|kotlin/Any| {
     public final var R|kotlin/Int|.asas: R|P|
         public get(): R|P|
-        public set(value: R|P|): kotlin/Unit
+        public set(value: R|P|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/ExtValInClass<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
index d98794df222..2307e36a632 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,7 +1,7 @@
 public final class ExtValInClass<P> : R|kotlin/Any| {
     public final var R|kotlin/Int|.asas: R|P|
         public get(): R|P|
-        public set(value: R|P|): kotlin/Unit
+        public set(value: R|P|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/ExtValInClass<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
index 6010cc4f22a..1f4a4e58946 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
@@ -1,7 +1,7 @@
 public final class ExtValPIntInClass<P> : R|kotlin/Any| {
     public final var R|P|.asas: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/ExtValPIntInClass<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
index 6010cc4f22a..1f4a4e58946 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,7 +1,7 @@
 public final class ExtValPIntInClass<P> : R|kotlin/Any| {
     public final var R|P|.asas: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/ExtValPIntInClass<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
index da36a3abed5..81eaada9020 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/TraitFinalVar.txt
@@ -1,6 +1,6 @@
 public abstract interface A : R|kotlin/Any| {
     public open var v: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
index 26f4c5c03b1..9b444865bf4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
@@ -1,7 +1,7 @@
 public abstract interface A : R|kotlin/Any| {
     public open var v: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
index b42632ad4a9..e56a53ac2b3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
@@ -1,7 +1,7 @@
 public final class A : R|kotlin/Any| {
     public final var a: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/A|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
index d8fd0c1da5e..73e40564d7f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
@@ -1,23 +1,23 @@
 public final class ClassVar : R|kotlin/Any| {
     public final var property1: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     internal final var property2: R|kotlin/Int|
         internal get(): R|kotlin/Int|
-        internal set(value: R|kotlin/Int|): kotlin/Unit
+        internal set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     private final var property3: R|java/lang/Object|
         private get(): R|java/lang/Object|
-        private set(value: R|java/lang/Object|): kotlin/Unit
+        private set(value: R|java/lang/Object|): R|kotlin/Unit|
 
     protected final var property4: R|kotlin/String|
         protected get(): R|kotlin/String|
-        protected set(value: R|kotlin/String|): kotlin/Unit
+        protected set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final var property5: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVar|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
index ffd9bb8028e..e9a9b1d9dd5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -1,19 +1,19 @@
 public open class ClassVarModality : R|kotlin/Any| {
     public open var property1: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     internal final var property2: R|kotlin/Int|
         internal get(): R|kotlin/Int|
-        internal set(value: R|kotlin/Int|): kotlin/Unit
+        internal set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public open var property3: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     internal final var property4: R|kotlin/Int|
         internal get(): R|kotlin/Int|
-        private set(value: R|kotlin/Int|): kotlin/Unit
+        private set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVarModality|
 
@@ -22,7 +22,7 @@ public open class ClassVarModality : R|kotlin/Any| {
 public abstract class ClassVarModalityAbstract : R|kotlin/Any| {
     public abstract var property1: R|java/util/Date|
         public get(): R|java/util/Date|
-        public set(value: R|java/util/Date|): kotlin/Unit
+        public set(value: R|java/util/Date|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVarModalityAbstract|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
index dc9f204ec83..19c458d2a9e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
@@ -1,23 +1,23 @@
 public final class ClassVarParams : R|kotlin/Any| {
     public final var pr1: R|kotlin/String|
         public get(): R|kotlin/String|
-        public set(value: R|kotlin/String|): kotlin/Unit
+        public set(value: R|kotlin/String|): R|kotlin/Unit|
 
     internal final var pr2: R|kotlin/Int|
         internal get(): R|kotlin/Int|
-        internal set(value: R|kotlin/Int|): kotlin/Unit
+        internal set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     private final var pr3: R|kotlin/Long|
         private get(): R|kotlin/Long|
-        private set(value: R|kotlin/Long|): kotlin/Unit
+        private set(value: R|kotlin/Long|): R|kotlin/Unit|
 
     protected final var pr4: R|java/util/Date|
         protected get(): R|java/util/Date|
-        protected set(value: R|java/util/Date|): kotlin/Unit
+        protected set(value: R|java/util/Date|): R|kotlin/Unit|
 
     public final var pr5: R|kotlin/Any|
         public get(): R|kotlin/Any|
-        public set(value: R|kotlin/Any|): kotlin/Unit
+        public set(value: R|kotlin/Any|): R|kotlin/Unit|
 
     public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|): R|test/ClassVarParams|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
index 4a6adb730ea..f9cf3f8e8f9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
@@ -1,23 +1,23 @@
 public final class ClassVal : R|kotlin/Any| {
     public final var property1: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     internal final var property2: R|kotlin/Int|
         internal get(): R|kotlin/Int|
-        internal set(value: R|kotlin/Int|): kotlin/Unit
+        internal set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     private final var property3: R|java/lang/Object|
         private get(): R|java/lang/Object|
-        private set(value: R|java/lang/Object|): kotlin/Unit
+        private set(value: R|java/lang/Object|): R|kotlin/Unit|
 
     protected final var property4: R|kotlin/String|
         protected get(): R|kotlin/String|
-        protected set(value: R|kotlin/String|): kotlin/Unit
+        protected set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final var property5: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVal|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
index 2bbcb26fe62..6a157da5f2d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
@@ -1,39 +1,39 @@
 public final class ClassVal : R|kotlin/Any| {
     public final var property1: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final var property10: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        protected set(value: R|kotlin/Int|): kotlin/Unit
+        protected set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final var property11: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        internal set(value: R|kotlin/Int|): kotlin/Unit
+        internal set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final var property2: R|java/lang/Object|
         public get(): R|java/lang/Object|
-        protected set(value: R|java/lang/Object|): kotlin/Unit
+        protected set(value: R|java/lang/Object|): R|kotlin/Unit|
 
     public final var property3: R|java/lang/Object|
         public get(): R|java/lang/Object|
-        private set(value: R|java/lang/Object|): kotlin/Unit
+        private set(value: R|java/lang/Object|): R|kotlin/Unit|
 
     protected final var property4: R|kotlin/String|
         protected get(): R|kotlin/String|
-        protected set(value: R|kotlin/String|): kotlin/Unit
+        protected set(value: R|kotlin/String|): R|kotlin/Unit|
 
     protected final var property5: R|kotlin/String|
         protected get(): R|kotlin/String|
-        private set(value: R|kotlin/String|): kotlin/Unit
+        private set(value: R|kotlin/String|): R|kotlin/Unit|
 
     public final var property8: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): kotlin/Unit
+        public set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public final var property9: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        private set(value: R|kotlin/Int|): kotlin/Unit
+        private set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/ClassVal|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
index 741ff7d1047..9b9a1d3dfb2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
@@ -6,7 +6,7 @@ public final class PrivateClassMembers : R|kotlin/Any| {
 
     private final var r: R|kotlin/Int|
         private get(): R|kotlin/Int|
-        private set(value: R|kotlin/Int|): kotlin/Unit
+        private set(value: R|kotlin/Int|): R|kotlin/Unit|
 
     private final val v: R|kotlin/Int|
         private get(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
index 6b0a9f8cf18..03279f9a8f4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
@@ -3,7 +3,7 @@ public final class A<in I> : R|kotlin/Any| {
 
     private/*private to this*/ final var bar: R|I|
         private/*private to this*/ get(): R|I|
-        private/*private to this*/ set(value: R|I|): kotlin/Unit
+        private/*private to this*/ set(value: R|I|): R|kotlin/Unit|
 
     private/*private to this*/ final val foo: R|I|
         private/*private to this*/ get(): R|I|
@@ -13,7 +13,7 @@ public final class A<in I> : R|kotlin/Any| {
 
     private/*private to this*/ final var var_with_accessors: R|I|
         private/*private to this*/ get(): R|I|
-        private/*private to this*/ set(value: R|I|): kotlin/Unit
+        private/*private to this*/ set(value: R|I|): R|kotlin/Unit|
 
     public constructor<in I>(): R|test/A<I>|
 
diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/kotlinSam.txt b/compiler/fir/resolve/testData/resolve/samConstructors/kotlinSam.txt
index 2cfab1b83ce..4a8dc4b11cb 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/kotlinSam.txt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/kotlinSam.txt
@@ -14,7 +14,7 @@ FILE: kotlinSam.kt
             >(R|<local>/it|, Int(1))
         }
         ))
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/realConstructorFunction.txt b/compiler/fir/resolve/testData/resolve/samConstructors/realConstructorFunction.txt
index 078bb610892..7f067524235 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/realConstructorFunction.txt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/realConstructorFunction.txt
@@ -13,7 +13,7 @@ FILE: main.kt
             >(R|<local>/it|, Int(1))
         }
         ))
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/simple.txt b/compiler/fir/resolve/testData/resolve/samConstructors/simple.txt
index de422dd674b..c81f8054ce8 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/simple.txt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/simple.txt
@@ -10,7 +10,7 @@ FILE: main.kt
             >(R|<local>/it|, Int(1))
         }
         ))
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
index eb74ffb28f4..01d404ce11c 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
@@ -29,7 +29,7 @@ FILE: kotlinSam.kt
     public final fun foo4(m: R|Derived|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        lval f: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(t: R|kotlin/Int|): kotlin/Boolean {
+        lval f: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(t: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/t|, Int(1))
         }
 
@@ -38,8 +38,8 @@ FILE: kotlinSam.kt
         }
         )
         R|/foo1|(R|<local>/f|)
-        <Inapplicable(INAPPLICABLE): [/foo2]>#(<L> = foo2@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
-            >(x#, Int(1))
+        <Inapplicable(INAPPLICABLE): [/foo2]>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean|
+            >(R|<local>/x|, Int(1))
         }
         )
         <Inapplicable(INAPPLICABLE): [/foo2]>#(R|<local>/f|)
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
index c2a0de5060f..e3593f5edc7 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
@@ -2,15 +2,15 @@ FILE: main.kt
     public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(<L> = foo@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
-            >(x#, Int(1))
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(<L> = foo@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
+            >(R|<local>/x|, Int(1))
         }
         )
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(foo@fun <implicit>.<anonymous>(): <implicit> {
-            >(it#, Int(1))
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(foo@fun <anonymous>(): R|kotlin/Boolean| {
+            >(<Unresolved name: it>#, Int(1))
         }
         )
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/samSupertype.txt b/compiler/fir/resolve/testData/resolve/samConversions/samSupertype.txt
index 2be57bd36e1..f86162da2fa 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/samSupertype.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/samSupertype.txt
@@ -10,7 +10,7 @@ FILE: main.kt
             >(R|<local>/it|, Int(1))
         }
         )
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/samSupertypeWithOverride.txt b/compiler/fir/resolve/testData/resolve/samConversions/samSupertypeWithOverride.txt
index 10aff34cc41..d550a436ef5 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/samSupertypeWithOverride.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/samSupertypeWithOverride.txt
@@ -10,7 +10,7 @@ FILE: main.kt
             >(R|<local>/it|, Int(1))
         }
         )
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/simple.txt b/compiler/fir/resolve/testData/resolve/samConversions/simple.txt
index 2be57bd36e1..f86162da2fa 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/simple.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/simple.txt
@@ -10,7 +10,7 @@ FILE: main.kt
             >(R|<local>/it|, Int(1))
         }
         )
-        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {
+        lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             >(R|<local>/x|, Int(1))
         }
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index ba135606da5..ce2e7eb6926 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -737,14 +737,10 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
 
     override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef) {
         resolvedTypeRef.annotations.renderAnnotations()
-        if (resolvedTypeRef !is FirImplicitBuiltinTypeRef) {
-            print("R|")
-        }
+        print("R|")
         val coneType = resolvedTypeRef.type
         print(coneType.render())
-        if (resolvedTypeRef !is FirImplicitBuiltinTypeRef) {
-            print("|")
-        }
+        print("|")
     }
 
     override fun visitUserTypeRef(userTypeRef: FirUserTypeRef) {