From c2ad4751539777b88dc56503293d52677edd2555 Mon Sep 17 00:00:00 2001
From: Nikolay Lunyak <nikolay.lunyak@jetbrains.com>
Date: Thu, 27 Jul 2023 11:51:48 +0300
Subject: [PATCH] [FIR] Render outer type parameters differently

---
 .../testdata/lazyResolve/localConstructor.txt | 10 ++--
 .../lazyResolve/localConstructorScript.txt    | 18 +++----
 .../lazyResolve/typeParameterOfClass2.txt     | 28 +++++-----
 .../typeParameterOfClass2Script.txt           | 52 +++++++++----------
 .../testdata/onAirResolve/classInClass.txt    |  2 +-
 .../invokeWithReceiverAndArgument.fir.txt     |  4 +-
 .../diagnostics/conflictingProjection.fir.txt | 12 ++---
 ...RedundantVisibilityModifierChecker.fir.txt |  2 +-
 .../resolve/fromBuilder/complexTypes.fir.txt  |  2 +-
 .../innerTypeFromSuperClassInBody.fir.txt     |  2 +-
 .../resolve/innerClasses/innerTypes.fir.txt   |  2 +-
 ...correctReferenceOnInnerClassMember.fir.txt |  2 +-
 .../resolve/throwableSubclass.fir.txt         |  8 +--
 .../capturedParametersOfInnerClasses.fir.txt  |  4 +-
 .../InnerClassOfThrowableOnObject.fir.txt     |  2 +-
 .../intellij/baseIntrospector.fir.txt         |  4 +-
 .../j+k/KJKComplexHierarchyWithNested.fir.txt |  2 +-
 .../declarations/complexTypes.lazyBodies.txt  |  2 +-
 .../rawBuilder/declarations/complexTypes.txt  |  2 +-
 .../typeParameterVsNested.lazyBodies.txt      |  2 +-
 .../declarations/typeParameterVsNested.txt    |  2 +-
 .../kotlin/fir/renderer/FirRenderer.kt        | 13 ++++-
 .../tests/visibility/privateToThis.fir.txt    |  2 +-
 .../InnerClassReferencesOuterTP.fir.txt       |  2 +-
 .../InnerClassTypeMultipleGeneric.fir.txt     |  4 +-
 .../InnerClassesInGeneric.fir.txt             |  4 +-
 .../compiledJava/InnerOfGeneric.fir.txt       |  4 +-
 .../MethodReferencesOuterClassTP.fir.txt      |  2 +-
 .../TypeParameterOfOuterClass.fir.txt         |  2 +-
 .../ReturnInnerSubclassOfSupersInner.fir.txt  |  4 +-
 .../types/ClassLiteralArgument.fir.k1.txt     |  2 +-
 .../types/ClassLiteralArgument.fir.k2.txt     |  2 +-
 .../compiledKotlin/class/InnerTypes.fir.txt   |  6 +--
 .../nestedClasses/deepInnerGeneric.fir.k1.txt |  6 +--
 .../nestedClasses/deepInnerGeneric.fir.k2.txt |  6 +--
 .../innerClassReferencesOuterTP.fir.txt       |  2 +-
 .../membersReferenceOuterTP.fir.txt           |  2 +-
 37 files changed, 118 insertions(+), 109 deletions(-)

diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt
index be64d2258b1..1823338d3d9 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt
@@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
         public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] E, [ResolvedTo(CONTRACTS)] F> foo(): <implicit> {
             ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-                local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(CONTRACTS)] E, [ResolvedTo(CONTRACTS)] F> : R|kotlin/Any| {
+                local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(CONTRACTS)] Outer(E), [ResolvedTo(CONTRACTS)] Outer(F)> : R|kotlin/Any| {
                     public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                         super<R|kotlin/Any|>()
                     }
@@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
         public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] E, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
             ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] E, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F> : R|kotlin/Any| {
+                local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Outer(E), [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                     public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                         super<R|kotlin/Any|>()
                     }
@@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
         public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] E, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] F> foo(): R|() -> Q.C<F, E, F>| {
             ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] E, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] F> : R|kotlin/Any| {
+                local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Outer(E), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Outer(F)> : R|kotlin/Any| {
                     public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                         super<R|kotlin/Any|>()
                     }
@@ -221,7 +221,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
             ^foo [ResolvedTo(BODY_RESOLVE)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> : R|kotlin/Any| {
+                local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] Outer(E), [ResolvedTo(BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor<[ResolvedTo(BODY_RESOLVE)] G>(): R|Q.C<G, E, F>| {
                         super<R|kotlin/Any|>()
                     }
@@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
             ^foo [ResolvedTo(BODY_RESOLVE)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> : R|kotlin/Any| {
+                local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] Outer(E), [ResolvedTo(BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                     public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor<[ResolvedTo(BODY_RESOLVE)] G>(): R|Q.C<G, E, F>| {
                         super<R|kotlin/Any|>()
                     }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
index 60843ccafba..d2ea1f64d71 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
@@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
             public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] E, [ResolvedTo(CONTRACTS)] F> foo(): <implicit> {
                 ^foo [ResolvedTo(RAW_FIR)] fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(CONTRACTS)] E, [ResolvedTo(CONTRACTS)] F> : R|kotlin/Any| {
+                    local final? [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(CONTRACTS)] Outer(E), [ResolvedTo(CONTRACTS)] Outer(F)> : R|kotlin/Any| {
                         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
@@ -202,7 +202,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| {
@@ -216,7 +216,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
             public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] E, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
                 ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] E, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F> : R|kotlin/Any| {
+                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Outer(E), [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                         public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
@@ -243,7 +243,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| {
@@ -257,7 +257,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
             public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] E, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] F> foo(): R|() -> Q.C<F, E, F>| {
                 ^foo [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] E, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] F> : R|kotlin/Any| {
+                    local final [ResolvedTo(RAW_FIR)] class C<[ResolvedTo(RAW_FIR)] G, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Outer(E), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Outer(F)> : R|kotlin/Any| {
                         public [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor<[ResolvedTo(RAW_FIR)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
@@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| {
@@ -298,7 +298,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
             public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
                 ^foo [ResolvedTo(BODY_RESOLVE)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> : R|kotlin/Any| {
+                    local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] Outer(E), [ResolvedTo(BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor<[ResolvedTo(BODY_RESOLVE)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
@@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
         [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T> magic(): R|T| {
@@ -339,7 +339,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
 
             public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> foo(): R|() -> Q.C<F, E, F>| {
                 ^foo [ResolvedTo(BODY_RESOLVE)] fun <anonymous>(): R|Q.C<F, E, F>| <inline=Unknown>  {
-                    local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] E, [ResolvedTo(BODY_RESOLVE)] F> : R|kotlin/Any| {
+                    local final [ResolvedTo(BODY_RESOLVE)] class C<[ResolvedTo(BODY_RESOLVE)] G, [ResolvedTo(BODY_RESOLVE)] Outer(E), [ResolvedTo(BODY_RESOLVE)] Outer(F)> : R|kotlin/Any| {
                         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor<[ResolvedTo(BODY_RESOLVE)] G>(): R|Q.C<G, E, F>| {
                             super<R|kotlin/Any|>()
                         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2.txt
index e5b07fd5dd6..fe11ddf59c8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2.txt
@@ -5,7 +5,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -21,7 +21,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -37,7 +37,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Second<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Second<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -53,7 +53,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(COMPANION_GENERATION)] class Second<[ResolvedTo(COMPANION_GENERATION)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(COMPANION_GENERATION)] class Second<[ResolvedTo(COMPANION_GENERATION)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(COMPANION_GENERATION)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(SUPER_TYPES)] class Second<[ResolvedTo(SUPER_TYPES)] Type2, [ResolvedTo(SUPER_TYPES)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(SUPER_TYPES)] class Second<[ResolvedTo(SUPER_TYPES)] Type2, [ResolvedTo(SUPER_TYPES)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(SUPER_TYPES)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -85,7 +85,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner [ResolvedTo(TYPES)] class Second<[ResolvedTo(TYPES)] Type2, [ResolvedTo(TYPES)] Type> : R|kotlin/Any| {
+        public? final? inner [ResolvedTo(TYPES)] class Second<[ResolvedTo(TYPES)] Type2, [ResolvedTo(TYPES)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(TYPES)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -101,7 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Second<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Second<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -149,7 +149,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(CONTRACTS)] class Second<[ResolvedTo(CONTRACTS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(CONTRACTS)] class Second<[ResolvedTo(CONTRACTS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(CONTRACTS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Second<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Second<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class Second<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class Second<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 LAZY_super<R|kotlin/Any|>
             }
@@ -197,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 super<R|kotlin/Any|>()
             }
@@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| {
+        public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(BODY_RESOLVE)] Outer(Type)> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
index 08a5249bb9f..4bc8eb04678 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
@@ -9,7 +9,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(RAW_FIR)] class Second<[ResolvedTo(RAW_FIR)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(RAW_FIR)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -43,7 +43,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
@@ -51,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Second<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Second<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
@@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(COMPANION_GENERATION)] class Second<[ResolvedTo(COMPANION_GENERATION)] Type2, [ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(COMPANION_GENERATION)] class Second<[ResolvedTo(COMPANION_GENERATION)] Type2, [ResolvedTo(RAW_FIR)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(COMPANION_GENERATION)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -85,7 +85,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(SUPER_TYPES)] class MyClass<[ResolvedTo(SUPER_TYPES)] Type> : R|kotlin/Any| {
@@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(SUPER_TYPES)] class Second<[ResolvedTo(SUPER_TYPES)] Type2, [ResolvedTo(SUPER_TYPES)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(SUPER_TYPES)] class Second<[ResolvedTo(SUPER_TYPES)] Type2, [ResolvedTo(SUPER_TYPES)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(SUPER_TYPES)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -106,7 +106,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(TYPES)] class MyClass<[ResolvedTo(TYPES)] Type> : R|kotlin/Any| {
@@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? inner [ResolvedTo(TYPES)] class Second<[ResolvedTo(TYPES)] Type2, [ResolvedTo(TYPES)] Type> : R|kotlin/Any| {
+            public? final? inner [ResolvedTo(TYPES)] class Second<[ResolvedTo(TYPES)] Type2, [ResolvedTo(TYPES)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(TYPES)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -127,7 +127,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(STATUS)] class Second<[ResolvedTo(STATUS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(STATUS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] 
+    SCRIPT: [ResolvedTo(RAW_FIR)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Second<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Second<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -169,7 +169,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -177,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class Second<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -190,7 +190,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(CONTRACTS)] class Second<[ResolvedTo(CONTRACTS)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(CONTRACTS)] class Second<[ResolvedTo(CONTRACTS)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(CONTRACTS)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -211,7 +211,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -219,7 +219,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Second<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Second<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class Second<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class Second<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     LAZY_super<R|kotlin/Any|>
                 }
@@ -253,7 +253,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(TYPES)] 
+    SCRIPT: [ResolvedTo(TYPES)]
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
@@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(STATUS)] Outer(Type)> : R|kotlin/Any| {
                 public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
@@ -274,7 +274,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
         [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass<[ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| {
@@ -282,7 +282,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
                 super<R|kotlin/Any|>()
             }
 
-            public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| {
+            public final inner [ResolvedTo(BODY_RESOLVE)] class Second<[ResolvedTo(BODY_RESOLVE)] Type2, [ResolvedTo(BODY_RESOLVE)] Outer(Type)> : R|kotlin/Any| {
                 public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Second] MyClass<Type>.constructor<[ResolvedTo(BODY_RESOLVE)] Type2>(): R|MyClass.Second<Type2, Type>| {
                     super<R|kotlin/Any|>()
                 }
diff --git a/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt b/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt
index 60d67660408..cfa013025d7 100644
--- a/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt
+++ b/analysis/low-level-api-fir/testdata/onAirResolve/classInClass.txt
@@ -1,4 +1,4 @@
-public final inner [ResolvedTo(BODY_RESOLVE)] class ONAIR<[ResolvedTo(STATUS)] T> : R|X.BASE| {
+public final inner [ResolvedTo(BODY_RESOLVE)] class ONAIR<[ResolvedTo(STATUS)] Outer(T)> : R|X.BASE| {
     public [ResolvedTo(BODY_RESOLVE)] X<T>.constructor(): R|X.ONAIR<T>| {
         super<R|X.BASE|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt
index 840c093867e..f791adac22f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt
@@ -19,7 +19,7 @@ FILE: invokeWithReceiverAndArgument.kt
 
         }
 
-        public final inner class LeafBuilderConfigurationContext<T : R|AbstractFirTreeBuilder|> : R|AbstractBuilderConfigurator.BuilderConfigurationContext| {
+        public final inner class LeafBuilderConfigurationContext<Outer(T) : R|AbstractFirTreeBuilder|> : R|AbstractBuilderConfigurator.BuilderConfigurationContext| {
             public AbstractBuilderConfigurator<T>.constructor(): R|AbstractBuilderConfigurator.LeafBuilderConfigurationContext<T>| {
                 super<R|AbstractBuilderConfigurator.BuilderConfigurationContext|>()
             }
@@ -43,7 +43,7 @@ FILE: invokeWithReceiverAndArgument.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Inner<E> : R|kotlin/Any| {
+        public final inner class Inner<Outer(E)> : R|kotlin/Any| {
             public Outer<E>.constructor(): R|Outer.Inner<E>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
index 5ee67bbdf2e..98cf73563da 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
@@ -67,12 +67,12 @@ FILE: conflictingProjection.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Intermediate<K, T> : R|kotlin/Any| {
+        public final inner class Intermediate<K, Outer(T)> : R|kotlin/Any| {
             public Outer<T>.constructor<K>(): R|Outer.Intermediate<K, T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner class Inner<G, K, T> : R|kotlin/Any| {
+            public final inner class Inner<G, Outer(K), Outer(T)> : R|kotlin/Any| {
                 public Outer.Intermediate<K, T>.constructor<G>(): R|Outer.Intermediate.Inner<G, K, T>| {
                     super<R|kotlin/Any|>()
                 }
@@ -114,12 +114,12 @@ FILE: conflictingProjection.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class OutIntermediate<out K, in T> : R|kotlin/Any| {
+        public final inner class OutIntermediate<out K, in Outer(T)> : R|kotlin/Any| {
             public InOuter<T>.constructor<out K>(): R|InOuter.OutIntermediate<K, T>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner class InInner<in G, out K, in T> : R|kotlin/Any| {
+            public final inner class InInner<in G, out Outer(K), in Outer(T)> : R|kotlin/Any| {
                 public InOuter.OutIntermediate<K, T>.constructor<in G>(): R|InOuter.OutIntermediate.InInner<G, K, T>| {
                     super<R|kotlin/Any|>()
                 }
@@ -161,12 +161,12 @@ FILE: conflictingProjection.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class TwoParametersIntermediate<out K, K1, T, in T1> : R|kotlin/Any| {
+        public final inner class TwoParametersIntermediate<out K, K1, Outer(T), in Outer(T1)> : R|kotlin/Any| {
             public TwoParametersOuter<T, T1>.constructor<out K, K1>(): R|TwoParametersOuter.TwoParametersIntermediate<K, K1, T, T1>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner class InInner<in G, G1, out K, K1, T, in T1> : R|kotlin/Any| {
+            public final inner class InInner<in G, G1, out Outer(K), Outer(K1), Outer(T), in Outer(T1)> : R|kotlin/Any| {
                 public TwoParametersOuter.TwoParametersIntermediate<K, K1, T, T1>.constructor<in G, G1>(): R|TwoParametersOuter.TwoParametersIntermediate.InInner<G, G1, K, K1, T, T1>| {
                     super<R|kotlin/Any|>()
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt
index a1ef6514bab..cb145586674 100644
--- a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt
@@ -44,7 +44,7 @@ FILE: RedundantVisibilityModifierChecker.kt
         public final fun <T1, T2> foo2(): R|kotlin/Unit| {
         }
 
-        internal final inner class B<T, T2, T1, T2 : R|T1|> : R|kotlin/Any| {
+        internal final inner class B<T, T2, Outer(T1), Outer(T2) : R|T1|> : R|kotlin/Any| {
             public Foo2<T1, T2>.constructor<T, T2>(): R|Foo2.B<T, T2, T1, T2>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt
index 5b382e9fe45..449283a4428 100644
--- a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt
@@ -6,7 +6,7 @@ FILE: complexTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class D<R, in P, T, out S> : R|kotlin/Any| {
+        public final inner class D<R, in P, Outer(T), out Outer(S)> : R|kotlin/Any| {
             public a/b/C<T, S>.constructor<R, in P>(): R|a/b/C.D<R, P, T, S>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt
index 596a06bff3f..671f0ae04f2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt
@@ -4,7 +4,7 @@ FILE: innerTypeFromSuperClassInBody.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Inner<X : R|kotlin/CharSequence|> : R|kotlin/Any| {
+        public final inner class Inner<Outer(X) : R|kotlin/CharSequence|> : R|kotlin/Any| {
             public A<X>.constructor(): R|A.Inner<X>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt
index f76469e9fb4..83e437d6996 100644
--- a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt
@@ -4,7 +4,7 @@ FILE: innerTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Inner<K, T> : R|kotlin/Any| {
+        public final inner class Inner<K, Outer(T)> : R|kotlin/Any| {
             public Outer<T>.constructor<K>(): R|Outer.Inner<K, T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/incorrectReferenceOnInnerClassMember.fir.txt b/compiler/fir/analysis-tests/testData/resolve/references/incorrectReferenceOnInnerClassMember.fir.txt
index bd75a97b793..8ca5c9d73d2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/references/incorrectReferenceOnInnerClassMember.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/references/incorrectReferenceOnInnerClassMember.fir.txt
@@ -6,7 +6,7 @@ FILE: incorrectReferenceOnInnerClassMember.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Inner<T> : R|kotlin/Any| {
+        public final inner class Inner<Outer(T)> : R|kotlin/Any| {
             public foo/Outer<T>.constructor(): R|foo/Outer.Inner<T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/throwableSubclass.fir.txt b/compiler/fir/analysis-tests/testData/resolve/throwableSubclass.fir.txt
index ed4ec312038..35b9cce8f7d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/throwableSubclass.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/throwableSubclass.fir.txt
@@ -4,7 +4,7 @@ FILE: throwableSubclass.kt
             super<R|kotlin/Exception|>()
         }
 
-        public final inner class Test2<S, T, B> : R|kotlin/Throwable| {
+        public final inner class Test2<S, Outer(T), Outer(B)> : R|kotlin/Throwable| {
             public Test1<T, B>.constructor<S>(): R|Test1.Test2<S, T, B>| {
                 super<R|kotlin/Throwable|>()
             }
@@ -31,7 +31,7 @@ FILE: throwableSubclass.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class Test6<T, B> : R|kotlin/Exception| {
+        public final inner class Test6<Outer(T), Outer(B)> : R|kotlin/Exception| {
             public Test5<T, B>.constructor(): R|Test5.Test6<T, B>| {
                 super<R|kotlin/Exception|>()
             }
@@ -39,7 +39,7 @@ FILE: throwableSubclass.kt
         }
 
         public final fun foo(): R|kotlin/Unit| {
-            local final class Test7<T, B> : R|kotlin/Throwable| {
+            local final class Test7<Outer(T), Outer(B)> : R|kotlin/Throwable| {
                 public constructor(): R|Test5.Test7<T, B>| {
                     super<R|kotlin/Throwable|>()
                 }
@@ -50,7 +50,7 @@ FILE: throwableSubclass.kt
 
     }
     public final fun <Z> topLevelFun(): R|kotlin/Unit| {
-        local final class Test8<Z> : R|kotlin/Error| {
+        local final class Test8<Outer(Z)> : R|kotlin/Error| {
             public constructor(): R|Test8<Z>| {
                 super<R|kotlin/Error|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt b/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt
index 4e860d75251..e3de40445a5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt
@@ -4,12 +4,12 @@ FILE: capturedParametersOfInnerClasses.kt
             super<R|kotlin/Any|>()
         }
 
-        public final inner class B<K1, K2, T1, T2> : R|kotlin/Any| {
+        public final inner class B<K1, K2, Outer(T1), Outer(T2)> : R|kotlin/Any| {
             public A<T1, T2>.constructor<K1, K2>(): R|A.B<K1, K2, T1, T2>| {
                 super<R|kotlin/Any|>()
             }
 
-            public final inner class C<U1, U2, K1, K2, T1, T2> : R|kotlin/Any| {
+            public final inner class C<U1, U2, Outer(K1), Outer(K2), Outer(T1), Outer(T2)> : R|kotlin/Any| {
                 public A.B<K1, K2, T1, T2>.constructor<U1, U2>(): R|A.B.C<U1, U2, K1, K2, T1, T2>| {
                     super<R|kotlin/Any|>()
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/InnerClassOfThrowableOnObject.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/InnerClassOfThrowableOnObject.fir.txt
index 396f1e2b2ad..1af3cbb8c73 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/InnerClassOfThrowableOnObject.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/InnerClassOfThrowableOnObject.fir.txt
@@ -38,7 +38,7 @@ FILE: InnerClassOfThrowableOnObject.kt
 
         }
 
-        public final inner class Inner<T> : R|kotlin/Any| {
+        public final inner class Inner<Outer(T)> : R|kotlin/Any| {
             public Generic<T>.constructor(): R|Generic.Inner<T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt
index a438205d71d..3a95d6658af 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt
@@ -13,7 +13,7 @@ FILE: m1.kt
 
         protected abstract fun createDatabaseRetriever(database: R|D|): R|m1/BaseIntrospector.AbstractDatabaseRetriever<out D, D, S>|
 
-        protected abstract inner class AbstractDatabaseRetriever<D : R|m1/BasicDatabase|, D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|> : R|m1/BaseIntrospector.AbstractRetriever<D, S>| {
+        protected abstract inner class AbstractDatabaseRetriever<D : R|m1/BasicDatabase|, Outer(D) : R|m1/BasicDatabase|, Outer(S) : R|m1/BasicSchema|> : R|m1/BaseIntrospector.AbstractRetriever<D, S>| {
             protected m1/BaseIntrospector<D, S>.constructor<D : R|m1/BasicDatabase|>(database: R|D|): R|m1/BaseIntrospector.AbstractDatabaseRetriever<D, D, S>| {
                 this@R|m1/BaseIntrospector|.super<R|m1/BaseIntrospector.AbstractRetriever<D, S>|>()
             }
@@ -23,7 +23,7 @@ FILE: m1.kt
 
         }
 
-        protected abstract inner class AbstractRetriever<D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|> : R|kotlin/Any| {
+        protected abstract inner class AbstractRetriever<Outer(D) : R|m1/BasicDatabase|, Outer(S) : R|m1/BasicSchema|> : R|kotlin/Any| {
             public m1/BaseIntrospector<D, S>.constructor(): R|m1/BaseIntrospector.AbstractRetriever<D, S>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt
index 367eb1b39c4..470d6fe8784 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt
@@ -24,7 +24,7 @@ FILE: K3.kt
             super<R|kotlin/Any|>()
         }
 
-        public open inner class NestedInSuperClass<T> : R|kotlin/Any| {
+        public open inner class NestedInSuperClass<Outer(T)> : R|kotlin/Any| {
             public SuperClass<T>.constructor(): R|SuperClass.NestedInSuperClass<T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.lazyBodies.txt
index 0a5ddecd82d..a97a72d33ad 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.lazyBodies.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.lazyBodies.txt
@@ -4,7 +4,7 @@ FILE: complexTypes.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner class D<R, in P, T, out S> : R|kotlin/Any| {
+        public? final? inner class D<R, in P, Outer(T), out Outer(S)> : R|kotlin/Any| {
             public? a/b/C<T, S>.constructor<R, in P>(): R|a/b/C.D<R, P, T, S>| {
                 LAZY_super<R|kotlin/Any|>
             }
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 3eed4dc9aab..7b1767d632e 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -4,7 +4,7 @@ FILE: complexTypes.kt
             super<R|kotlin/Any|>()
         }
 
-        public? final? inner class D<R, in P, T, out S> : R|kotlin/Any| {
+        public? final? inner class D<R, in P, Outer(T), out Outer(S)> : R|kotlin/Any| {
             public? [ContainingClassKey=D] a/b/C<T, S>.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.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.lazyBodies.txt
index 74860226d5c..11725fb959f 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.lazyBodies.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.lazyBodies.txt
@@ -6,7 +6,7 @@ FILE: typeParameterVsNested.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? inner class T<T : Some> : R|kotlin/Any| {
+        public? final? inner class T<Outer(T) : Some> : R|kotlin/Any| {
             public? test/My<T>.constructor(): R|test/My.T<T>| {
                 LAZY_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 1cf69b710d7..c0a4eaa9980 100644
--- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -6,7 +6,7 @@ FILE: typeParameterVsNested.kt
             super<R|kotlin/Any|>()
         }
 
-        public? final? inner class T<T : Some> : R|kotlin/Any| {
+        public? final? inner class T<Outer(T) : Some> : R|kotlin/Any| {
             public? [ContainingClassKey=T] test/My<T>.constructor(): R|test/My.T<T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
index e7621e86d44..f8123cd9b97 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
@@ -269,7 +269,7 @@ class FirRenderer(
         }
 
         override fun visitOuterClassTypeParameterRef(outerClassTypeParameterRef: FirOuterClassTypeParameterRef) {
-            visitTypeParameterRef(outerClassTypeParameterRef)
+            renderTypeParameter(outerClassTypeParameterRef.symbol.fir, forOuterTypeRef = true)
         }
 
         override fun visitConstructedClassTypeParameterRef(constructedClassTypeParameterRef: FirConstructedClassTypeParameterRef) {
@@ -466,11 +466,20 @@ class FirRenderer(
         }
 
         override fun visitTypeParameter(typeParameter: FirTypeParameter) {
+            renderTypeParameter(typeParameter)
+        }
+
+        private fun renderTypeParameter(typeParameter: FirTypeParameter, forOuterTypeRef: Boolean = false) {
             annotationRenderer?.render(typeParameter)
             modifierRenderer?.renderModifiers(typeParameter)
             resolvePhaseRenderer?.render(typeParameter)
             typeParameter.variance.renderVariance()
-            print(typeParameter.name)
+
+            if (!forOuterTypeRef) {
+                print(typeParameter.name)
+            } else {
+                print("Outer(${typeParameter.name})")
+            }
 
             val meaningfulBounds = typeParameter.bounds.filter {
                 if (it !is FirResolvedTypeRef) return@filter true
diff --git a/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt b/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt
index 1af7b8ada21..5391bfd8227 100644
--- a/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt
+++ b/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt
@@ -23,7 +23,7 @@ FILE: privateToThis.fir.kt
             R|<local>/a|.R|SubstitutionOverride</A.t: R|CapturedType(*)|><HIDDEN: /A.t is invisible>#|
         }
 
-        public final inner class B<in T> : R|kotlin/Any| {
+        public final inner class B<in Outer(T)> : R|kotlin/Any| {
             public A<T>.constructor(): R|A.B<T>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
index 1937cc299b8..4d41a38b228 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
@@ -1,7 +1,7 @@
 public open class InnerClassReferencesOuterTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
     public constructor<P : R|kotlin/Any!|>(): R|test/InnerClassReferencesOuterTP<P>|
 
-    public open inner class Inner<Q : R|ft<P & Any, P?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public open inner class Inner<Q : R|ft<P & Any, P?>|, Outer(P) : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|ft<P & Any, P?>|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index 5f63b4e64ae..5ae3060dbe0 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -6,7 +6,7 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
     public open inner class BaseOuter<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
 
-        public abstract inner class BaseInner<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|, H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
+        public abstract inner class BaseInner<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|, Outer(H1) : R|kotlin/Any!|, Outer(H2) : R|kotlin/Any!|> : R|kotlin/Any| {
             public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
 
         }
@@ -16,7 +16,7 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
 
         public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
 
-        public open inner class Inner<E3 : R|kotlin/Any!|, E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
+        public open inner class Inner<E3 : R|kotlin/Any!|, Outer(E1) : R|kotlin/Any!|, Outer(E2) : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
             public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
 
         }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
index e604ed7841b..f277fb17f3f 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
@@ -1,11 +1,11 @@
 public open class InnerClassesInGeneric<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
     public constructor<P : R|kotlin/Any!|, Q : R|kotlin/Any!|>(): R|test/InnerClassesInGeneric<P, Q>|
 
-    public open inner class Inner<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
+    public open inner class Inner<Outer(P) : R|kotlin/Any!|, Outer(Q) : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
 
     }
-    public open inner class Inner2<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
+    public open inner class Inner2<Outer(P) : R|kotlin/Any!|, Outer(Q) : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
         public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<P & Any, P?>>, kotlin/collections/Iterator<ft<P & Any, P?>>?>|
 
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
index 78c5f51b2f7..41e41ad4e9e 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
@@ -4,7 +4,7 @@ public open class InnerOfGeneric : R|kotlin/Any| {
     public abstract inner class A<K : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerOfGeneric.constructor<K : R|kotlin/Any!|>(): R|test/InnerOfGeneric.A<K>|
 
-        public abstract inner class Inner<K : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
+        public abstract inner class Inner<Outer(K) : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
             public test/InnerOfGeneric.A<K>.constructor(): R|test/InnerOfGeneric.A.Inner<K>|
 
         }
@@ -12,7 +12,7 @@ public open class InnerOfGeneric : R|kotlin/Any| {
     public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
         public test/InnerOfGeneric.constructor<L : R|kotlin/Any!|>(): R|test/InnerOfGeneric.B<L>|
 
-        public open inner class SubInner<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
+        public open inner class SubInner<Outer(L) : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
             @R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<L & Any, L?>>, kotlin/collections/Iterator<ft<L & Any, L?>>?>|
 
             public test/InnerOfGeneric.B<L>.constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
index 7204a94751f..ced6ac2fdd1 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
@@ -1,7 +1,7 @@
 public final class MethodReferencesOuterClassTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
     public constructor<P : R|kotlin/Any!|>(): R|test/MethodReferencesOuterClassTP<P>|
 
-    public final inner class Inner<P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public final inner class Inner<Outer(P) : R|kotlin/Any!|> : R|kotlin/Any| {
         public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
 
         public test/MethodReferencesOuterClassTP<P>.constructor(): R|test/MethodReferencesOuterClassTP.Inner<P>|
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
index 2ebb843823f..85916bb1a27 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
@@ -1,7 +1,7 @@
 public open class TypeParameterOfOuterClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfOuterClass<T>|
 
-    public open inner class Inner<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public open inner class Inner<Outer(T) : R|kotlin/Any!|> : R|kotlin/Any| {
         public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
         public test/TypeParameterOfOuterClass<T>.constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
index 1b99af53447..4964d6e1dbf 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
@@ -2,7 +2,7 @@ public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
     public open class Sub<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super<ft<B & Any, B?>>| {
         public constructor<B : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub<B>|
 
-        public/*package*/ open inner class Inner<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B & Any, B?>>| {
+        public/*package*/ open inner class Inner<Outer(B) : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B & Any, B?>>| {
             public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>, test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Sub<B>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Sub.Inner<B>|
@@ -12,7 +12,7 @@ public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
     public open class Super<A : R|kotlin/Any!|> : R|kotlin/Any| {
         public constructor<A : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Super<A>|
 
-        public/*package*/ open inner class Inner<A : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ open inner class Inner<Outer(A) : R|kotlin/Any!|> : R|kotlin/Any| {
             public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>, test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Super<A>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<A>|
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt
index b3e1617b43b..5cd054772a0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt
@@ -27,7 +27,7 @@ public final class Generic<T> : R|kotlin/Any| {
 public final class InnerGeneric<A, B> : R|kotlin/Any| {
     public constructor<A, B>(): R|test/InnerGeneric<A, B>|
 
-    public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
+    public final inner class Inner<in C, D : R|A|, Outer(A), Outer(B)> : R|kotlin/Any| {
         public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
 
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt
index 895810f342c..9a28a3e73c0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt
@@ -27,7 +27,7 @@ public final class Generic<T> : R|kotlin/Any| {
 public final class InnerGeneric<A, B> : R|kotlin/Any| {
     public constructor<A, B>(): R|test/InnerGeneric<A, B>|
 
-    public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
+    public final inner class Inner<in C, D : R|A|, Outer(A), Outer(B)> : R|kotlin/Any| {
         public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
 
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt b/compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt
index 1e33bec1f26..2fd128d8d6a 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt
@@ -3,10 +3,10 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
     public constructor<E, F>(): R|test/Outer<E, F>|
 
-    public final inner class Inner<G, H, E, F> : R|kotlin/Any| {
+    public final inner class Inner<G, H, Outer(E), Outer(F)> : R|kotlin/Any| {
         public test/Outer<E, F>.constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
 
-        public final inner class Inner3<I, G, H, E, F> : R|kotlin/Any| {
+        public final inner class Inner3<I, Outer(G), Outer(H), Outer(E), Outer(F)> : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
             public test/Outer.Inner<G, H, E, F>.constructor<I>(): R|test/Outer.Inner.Inner3<I, G, H, E, F>|
@@ -15,7 +15,7 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
     }
 
-    public final inner class Inner2<E, F> : R|kotlin/Any| {
+    public final inner class Inner2<Outer(E), Outer(F)> : R|kotlin/Any| {
         public test/Outer<E, F>.constructor(): R|test/Outer.Inner2<E, F>|
 
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k1.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k1.txt
index 384216ab72f..6c0ee917f59 100644
--- a/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k1.txt
@@ -1,13 +1,13 @@
 public final class A<TA> : R|kotlin/Any| {
     public constructor<TA>(): R|test/A<TA>|
 
-    public final inner class B<TB, TA> : R|kotlin/Any| {
+    public final inner class B<TB, Outer(TA)> : R|kotlin/Any| {
         public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
 
-        public final inner class C<TC, TB, TA> : R|kotlin/Any| {
+        public final inner class C<TC, Outer(TB), Outer(TA)> : R|kotlin/Any| {
             public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
 
-            public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
+            public final inner class D<TD, Outer(TC), Outer(TB), Outer(TA)> : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
                 public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
diff --git a/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k2.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k2.txt
index 29d017f5a12..3a4f417b5d5 100644
--- a/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k2.txt
@@ -1,13 +1,13 @@
 public final class A<TA> : R|kotlin/Any| {
     public constructor<TA>(): R|test/A<TA>|
 
-    public final inner class B<TB, TA> : R|kotlin/Any| {
+    public final inner class B<TB, Outer(TA)> : R|kotlin/Any| {
         public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
 
-        public final inner class C<TC, TB, TA> : R|kotlin/Any| {
+        public final inner class C<TC, Outer(TB), Outer(TA)> : R|kotlin/Any| {
             public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
 
-            public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
+            public final inner class D<TD, Outer(TC), Outer(TB), Outer(TA)> : R|kotlin/Any| {
                 public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
 
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
diff --git a/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.fir.txt
index d42158d8a0e..2184a06b40c 100644
--- a/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.fir.txt
@@ -1,7 +1,7 @@
 public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
     public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
 
-    public final inner class Inner<Q : R|P|, P> : R|kotlin/Any| {
+    public final inner class Inner<Q : R|P|, Outer(P)> : R|kotlin/Any| {
         public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.fir.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.fir.txt
index 9329351d3d6..11addb8a2f2 100644
--- a/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.fir.txt
@@ -1,7 +1,7 @@
 public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
     public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
 
-    public final inner class Inner<P> : R|kotlin/Any| {
+    public final inner class Inner<Outer(P)> : R|kotlin/Any| {
         public final fun <Q : R|P|> f(): R|kotlin/Unit|
 
         public final fun g(p: R|P|): R|P|