diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt
index 971702c1ca1..51358c85764 100644
--- a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt
@@ -4,8 +4,8 @@ FILE: complexTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class D<R, in P> : R|kotlin/Any| {
-            public constructor<R, in P>(): R|a/b/C.D<R, P>| {
+        public final inner class D<R, in P, T, out S> : R|kotlin/Any| {
+            public constructor<R, in P>(): R|a/b/C.D<R, P, T, S>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -13,7 +13,7 @@ FILE: complexTypes.kt
 
     }
     public abstract interface Test : R|kotlin/Any| {
-        public abstract val x: R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
-            public get(): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
+        public abstract val x: R|a/b/C.D<in kotlin/collections/List<*>, *, out kotlin/CharSequence, *>|
+            public get(): R|a/b/C.D<in kotlin/collections/List<*>, *, out kotlin/CharSequence, *>|
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
index 829076c5c13..a0b03646d19 100644
--- a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
@@ -4,8 +4,8 @@ FILE: innerTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Inner<T, K> : R|kotlin/Any| {
-            public constructor<K>(): R|Outer.Inner<T, K>| {
+        public final inner class Inner<K, T> : R|kotlin/Any| {
+            public constructor<K>(): R|Outer.Inner<K, T>| {
                 super<R|kotlin/Any|>()
             }
 
@@ -17,21 +17,21 @@ FILE: innerTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public final fun substitute(): R|Outer.Inner<Q, kotlin/Int>| {
+        public final fun substitute(): R|Outer.Inner<kotlin/Int, Q>| {
             ^substitute R|/Outer.Outer|<R|Q|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>()
         }
 
     }
-    public final fun accept(p: R|Outer.Inner<kotlin/String, kotlin/Int>|): R|kotlin/Unit| {
+    public final fun accept(p: R|Outer.Inner<kotlin/Int, kotlin/String>|): R|kotlin/Unit| {
     }
-    public final val rr: R|Outer.Inner<kotlin/String, kotlin/Int>| = R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>()
-        public get(): R|Outer.Inner<kotlin/String, kotlin/Int>|
-    public final val rrq: R|Outer.Inner<kotlin/String, kotlin/Int>| = R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/String, kotlin/Int>|>|()
-        public get(): R|Outer.Inner<kotlin/String, kotlin/Int>|
+    public final val rr: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>()
+        public get(): R|Outer.Inner<kotlin/Int, kotlin/String>|
+    public final val rrq: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|()
+        public get(): R|Outer.Inner<kotlin/Int, kotlin/String>|
     public final fun check(): R|kotlin/Unit| {
         <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
         <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/String|>())
         R|/accept|(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
         <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Boxed.Boxed|<R|kotlin/Int|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/Int>|>|())
-        R|/accept|(R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/String, kotlin/Int>|>|())
+        R|/accept|(R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt b/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt
index 2fc87ae4405..0804e6ce389 100644
--- a/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt
@@ -6,8 +6,8 @@ FILE: typeParameterVsNested.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class T : R|kotlin/Any| {
-            public constructor(): R|test/My.T| {
+        public final inner class T<T : R|test/Some|> : R|kotlin/Any| {
+            public constructor(): R|test/My.T<T>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt
index ef7079b02c5..e8c12d5cbf3 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.kt
@@ -5,9 +5,9 @@ fun main(k: KSub, vString: SuperClass<String>.NestedInSuperClass, vInt: SuperCla
     k.getImpl().nestedI(vString)
 
     // TODO: Support parametrisized inner classes
-    k.getImpl().nestedI(vInt)
-    k.getNestedSubClass().<!INAPPLICABLE_CANDIDATE!>nested<!>("")
-    k.getNestedSubClass().nested(1)
+    k.getImpl().<!INAPPLICABLE_CANDIDATE!>nestedI<!>(vInt)
+    k.getNestedSubClass().nested("")
+    k.getNestedSubClass().<!INAPPLICABLE_CANDIDATE!>nested<!>(1)
 }
 
 // FILE: J1.java
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
index 1ffeda0ecba..42790f78ada 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
@@ -7,9 +7,9 @@ FILE: K1.kt
     }
     public final fun main(k: R|KSub|, vString: R|SuperClass.NestedInSuperClass<kotlin/String>|, vInt: R|SuperClass.NestedInSuperClass<kotlin/Int>|): R|kotlin/Unit| {
         R|<local>/k|.R|/J1.getImpl|().R|FakeOverride</J1.NestedIImpl.nestedI: R|kotlin/Unit|>|(R|<local>/vString|)
-        R|<local>/k|.R|/J1.getImpl|().R|FakeOverride</J1.NestedIImpl.nestedI: R|kotlin/Unit|>|(R|<local>/vInt|)
-        R|<local>/k|.R|/J1.getNestedSubClass|().<Inapplicable(INAPPLICABLE): [/SuperClass.NestedInSuperClass.nested]>#(String())
-        R|<local>/k|.R|/J1.getNestedSubClass|().R|/SuperClass.NestedInSuperClass.nested|(Int(1))
+        R|<local>/k|.R|/J1.getImpl|().<Inapplicable(INAPPLICABLE): [/J1.NestedIImpl.nestedI]>#(R|<local>/vInt|)
+        R|<local>/k|.R|/J1.getNestedSubClass|().R|FakeOverride</J1.NestedSubClass.nested: R|kotlin/Unit|>|(String())
+        R|<local>/k|.R|/J1.getNestedSubClass|().<Inapplicable(INAPPLICABLE): [/J1.NestedSubClass.nested]>#(Int(1))
     }
 FILE: K2.kt
     public open class KFirst : R|SuperClass<kotlin/String>|, R|SuperI<kotlin/Int>| {
@@ -24,8 +24,8 @@ FILE: K3.kt
             super<R|kotlin/Any|>()
         }
 
-        public open inner class NestedInSuperClass : R|kotlin/Any| {
-            public constructor(): R|SuperClass.NestedInSuperClass| {
+        public open inner class NestedInSuperClass<T> : R|kotlin/Any| {
+            public constructor(): R|SuperClass.NestedInSuperClass<T>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
index 9d1c2a522c9..7599eea8c38 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
@@ -1,6 +1,6 @@
 FILE: MapCompute.kt
     public final fun <D> R|kotlin/collections/MutableMap<kotlin/String, kotlin/collections/MutableSet<D>>|.initAndAdd(key: R|kotlin/String|, value: R|D|): R|kotlin/Unit| {
-        this@R|/initAndAdd|.R|FakeOverride<java/util/Map.compute: R|kotlin/collections/MutableSet<D>?|>|(R|<local>/key|, <L> = compute@fun <anonymous>(_: R|ft<kotlin/String, kotlin/String?>!|, maybeValues: R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!|): R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!| {
+        this@R|/initAndAdd|.R|FakeOverride<kotlin/collections/MutableMap.compute: R|kotlin/collections/MutableSet<D>?|>|(R|<local>/key|, <L> = compute@fun <anonymous>(_: R|ft<kotlin/String, kotlin/String?>!|, maybeValues: R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!|): R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!| {
             lval setOfValues: R|kotlin/collections/MutableSet<D>| = when (lval <elvis>: R|ft<kotlin/collections/MutableSet<D>, kotlin/collections/MutableSet<D>?>!| = R|<local>/maybeValues|) {
                 ==($subj$, Null(null)) ->  {
                     R|kotlin/collections/mutableSetOf|<R|D|>()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
index ef15b928c1f..3cc75fc0a34 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
@@ -8,5 +8,5 @@ FILE: test.kt
     }
     public final fun test(some: R|kotlin/collections/Iterable<kotlin/String>|): R|kotlin/Unit| {
         lval it: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/some|.R|FakeOverride<kotlin/collections/Iterable.iterator: R|kotlin/collections/Iterator<kotlin/String>|>|()
-        lval split: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = R|<local>/some|.R|FakeOverride<java/lang/Iterable.spliterator: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
+        lval split: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>| = R|<local>/some|.R|FakeOverride<kotlin/collections/Iterable.spliterator: R|java/util/Spliterator<ft<kotlin/String, kotlin/String?>!>|>|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
index 9013ae3931f..3577ca88c65 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
@@ -27,8 +27,8 @@ FILE: test.kt
         }
         )
         lval otherResult: R|kotlin/String| = R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.getOrDefault: R|kotlin/String|>|(String(key), String(value))
-        lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|FakeOverride<java/util/Map.replace: R|kotlin/String?|>|(String(key), String(value))
-        R|<local>/map|.R|FakeOverride<java/util/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
+        lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.replace: R|kotlin/String?|>|(String(key), String(value))
+        R|<local>/map|.R|FakeOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
             R|kotlin/io/println|(<strcat>(R|<local>/key|.R|kotlin/Any.toString|(), String(: ), R|<local>/value|.R|kotlin/Any.toString|()))
             R|<local>/key|.R|kotlin/String.length|
             ^ R|<local>/value|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
index b2ad98d9aac..15b731930ca 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
@@ -1,6 +1,6 @@
 FILE: test.kt
     public final fun <D : R|kotlin/Any|> R|Call<D>|.testForEach(): R|kotlin/Unit| {
-        this@R|/testForEach|.R|/Call.arguments|.R|FakeOverride<java/util/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
+        this@R|/testForEach|.R|/Call.arguments|.R|FakeOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit| {
             R|<local>/key|.R|kotlin/String.length|
             ^ R|<local>/value|.R|kotlin/String.length|
         }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
index eb5a5df86ad..951b61fe151 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
@@ -1,6 +1,6 @@
 FILE: mapMerge.kt
     public final fun foo(x: R|kotlin/collections/MutableMap<kotlin/String, kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit| {
-        R|<local>/x|.R|FakeOverride<java/util/Map.merge: R|kotlin/collections/List<kotlin/String>?|>|(String(), R|kotlin/collections/listOf|<R|kotlin/String|>(String()), <L> = merge@fun <anonymous>(a: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|, b: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|): R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!| {
+        R|<local>/x|.R|FakeOverride<kotlin/collections/MutableMap.merge: R|kotlin/collections/List<kotlin/String>?|>|(String(), R|kotlin/collections/listOf|<R|kotlin/String|>(String()), <L> = merge@fun <anonymous>(a: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|, b: R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!|): R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>!| {
             ^ R|<local>/a|.R|kotlin/collections/plus|<R|kotlin/String|>(R|<local>/b|)
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
index 0403f22e9aa..106649ff9d6 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
@@ -1,6 +1,6 @@
 FILE: removeIf.kt
     public final fun test(collection: R|kotlin/collections/MutableCollection<kotlin/Boolean>|): R|kotlin/Unit| {
-        R|<local>/collection|.R|FakeOverride<java/util/Collection.removeIf: R|kotlin/Boolean|>|(<L> = removeIf@fun <anonymous>(it: R|ft<kotlin/Boolean, kotlin/Boolean?>!|): R|kotlin/Boolean| {
+        R|<local>/collection|.R|FakeOverride<kotlin/collections/MutableCollection.removeIf: R|kotlin/Boolean|>|(<L> = removeIf@fun <anonymous>(it: R|ft<kotlin/Boolean, kotlin/Boolean?>!|): R|kotlin/Boolean| {
             ^ R|<local>/it|
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
index d5c484c787e..cd860384fca 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
@@ -10,7 +10,7 @@ FILE: typeAliasWithForEach.kt
     public final typealias Arguments = R|kotlin/collections/Map<kotlin/String, ArgsInfo>|
     public final fun R|Arguments|.deepCopy(): R|Arguments| {
         lval result: R|java/util/HashMap<ft<kotlin/String, kotlin/String?>!, ft<ArgsInfo, ArgsInfo?>!>| = R|java/util/HashMap.HashMap|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<ArgsInfo, ArgsInfo?>!|>()
-        this@R|/deepCopy|.R|FakeOverride<java/util/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<ArgsInfo, ArgsInfo?>!|): R|kotlin/Unit| {
+        this@R|/deepCopy|.R|FakeOverride<kotlin/collections/Map.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<kotlin/String, kotlin/String?>!|, value: R|ft<ArgsInfo, ArgsInfo?>!|): R|kotlin/Unit| {
             R|<local>/result|.R|kotlin/collections/set|<R|ft<kotlin/String, kotlin/String?>!|, R|ft<ArgsInfo, ArgsInfo?>!|>(R|<local>/key|, R|/ArgsInfoImpl.ArgsInfoImpl|(R|<local>/value|))
         }
         )
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
index 9d37a2c5eb0..421e8eb7b9c 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -4,8 +4,8 @@ FILE: complexTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public? final? inner class D<R, in P> : R|kotlin/Any| {
-            public? constructor<R, in P>(): R|a/b/C.D<R, P>| {
+        public? final? inner class D<R, in P, T, out S> : R|kotlin/Any| {
+            public? constructor<R, in P>(): R|a/b/C.D<R, P, T, S>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
index a36b1ab3daa..a44528deb24 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -6,8 +6,8 @@ FILE: typeParameterVsNested.kt
             super<R|kotlin/Any|>()
         }
 
-        public? final? inner class T : R|kotlin/Any| {
-            public? constructor(): R|test/My.T| {
+        public? final? inner class T<T : Some> : R|kotlin/Any| {
+            public? constructor(): R|test/My.T<T>| {
                 super<R|kotlin/Any|>()
             }
 
diff --git a/compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt b/compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt
index 905408c14e2..cf541e2edb4 100644
--- a/compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
     private fun <T : Any> T.self() = object{
         fun calc() : T {
diff --git a/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt b/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt
index fb924a207b4..3490ee65894 100644
--- a/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt
+++ b/compiler/testData/codegen/box/innerNested/innerGenericClassFromJava.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: JavaClass.java
 
diff --git a/compiler/testData/codegen/box/mangling/parentheses.kt b/compiler/testData/codegen/box/mangling/parentheses.kt
index 2c4226481c5..ee632bd30af 100644
--- a/compiler/testData/codegen/box/mangling/parentheses.kt
+++ b/compiler/testData/codegen/box/mangling/parentheses.kt
@@ -1,5 +1,4 @@
 // !SANITIZE_PARENTHESES
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 
 // Sanitization is needed here because DxChecker reports ParseException on parentheses in names.
diff --git a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
index 8eb172ee81e..6d5db3d3892 100644
--- a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
@@ -11,7 +11,7 @@ object A2 public <!CONSTRUCTOR_IN_OBJECT!>constructor(private val prop: Int)<!>
 }
 
 val x = object <!CONSTRUCTOR_IN_OBJECT!>(val prop: Int)<!> {
-    <!CONSTRUCTOR_IN_OBJECT!>constructor()<!> : <!UNRESOLVED_REFERENCE!>this<!>(1) {
+    <!CONSTRUCTOR_IN_OBJECT!>constructor()<!> : this(1) {
         val x = 1
         x * x
     }
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.fir.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.fir.kt
deleted file mode 100644
index 32790a9b6f7..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.fir.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// !CHECK_TYPE
-
-import java.util.Enumeration
-
-operator fun <T> java.util.Enumeration<T>.iterator() = object : Iterator<T> {
-  public override fun hasNext(): Boolean = hasMoreElements()
-
-  public override fun next() = nextElement()
-}
-
-fun a(e : java.util.Enumeration<Int>) {
-    for (i in e) {
-        <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(i)
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
index 8f77ae0b73b..8b29cce2b0d 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 
 import java.util.Enumeration
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
index 6443c348009..75dabffae95 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
@@ -17,7 +17,7 @@ class Q {
         x = foo<CharSequence>()
         y = foo<String>()
 
-        x.prop.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><CharSequence>() }
-        y.prop.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+        x.prop.checkType { _<CharSequence>() }
+        y.prop.checkType { _<String>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
index fc90a12c068..0246b13ea9f 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
@@ -27,12 +27,12 @@ fun main() {
     val outer = Outer<String>()
 
     checkSubtype<Outer<String>.Inner<String>>(outer.bar())
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<String>.Inner<Int>>(outer.Inner<Int>())
+    checkSubtype<Outer<String>.Inner<Int>>(outer.Inner<Int>())
     checkSubtype<Outer<*>.Inner<*>>(outer.bar())
     checkSubtype<Outer<*>.Inner<*>>(outer.Inner<Int>())
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner<CharSequence>>(outer.bar())
-    checkSubtype<Outer<CharSequence>.Inner<CharSequence>>(outer.Inner())
+    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner<CharSequence>>(outer.Inner())
 
     outer.set(outer.bar())
     outer.set(outer.Inner())
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
index f954a3c35fe..bd5a5ec222e 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
@@ -15,12 +15,12 @@ class Outer<E> {
         if (y is Inner) return
 
         if (z is Inner) {
-            z.prop.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+            z.prop.checkType { _<Any?>() }
             return
         }
 
         if (y is Outer<*>.Inner<*>) {
-            y.prop.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
+            y.prop.checkType { _<Any?>() }
         }
     }
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
index f1a49b86889..3cc3ddfffa3 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
@@ -33,5 +33,5 @@ fun foo() {
 
     val csIt: Iterator<CharSequence> = A<String>().iterator()
 
-    commonSupertype(A<String>().iterator(), A<Int>().iterator()).checkType { _<A<out Any>.MyIt>() }
+    commonSupertype(A<String>().iterator(), A<Int>().iterator()).checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<out Any>.MyIt>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/j+k.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/j+k.fir.kt
index 464f3290453..cbfc156e188 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/j+k.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/j+k.fir.kt
@@ -23,6 +23,6 @@ fun main() {
     val strInt: Outer<String>.Inner<Int> = outerStr.Inner()
 
     strInt.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-    strInt.bar().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+    strInt.bar().checkType { _<Int>() }
     strInt.outer().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.fir.kt
deleted file mode 100644
index 7a617258247..00000000000
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.fir.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-class Outer<T> {
-    inner class Inner<R> {
-        fun <S> newInner(): Inner<S> = Inner()
-        //type mismatch
-        fun <U, S> newOuterInner(): Outer<U>.Inner<S> = Outer<U>().Inner<S>()
-        //^ U here is not analyzed
-        fun foo(t: T, r: R) {}
-    }
-}
-
-fun test0() {
-    val inner: Outer<Int>.Inner<String> = Outer<Int>().Inner<String>()
-    Outer<Int>().Inner<String>().foo(1, "") // type mismatch on second argument
-}
-
-
-fun test1() {
-    Outer<Int>().Inner<String>().newOuterInner<Double, Boolean>().<!UNRESOLVED_REFERENCE!>foo<!>(1.0, true) // type mismatch on 1.0
-}
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt
index d1ca3a88d34..55046b08983 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 class Outer<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.fir.kt
deleted file mode 100644
index 21286722014..00000000000
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
-
-class Outer<E> {
-    inner class Inner<E> {
-        fun foo(): E = null!!
-        fun outerE() = baz()
-    }
-
-    fun baz(): E = null!!
-}
-
-fun main() {
-    val inner = Outer<String>().Inner<Int>()
-
-    inner.foo().checkType { _<Int>() }
-    inner.outerE().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.kt
index a9ed6267adc..64850ec2dbd 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
index 0b3c53ddefe..e365762a123 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
@@ -7,7 +7,7 @@ class Outer<T> {
     fun foo(x: Outer<String>.Inner, y: Outer.Inner, z: Inner) {
         var inner = Inner()
         x.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Inner>() }
-        x.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String>.Inner>() }
+        x.checkType { _<Outer<String>.Inner>() }
         z.checkType { _<Inner>() }
         z.checkType { _<Outer<T>.Inner>() }
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
index ed3d9809b04..50641cc1111 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simple.fir.kt
@@ -25,8 +25,8 @@ fun main() {
     checkSubtype<Outer<*>.Inner>(outer.bar())
     checkSubtype<Outer<*>.Inner>(outer.Inner())
 
-    checkSubtype<Outer<CharSequence>.Inner>(outer.bar())
-    checkSubtype<Outer<CharSequence>.Inner>(outer.Inner())
+    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner>(outer.bar())
+    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Outer<CharSequence>.Inner>(outer.Inner())
 
     outer.set(outer.bar())
     outer.set(outer.Inner())
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
index b894c10f9f9..c16e0722bb5 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
@@ -29,9 +29,9 @@ fun main() {
     checkSubtype<Outer<out CharSequence>.Inner>(outer.bar())
     checkSubtype<Outer<out CharSequence>.Inner>(outer.Inner())
 
-    outer.set(outer.bar())
-    outer.set(outer.Inner())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.bar())
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(outer.Inner())
 
     val x: Outer<String>.Inner = factoryString()
-    outer.set(x)
+    outer.<!INAPPLICABLE_CANDIDATE!>set<!>(x)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/substitutedMemberScope.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/substitutedMemberScope.fir.kt
index 914dfb898c7..af6d575ba72 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/substitutedMemberScope.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/substitutedMemberScope.fir.kt
@@ -36,13 +36,13 @@ fun topLevel(): Outer<String> = null!!
 fun foo() {
     val strInt: Outer<String>.Inner<Int> = Outer<String>().Inner()
 
-    strInt.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-    strInt.baz().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+    strInt.foo().checkType { _<String>() }
+    strInt.baz().checkType { _<Int>() }
 
-    strInt.instance().<!INAPPLICABLE_CANDIDATE!>setE<!>("")
-    strInt.instance().outerE().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    strInt.instance().setE("")
+    strInt.instance().outerE().checkType { _<String>() }
 
-    strInt.instance().Inner<Double>().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<String>.Inner<Double>>() }
+    strInt.instance().Inner<Double>().checkType { _<Outer<String>.Inner<Double>>() }
 
     Outer<String>().<!INAPPLICABLE_CANDIDATE!>setInner<!>(strInt)
     Outer<CharSequence>().<!INAPPLICABLE_CANDIDATE!>setInner<!>(strInt)
diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.fir.kt b/compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.fir.kt
index 718e458fe96..89310e995d3 100644
--- a/compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.fir.kt
@@ -5,7 +5,7 @@ class Test {
         }
     }
     fun test() {
-        1.self().bar() <!INAPPLICABLE_CANDIDATE!>+<!> 1
+        1.self().bar() + 1
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
index 0e66f764eab..c867e5747d2 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
@@ -10,8 +10,8 @@ public class Outer<T> {
 
 // FILE: main.kt
 fun test(x: List<Int>, y: List<String>) {
-    Outer<Int>().Inner("", y, 1) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int>.Inner<String>>() }
-    Outer<Int>().<!INAPPLICABLE_CANDIDATE!>Inner<!><CharSequence, String, Int>("", y, 1) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Outer<Int>.Inner<CharSequence>>() }
+    Outer<Int>().Inner("", y, 1) checkType { _<Outer<Int>.Inner<String>>() }
+    Outer<Int>().Inner<CharSequence, String, Int>("", y, 1) checkType { _<Outer<Int>.Inner<CharSequence>>() }
 
     Outer<Int>().Inner("", x, 1) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Outer<Int>.Inner<Any>>() }
     Outer<Int>().<!INAPPLICABLE_CANDIDATE!>Inner<!><CharSequence, String, Int>("", x, 1)
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
index 6de7a0bbdb8..9c729568897 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
@@ -5,7 +5,7 @@ object A {
 
 enum class B {
     X() {
-        <!CONSTRUCTOR_IN_OBJECT, UNRESOLVED_REFERENCE!>constructor()<!>
+        <!CONSTRUCTOR_IN_OBJECT, INAPPLICABLE_CANDIDATE!>constructor()<!>
     }
 }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.fir.txt b/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
index caea0239a54..5bbe28a39f1 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
@@ -59,10 +59,10 @@ FILE fqName:<root> fileName:/class.kt
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test.TestInner<T2 of <root>.Test.TestInner>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test.TestInner<T2 of <root>.Test.TestInner, T0 of <root>.Test>
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.Any?]
-      CONSTRUCTOR visibility:public <> ($this:<root>.Test.TestInner<T2 of <root>.Test.TestInner>) returnType:<root>.Test.TestInner<T2 of <root>.Test.TestInner> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Test.TestInner<T2 of <root>.Test.TestInner>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Test.TestInner<T2 of <root>.Test.TestInner, T0 of <root>.Test>) returnType:<root>.Test.TestInner<T2 of <root>.Test.TestInner, T0 of <root>.Test> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Test.TestInner<T2 of <root>.Test.TestInner, T0 of <root>.Test>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
index dececb29b4f..a525538afee 100644
--- a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
@@ -7,15 +7,15 @@ FILE fqName:<root> fileName:/genericInnerClass.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.Any?]
-      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
-      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>, x1:T1 of <root>.Outer, x2:T2 of <root>.Outer.Inner) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>, x1:T1 of <root>.Outer, x2:T2 of <root>.Outer.Inner) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
         VALUE_PARAMETER name:x1 index:0 type:T1 of <root>.Outer
         VALUE_PARAMETER name:x2 index:1 type:T2 of <root>.Outer.Inner
         BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.fir.txt
index a844d62e69b..a4cf1bd281a 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.fir.txt
@@ -7,10 +7,10 @@ FILE fqName:test fileName:/boundInnerGenericConstructor.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.Foo.Inner<P of test.Foo.Inner>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>
       TYPE_PARAMETER name:P index:0 variance: superTypes:[kotlin.Any?]
-      CONSTRUCTOR visibility:public <> ($this:test.Foo.Inner<P of test.Foo.Inner>, a:T of test.Foo, b:P of test.Foo.Inner) returnType:test.Foo.Inner<P of test.Foo.Inner> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner>
+      CONSTRUCTOR visibility:public <> ($this:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>, a:T of test.Foo, b:P of test.Foo.Inner) returnType:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>
         VALUE_PARAMETER name:a index:0 type:T of test.Foo
         VALUE_PARAMETER name:b index:1 type:P of test.Foo.Inner
         BLOCK_BODY
@@ -20,24 +20,24 @@ FILE fqName:test fileName:/boundInnerGenericConstructor.kt
         FIELD PROPERTY_BACKING_FIELD name:a type:T of test.Foo visibility:private [final]
           EXPRESSION_BODY
             GET_VAR 'a: T of test.Foo declared in test.Foo.Inner.<init>' type=T of test.Foo origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> ($this:test.Foo.Inner<P of test.Foo.Inner>) returnType:T of test.Foo
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> ($this:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>) returnType:T of test.Foo
           correspondingProperty: PROPERTY name:a visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner>
+          $this: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='public final fun <get-a> (): T of test.Foo declared in test.Foo.Inner'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:T of test.Foo visibility:private [final]' type=T of test.Foo origin=null
-                receiver: GET_VAR '<this>: test.Foo.Inner<P of test.Foo.Inner> declared in test.Foo.Inner.<get-a>' type=test.Foo.Inner<P of test.Foo.Inner> origin=null
+                receiver: GET_VAR '<this>: test.Foo.Inner<P of test.Foo.Inner, T of test.Foo> declared in test.Foo.Inner.<get-a>' type=test.Foo.Inner<P of test.Foo.Inner, T of test.Foo> origin=null
       PROPERTY name:b visibility:public modality:FINAL [val]
         FIELD PROPERTY_BACKING_FIELD name:b type:P of test.Foo.Inner visibility:private [final]
           EXPRESSION_BODY
             GET_VAR 'b: P of test.Foo.Inner declared in test.Foo.Inner.<init>' type=P of test.Foo.Inner origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:FINAL <> ($this:test.Foo.Inner<P of test.Foo.Inner>) returnType:P of test.Foo.Inner
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:FINAL <> ($this:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>) returnType:P of test.Foo.Inner
           correspondingProperty: PROPERTY name:b visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner>
+          $this: VALUE_PARAMETER name:<this> type:test.Foo.Inner<P of test.Foo.Inner, T of test.Foo>
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='public final fun <get-b> (): P of test.Foo.Inner declared in test.Foo.Inner'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:b type:P of test.Foo.Inner visibility:private [final]' type=P of test.Foo.Inner origin=null
-                receiver: GET_VAR '<this>: test.Foo.Inner<P of test.Foo.Inner> declared in test.Foo.Inner.<get-b>' type=test.Foo.Inner<P of test.Foo.Inner> origin=null
+                receiver: GET_VAR '<this>: test.Foo.Inner<P of test.Foo.Inner, T of test.Foo> declared in test.Foo.Inner.<get-b>' type=test.Foo.Inner<P of test.Foo.Inner, T of test.Foo> origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
@@ -64,16 +64,16 @@ FILE fqName:test fileName:/boundInnerGenericConstructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:foo visibility:public modality:FINAL <A, B> (a:A of test.foo, b:B of test.foo, x:kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<A of test.foo, B of test.foo>>) returnType:test.Foo.Inner<A of test.foo, B of test.foo> [inline]
+  FUN name:foo visibility:public modality:FINAL <A, B> (a:A of test.foo, b:B of test.foo, x:kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>>) returnType:test.Foo.Inner<B of test.foo, A of test.foo> [inline]
     TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?]
     TYPE_PARAMETER name:B index:1 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:a index:0 type:A of test.foo
     VALUE_PARAMETER name:b index:1 type:B of test.foo
-    VALUE_PARAMETER name:x index:2 type:kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<A of test.foo, B of test.foo>>
+    VALUE_PARAMETER name:x index:2 type:kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun foo <A, B> (a: A of test.foo, b: B of test.foo, x: kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<A of test.foo, B of test.foo>>): test.Foo.Inner<A of test.foo, B of test.foo> [inline] declared in test'
-        CALL 'public abstract fun invoke (p1: P1 of kotlin.Function2, p2: P2 of kotlin.Function2): R of kotlin.Function2 [operator] declared in kotlin.Function2' type=test.Foo.Inner<A of test.foo, B of test.foo> origin=INVOKE
-          $this: GET_VAR 'x: kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<A of test.foo, B of test.foo>> declared in test.foo' type=kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<A of test.foo, B of test.foo>> origin=null
+      RETURN type=kotlin.Nothing from='public final fun foo <A, B> (a: A of test.foo, b: B of test.foo, x: kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>>): test.Foo.Inner<B of test.foo, A of test.foo> [inline] declared in test'
+        CALL 'public abstract fun invoke (p1: P1 of kotlin.Function2, p2: P2 of kotlin.Function2): R of kotlin.Function2 [operator] declared in kotlin.Function2' type=test.Foo.Inner<B of test.foo, A of test.foo> origin=INVOKE
+          $this: GET_VAR 'x: kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>> declared in test.foo' type=kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>> origin=null
           p1: GET_VAR 'a: A of test.foo declared in test.foo' type=A of test.foo origin=null
           p2: GET_VAR 'b: B of test.foo declared in test.foo' type=B of test.foo origin=null
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
@@ -81,14 +81,18 @@ FILE fqName:test fileName:/boundInnerGenericConstructor.kt
       VAR name:z type:test.Foo<kotlin.String> [val]
         CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in test.Foo' type=test.Foo<kotlin.String> origin=null
           <class: T>: kotlin.String
-      VAR name:foo type:IrErrorType [val]
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [test/foo]>#' type=IrErrorType
-          CONST String type=kotlin.String value="O"
-          CONST String type=kotlin.String value="K"
-          FUNCTION_REFERENCE 'public constructor <init> (a: T of test.Foo, b: P of test.Foo.Inner) [primary] declared in test.Foo.Inner' type=kotlin.reflect.KFunction2<T of test.Foo, kotlin.Any?, test.Foo.Inner<kotlin.Any?>> origin=null reflectionTarget=<same>
-            <P>: kotlin.Any?
+      VAR name:foo type:test.Foo.Inner<kotlin.String, kotlin.String> [val]
+        CALL 'public final fun foo <A, B> (a: A of test.foo, b: B of test.foo, x: kotlin.Function2<A of test.foo, B of test.foo, test.Foo.Inner<B of test.foo, A of test.foo>>): test.Foo.Inner<B of test.foo, A of test.foo> [inline] declared in test' type=test.Foo.Inner<kotlin.String, kotlin.String> origin=null
+          <A>: kotlin.String
+          <B>: kotlin.String
+          a: CONST String type=kotlin.String value="O"
+          b: CONST String type=kotlin.String value="K"
+          x: FUNCTION_REFERENCE 'public constructor <init> (a: T of test.Foo, b: P of test.Foo.Inner) [primary] declared in test.Foo.Inner' type=kotlin.reflect.KFunction2<kotlin.String, kotlin.String, test.Foo.Inner<kotlin.String, kotlin.String>> origin=null reflectionTarget=<same>
+            <P>: kotlin.String
             $this: GET_VAR 'val z: test.Foo<kotlin.String> [val] declared in test.box' type=test.Foo<kotlin.String> origin=null
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in test'
-        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin' type=kotlin.String origin=PLUS
-          $receiver: ERROR_CALL 'Unresolved reference: <Unresolved name: a>#' type=IrErrorType
-          other: ERROR_CALL 'Unresolved reference: <Unresolved name: b>#' type=IrErrorType
+        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
+          $this: CALL 'public final fun <get-a> (): T of test.Foo declared in test.Foo.Inner' type=kotlin.String origin=GET_PROPERTY
+            $this: GET_VAR 'val foo: test.Foo.Inner<kotlin.String, kotlin.String> [val] declared in test.box' type=test.Foo.Inner<kotlin.String, kotlin.String> origin=null
+          other: CALL 'public final fun <get-b> (): P of test.Foo.Inner declared in test.Foo.Inner' type=kotlin.String origin=GET_PROPERTY
+            $this: GET_VAR 'val foo: test.Foo.Inner<kotlin.String, kotlin.String> [val] declared in test.box' type=test.Foo.Inner<kotlin.String, kotlin.String> origin=null
diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
index 148b152f143..c8e380d909e 100644
--- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
@@ -1,8 +1,8 @@
 FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
-  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:<root>.K1.K2<kotlin.String>
+  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:<root>.K1.K2<kotlin.String, kotlin.Int>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testKotlin (): <root>.K1.K2<kotlin.String> declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1.K2' type=<root>.K1.K2<kotlin.String> origin=null
+      RETURN type=kotlin.Nothing from='public final fun testKotlin (): <root>.K1.K2<kotlin.String, kotlin.Int> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1.K2' type=<root>.K1.K2<kotlin.String, kotlin.Int> origin=null
           <class: T2>: kotlin.String
           $outer: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1' type=<root>.K1<kotlin.Int> origin=null
             <class: T1>: kotlin.Int
@@ -18,10 +18,10 @@ FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1>
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.CharSequence]
-      CONSTRUCTOR visibility:public <> ($this:<root>.K1.K2<T2 of <root>.K1.K2>) returnType:<root>.K1.K2<T2 of <root>.K1.K2> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2>
+      CONSTRUCTOR visibility:public <> ($this:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1>) returnType:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.K1.K2<T2 of <root>.K1.K2, T1 of <root>.K1>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.fir.txt
index 56374da4364..0de1acb2464 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.fir.txt
@@ -1,11 +1,15 @@
 FILE fqName:<root> fileName:/samConversionInGenericConstructorCall_NI.kt
-  FUN name:test3 visibility:public modality:FINAL <> (f1:kotlin.Function1<kotlin.String, kotlin.String>, f2:kotlin.Function1<kotlin.Int, kotlin.String>) returnType:IrErrorType
+  FUN name:test3 visibility:public modality:FINAL <> (f1:kotlin.Function1<kotlin.String, kotlin.String>, f2:kotlin.Function1<kotlin.Int, kotlin.String>) returnType:<root>.C.D<kotlin.Int?>
     VALUE_PARAMETER name:f1 index:0 type:kotlin.Function1<kotlin.String, kotlin.String>
     VALUE_PARAMETER name:f2 index:1 type:kotlin.Function1<kotlin.Int, kotlin.String>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3 (f1: kotlin.Function1<kotlin.String, kotlin.String>, f2: kotlin.Function1<kotlin.Int, kotlin.String>): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/C.D.D]>#' type=IrErrorType
-          GET_VAR 'f2: kotlin.Function1<kotlin.Int, kotlin.String> declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.String> origin=null
+      RETURN type=kotlin.Nothing from='public final fun test3 (f1: kotlin.Function1<kotlin.String, kotlin.String>, f2: kotlin.Function1<kotlin.Int, kotlin.String>): <root>.C.D<kotlin.Int?> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> (jxy: <root>.J<X of <root>.C?, Y of <root>.C.D?>?) declared in <root>.C.D' type=<root>.C.D<kotlin.Int?> origin=null
+          <class: Y>: kotlin.Int?
+          $outer: CONSTRUCTOR_CALL 'public constructor <init> (jxx: <root>.J<X of <root>.C?, X of <root>.C?>?) declared in <root>.C' type=<root>.C<kotlin.String?> origin=null
+            <class: X>: kotlin.String?
+            jxx: GET_VAR 'f1: kotlin.Function1<kotlin.String, kotlin.String> declared in <root>.test3' type=kotlin.Function1<kotlin.String, kotlin.String> origin=null
+          jxy: GET_VAR 'f2: kotlin.Function1<kotlin.Int, kotlin.String> declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.String> origin=null
   CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer<T1 of <root>.Outer>
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[kotlin.Any?]
@@ -26,10 +30,10 @@ FILE fqName:<root> fileName:/samConversionInGenericConstructorCall_NI.kt
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j11 type:<root>.J<T1 of <root>.Outer, T1 of <root>.Outer> visibility:private [final]' type=<root>.J<T1 of <root>.Outer, T1 of <root>.Outer> origin=null
               receiver: GET_VAR '<this>: <root>.Outer<T1 of <root>.Outer> declared in <root>.Outer.<get-j11>' type=<root>.Outer<T1 of <root>.Outer> origin=null
     CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.Any?]
-      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>, j12:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>, j12:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
         VALUE_PARAMETER name:j12 index:0 type:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
@@ -38,13 +42,13 @@ FILE fqName:<root> fileName:/samConversionInGenericConstructorCall_NI.kt
         FIELD PROPERTY_BACKING_FIELD name:j12 type:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> visibility:private [final]
           EXPRESSION_BODY
             GET_VAR 'j12: <root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> declared in <root>.Outer.Inner.<init>' type=<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-j12> visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>) returnType:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-j12> visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>) returnType:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>
           correspondingProperty: PROPERTY name:j12 visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+          $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='public final fun <get-j12> (): <root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> declared in <root>.Outer.Inner'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j12 type:<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> visibility:private [final]' type=<root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner> origin=null
-                receiver: GET_VAR '<this>: <root>.Outer.Inner<T2 of <root>.Outer.Inner> declared in <root>.Outer.Inner.<get-j12>' type=<root>.Outer.Inner<T2 of <root>.Outer.Inner> origin=null
+                receiver: GET_VAR '<this>: <root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer> declared in <root>.Outer.Inner.<get-j12>' type=<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer> origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
@@ -71,13 +75,17 @@ FILE fqName:<root> fileName:/samConversionInGenericConstructorCall_NI.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:test4 visibility:public modality:FINAL <> (f:kotlin.Function1<kotlin.String, kotlin.String>, g:kotlin.Function1<kotlin.Any, kotlin.String>) returnType:IrErrorType
+  FUN name:test4 visibility:public modality:FINAL <> (f:kotlin.Function1<kotlin.String, kotlin.String>, g:kotlin.Function1<kotlin.Any, kotlin.String>) returnType:<root>.Outer.Inner<kotlin.Any?, kotlin.String?>
     VALUE_PARAMETER name:f index:0 type:kotlin.Function1<kotlin.String, kotlin.String>
     VALUE_PARAMETER name:g index:1 type:kotlin.Function1<kotlin.Any, kotlin.String>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 (f: kotlin.Function1<kotlin.String, kotlin.String>, g: kotlin.Function1<kotlin.Any, kotlin.String>): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Outer.Inner.Inner]>#' type=IrErrorType
-          GET_VAR 'g: kotlin.Function1<kotlin.Any, kotlin.String> declared in <root>.test4' type=kotlin.Function1<kotlin.Any, kotlin.String> origin=null
+      RETURN type=kotlin.Nothing from='public final fun test4 (f: kotlin.Function1<kotlin.String, kotlin.String>, g: kotlin.Function1<kotlin.Any, kotlin.String>): <root>.Outer.Inner<kotlin.Any?, kotlin.String?> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> (j12: <root>.J<T1 of <root>.Outer, T2 of <root>.Outer.Inner>) [primary] declared in <root>.Outer.Inner' type=<root>.Outer.Inner<kotlin.Any?, kotlin.String?> origin=null
+          <class: T2>: kotlin.Any?
+          $outer: CONSTRUCTOR_CALL 'public constructor <init> (j11: <root>.J<T1 of <root>.Outer, T1 of <root>.Outer>) [primary] declared in <root>.Outer' type=<root>.Outer<kotlin.String?> origin=null
+            <class: T1>: kotlin.String?
+            j11: GET_VAR 'f: kotlin.Function1<kotlin.String, kotlin.String> declared in <root>.test4' type=kotlin.Function1<kotlin.String, kotlin.String> origin=null
+          j12: GET_VAR 'g: kotlin.Function1<kotlin.Any, kotlin.String> declared in <root>.test4' type=kotlin.Function1<kotlin.Any, kotlin.String> origin=null
   FUN name:testGenericJavaCtor1 visibility:public modality:FINAL <> (f:kotlin.Function1<kotlin.String, kotlin.Int>) returnType:<root>.G<kotlin.String?>
     VALUE_PARAMETER name:f index:0 type:kotlin.Function1<kotlin.String, kotlin.Int>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
index f515d163629..1f54e62f617 100644
--- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
@@ -35,5 +35,5 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (): <root>.Cell<kotlin.Int> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Cell) [primary] declared in <root>.Cell' type=<root>.Cell<kotlin.Int> origin=null
-          <class: T>: <none>
+          <class: T>: kotlin.Any?
           value: CONST Int type=kotlin.Int value=42
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
index 61ebddf5faf..6f22cae4063 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
@@ -19,9 +19,9 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Outer visibility:private [final]' type=T of <root>.Outer origin=null
               receiver: GET_VAR '<this>: <root>.Outer<T of <root>.Outer> declared in <root>.Outer.<get-x>' type=<root>.Outer<T of <root>.Outer> origin=null
     CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner
-      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner, y:kotlin.Int) returnType:<root>.Outer.Inner [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T of <root>.Outer>, y:kotlin.Int) returnType:<root>.Outer.Inner<T of <root>.Outer> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
         VALUE_PARAMETER name:y index:0 type:kotlin.Int
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
@@ -30,13 +30,13 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
         FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]
           EXPRESSION_BODY
             GET_VAR 'y: kotlin.Int declared in <root>.Outer.Inner.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Outer.Inner) returnType:kotlin.Int
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T of <root>.Outer>) returnType:kotlin.Int
           correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner
+          $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Outer.Inner'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
-                receiver: GET_VAR '<this>: <root>.Outer.Inner declared in <root>.Outer.Inner.<get-y>' type=<root>.Outer.Inner origin=null
+                receiver: GET_VAR '<this>: <root>.Outer.Inner<T of <root>.Outer> declared in <root>.Outer.Inner.<get-y>' type=<root>.Outer.Inner<T of <root>.Outer> origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt
index a83bf29b8eb..b6e2ab73a16 100644
--- a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt
+++ b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.fir.txt
@@ -196,58 +196,58 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   PROPERTY name:additionalText visibility:public modality:FINAL [delegated,val]
-    FIELD PROPERTY_DELEGATE name:additionalText$delegate type:<root>.additionalText$delegate.<no name provided> visibility:private [final,static]
+    FIELD PROPERTY_DELEGATE name:additionalText$delegate type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final,static]
       EXPRESSION_BODY
-        BLOCK type=<root>.additionalText$delegate.<no name provided> origin=OBJECT_LITERAL
+        BLOCK type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
           CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>>]
-            $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided>
-            CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided> [primary]
+            $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
+            CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> [primary]
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>>]'
-            FUN name:qux11 visibility:public modality:FINAL <F11T> ($this:<root>.additionalText$delegate.<no name provided>, t:F11T of <root>.additionalText$delegate.<no name provided>.qux11) returnType:F11T of <root>.additionalText$delegate.<no name provided>.qux11
+            FUN name:qux11 visibility:public modality:FINAL <F11T> ($this:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>, t:F11T of <root>.additionalText$delegate.<no name provided>.qux11) returnType:F11T of <root>.additionalText$delegate.<no name provided>.qux11
               TYPE_PARAMETER name:F11T index:0 variance: superTypes:[kotlin.Any?]
-              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>
+              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
               VALUE_PARAMETER name:t index:0 type:F11T of <root>.additionalText$delegate.<no name provided>.qux11
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='public final fun qux11 <F11T> (t: F11T of <root>.additionalText$delegate.<no name provided>.qux11): F11T of <root>.additionalText$delegate.<no name provided>.qux11 declared in <root>.additionalText$delegate.<no name provided>'
                   GET_VAR 't: F11T of <root>.additionalText$delegate.<no name provided>.qux11 declared in <root>.additionalText$delegate.<no name provided>.qux11' type=F11T of <root>.additionalText$delegate.<no name provided>.qux11 origin=null
-            FUN name:qux12 visibility:public modality:FINAL <F12T> ($this:<root>.additionalText$delegate.<no name provided>, t:F12T of <root>.additionalText$delegate.<no name provided>.qux12) returnType:T of <root>.<get-additionalText>
+            FUN name:qux12 visibility:public modality:FINAL <F12T> ($this:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>, t:F12T of <root>.additionalText$delegate.<no name provided>.qux12) returnType:T of <root>.<get-additionalText>
               TYPE_PARAMETER name:F12T index:0 variance: superTypes:[<root>.IR<T of <root>.<get-additionalText>>]
-              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>
+              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
               VALUE_PARAMETER name:t index:0 type:F12T of <root>.additionalText$delegate.<no name provided>.qux12
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='public final fun qux12 <F12T> (t: F12T of <root>.additionalText$delegate.<no name provided>.qux12): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>'
                   CALL 'public abstract fun foo (): R of <root>.IR declared in <root>.IR' type=T of <root>.<get-additionalText> origin=null
                     $this: GET_VAR 't: F12T of <root>.additionalText$delegate.<no name provided>.qux12 declared in <root>.additionalText$delegate.<no name provided>.qux12' type=F12T of <root>.additionalText$delegate.<no name provided>.qux12 origin=null
             PROPERTY name:deepO visibility:private modality:FINAL [delegated,val]
-              FIELD PROPERTY_DELEGATE name:deepO$delegate type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> visibility:private [final]
+              FIELD PROPERTY_DELEGATE name:deepO$delegate type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final]
                 EXPRESSION_BODY
-                  BLOCK type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> origin=OBJECT_LITERAL
+                  BLOCK type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
                     CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, T of <root>.<get-additionalText>>]
-                      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>
-                      CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> [primary]
+                      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>
+                      CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> [primary]
                         BLOCK_BODY
                           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, T of <root>.<get-additionalText>>]'
-                      FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.<get-additionalText>
-                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>
+                      FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.<get-additionalText>
+                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>
                         VALUE_PARAMETER name:t index:0 type:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>
                         VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='public final fun getValue (t: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p: kotlin.reflect.KProperty<*>): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>'
                             CALL 'public final fun <get-value1> (): T of <root>.Value declared in <root>.Value' type=T of <root>.<get-additionalText> origin=GET_PROPERTY
                               $this: GET_VAR 't: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.getValue' type=<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> origin=null
-                      FUN name:qux21 visibility:public modality:FINAL <F21T> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>, t:F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21) returnType:F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21
+                      FUN name:qux21 visibility:public modality:FINAL <F21T> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>, t:F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21) returnType:F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21
                         TYPE_PARAMETER name:F21T index:0 variance: superTypes:[kotlin.Any?]
-                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>
+                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>
                         VALUE_PARAMETER name:t index:0 type:F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='public final fun qux21 <F21T> (t: F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21): F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21 declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>'
                             GET_VAR 't: F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21 declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21' type=F21T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux21 origin=null
-                      FUN name:qux22 visibility:public modality:FINAL <F22T> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>, t:F22T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux22) returnType:T of <root>.<get-additionalText>
+                      FUN name:qux22 visibility:public modality:FINAL <F22T> ($this:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>, t:F22T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux22) returnType:T of <root>.<get-additionalText>
                         TYPE_PARAMETER name:F22T index:0 variance: superTypes:[<root>.IR<T of <root>.<get-additionalText>>]
-                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>
+                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>>
                         VALUE_PARAMETER name:t index:0 type:F22T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux22
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='public final fun qux22 <F22T> (t: F22T of <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>.qux22): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>'
@@ -266,30 +266,30 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
                         overridden:
                           public open fun toString (): kotlin.String declared in kotlin.Any
                         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                    CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> origin=OBJECT_LITERAL
-              FUN DELEGATED_PROPERTY_ACCESSOR name:<get-deepO> visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>, $receiver:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>) returnType:T of <root>.<get-additionalText>
+                    CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
+              FUN DELEGATED_PROPERTY_ACCESSOR name:<get-deepO> visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>, $receiver:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>) returnType:T of <root>.<get-additionalText>
                 correspondingProperty: PROPERTY name:deepO visibility:private modality:FINAL [delegated,val]
-                $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>
+                $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
                 $receiver: VALUE_PARAMETER name:<this> type:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-deepO> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>'
                     CALL 'public final fun getValue (t: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p: kotlin.reflect.KProperty<*>): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided>' type=T of <root>.<get-additionalText> origin=null
-                      $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:deepO$delegate type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> visibility:private [final]' type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided> origin=null
-                        receiver: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.<get-deepO>' type=<root>.additionalText$delegate.<no name provided> origin=null
-                      t: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.<get-deepO>' type=<root>.additionalText$delegate.<no name provided> origin=null
+                      $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:deepO$delegate type:<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final]' type=<root>.additionalText$delegate.<no name provided>.deepO$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
+                        receiver: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.<get-deepO>' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
+                      t: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.<get-deepO>' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
                       p: PROPERTY_REFERENCE 'private final deepO: T of <root>.<get-additionalText> [delegated,val]' field=null getter='public final fun <get-deepO> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>' setter=null type=kotlin.reflect.KProperty2<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, *, T of <root>.<get-additionalText>> origin=PROPERTY_REFERENCE_FOR_DELEGATE
             PROPERTY name:deepK visibility:private modality:FINAL [delegated,val]
-              FIELD PROPERTY_DELEGATE name:deepK$delegate type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> visibility:private [final]
+              FIELD PROPERTY_DELEGATE name:deepK$delegate type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final]
                 EXPRESSION_BODY
-                  BLOCK type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> origin=OBJECT_LITERAL
+                  BLOCK type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
                     CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, T of <root>.<get-additionalText>>]
-                      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>
-                      CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> [primary]
+                      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>>
+                      CONSTRUCTOR visibility:private <> () returnType:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> [primary]
                         BLOCK_BODY
                           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, T of <root>.<get-additionalText>>]'
-                      FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.<get-additionalText>
-                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>
+                      FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.<get-additionalText>
+                        $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>>
                         VALUE_PARAMETER name:t index:0 type:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>
                         VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
                         BLOCK_BODY
@@ -310,20 +310,20 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
                         overridden:
                           public open fun toString (): kotlin.String declared in kotlin.Any
                         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                    CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> origin=OBJECT_LITERAL
-              FUN DELEGATED_PROPERTY_ACCESSOR name:<get-deepK> visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>, $receiver:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>) returnType:T of <root>.<get-additionalText>
+                    CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
+              FUN DELEGATED_PROPERTY_ACCESSOR name:<get-deepK> visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>, $receiver:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>) returnType:T of <root>.<get-additionalText>
                 correspondingProperty: PROPERTY name:deepK visibility:private modality:FINAL [delegated,val]
-                $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>
+                $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
                 $receiver: VALUE_PARAMETER name:<this> type:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-deepK> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>'
                     CALL 'public final fun getValue (t: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p: kotlin.reflect.KProperty<*>): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided>' type=T of <root>.<get-additionalText> origin=null
-                      $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:deepK$delegate type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> visibility:private [final]' type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided> origin=null
-                        receiver: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.<get-deepK>' type=<root>.additionalText$delegate.<no name provided> origin=null
-                      t: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.<get-deepK>' type=<root>.additionalText$delegate.<no name provided> origin=null
+                      $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:deepK$delegate type:<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final]' type=<root>.additionalText$delegate.<no name provided>.deepK$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
+                        receiver: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.<get-deepK>' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
+                      t: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.<get-deepK>' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
                       p: PROPERTY_REFERENCE 'private final deepK: T of <root>.<get-additionalText> [delegated,val]' field=null getter='public final fun <get-deepK> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>' setter=null type=kotlin.reflect.KProperty2<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, *, T of <root>.<get-additionalText>> origin=PROPERTY_REFERENCE_FOR_DELEGATE
-            FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:<root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>
-              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided>
+            FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>, t:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p:kotlin.reflect.KProperty<*>) returnType:<root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>
+              $this: VALUE_PARAMETER name:<this> type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>>
               VALUE_PARAMETER name:t index:0 type:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>
               VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
               BLOCK_BODY
@@ -332,10 +332,10 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
                     <class: P1>: T of <root>.<get-additionalText>
                     <class: P2>: T of <root>.<get-additionalText>
                     p1: CALL 'public final fun <get-deepO> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>' type=T of <root>.<get-additionalText> origin=GET_PROPERTY
-                      $this: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.additionalText$delegate.<no name provided> origin=null
+                      $this: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
                       $receiver: GET_VAR 't: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> origin=null
                     p2: CALL 'public final fun <get-deepK> (): T of <root>.<get-additionalText> declared in <root>.additionalText$delegate.<no name provided>' type=T of <root>.<get-additionalText> origin=GET_PROPERTY
-                      $this: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.additionalText$delegate.<no name provided> origin=null
+                      $this: GET_VAR '<this>: <root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
                       $receiver: GET_VAR 't: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> declared in <root>.additionalText$delegate.<no name provided>.getValue' type=<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> origin=null
             FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
               overridden:
@@ -350,7 +350,7 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
               overridden:
                 public open fun toString (): kotlin.String declared in kotlin.Any
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-          CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided> origin=OBJECT_LITERAL
+          CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.additionalText$delegate.<no name provided>' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=OBJECT_LITERAL
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-additionalText> visibility:public modality:FINAL <T> ($receiver:<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>) returnType:<root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>
       correspondingProperty: PROPERTY name:additionalText visibility:public modality:FINAL [delegated,val]
       TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
@@ -358,7 +358,7 @@ FILE fqName:<root> fileName:/genericDelegatedDeepProperty.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-additionalText> <T> (): <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>> declared in <root>'
           CALL 'public final fun getValue (t: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, p: kotlin.reflect.KProperty<*>): <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>> declared in <root>.additionalText$delegate.<no name provided>' type=<root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>> origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:additionalText$delegate type:<root>.additionalText$delegate.<no name provided> visibility:private [final,static]' type=<root>.additionalText$delegate.<no name provided> origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:additionalText$delegate type:<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> visibility:private [final,static]' type=<root>.additionalText$delegate.<no name provided><T of <root>.<get-additionalText>> origin=null
             t: GET_VAR '<this>: <root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> declared in <root>.<get-additionalText>' type=<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>> origin=null
             p: PROPERTY_REFERENCE 'public final additionalText: <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>> [delegated,val]' field=null getter='public final fun <get-additionalText> <T> (): <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>> declared in <root>' setter=null type=kotlin.reflect.KProperty1<<root>.Value<T of <root>.<get-additionalText>, <root>.CR<T of <root>.<get-additionalText>>>, <root>.P<T of <root>.<get-additionalText>, T of <root>.<get-additionalText>>> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               <1>: <none>
diff --git a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
index 19783e737d2..912929266fc 100644
--- a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
@@ -30,16 +30,18 @@ FILE fqName:<root> fileName:/smartCastOnReceiverOfGenericType.kt
     VALUE_PARAMETER name:b index:1 type:kotlin.Any
     VALUE_PARAMETER name:c index:2 type:kotlin.Any
     BLOCK_BODY
-      TYPE_OP type=<root>.Outer.Inner<kotlin.Int, kotlin.String> origin=CAST typeOperand=<root>.Outer.Inner<kotlin.Int, kotlin.String>
+      TYPE_OP type=<root>.Outer.Inner<kotlin.String, kotlin.Int> origin=CAST typeOperand=<root>.Outer.Inner<kotlin.String, kotlin.Int>
         GET_VAR 'a: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
       TYPE_OP type=kotlin.Int origin=CAST typeOperand=kotlin.Int
         GET_VAR 'b: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
       TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String
         GET_VAR 'c: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Outer.Inner.use]>#' type=IrErrorType
-        TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
+      CALL 'public final fun use (x1: T1 of <root>.Outer, x2: T2 of <root>.Outer.Inner): kotlin.Unit declared in <root>.Outer.Inner' type=kotlin.Unit origin=null
+        $this: TYPE_OP type=<root>.Outer.Inner<kotlin.String, kotlin.Int> origin=IMPLICIT_CAST typeOperand=<root>.Outer.Inner<kotlin.String, kotlin.Int>
+          GET_VAR 'a: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
+        x1: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
           GET_VAR 'b: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
-        TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
+        x2: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
           GET_VAR 'c: kotlin.Any declared in <root>.testInnerClass' type=kotlin.Any origin=null
   FUN name:testNonSubstitutedTypeParameter visibility:public modality:FINAL <T> (a:kotlin.Any, b:kotlin.Any) returnType:kotlin.Unit
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
@@ -103,15 +105,15 @@ FILE fqName:<root> fileName:/smartCastOnReceiverOfGenericType.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[kotlin.Any?]
-      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>) returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
-      FUN name:use visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner>, x1:T1 of <root>.Outer, x2:T2 of <root>.Outer.Inner) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner>
+      FUN name:use visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>, x1:T1 of <root>.Outer, x2:T2 of <root>.Outer.Inner) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T2 of <root>.Outer.Inner, T1 of <root>.Outer>
         VALUE_PARAMETER name:x1 index:0 type:T1 of <root>.Outer
         VALUE_PARAMETER name:x2 index:1 type:T2 of <root>.Outer.Inner
         BLOCK_BODY