From ab6b3a60474601cb01527f8086fdf520bd3fd276 Mon Sep 17 00:00:00 2001
From: Dmitrii Gridin <dmitry.gridin@jetbrains.com>
Date: Thu, 16 Nov 2023 18:28:27 +0100
Subject: [PATCH] [LL FIR] fix scope for constructor resolution

We should grab static scope before in the same way as scopesBefore
to not get already updated static scope with nested scopes.
Also, we should restore such "before" snapshots to avoid their modification
(this can be reproduced with in the next commit)

^KT-63042
---
 .../fir/transformers/LLFirTypeLazyResolver.kt |  5 ++++-
 .../classes/superTypeCallNameClash.txt        |  8 +++----
 ...erTypeCallNameClashImplicitConstructor.txt |  8 +++----
 ...CallNameClashImplicitConstructorScript.txt |  9 ++++----
 .../classes/superTypeCallNameClashScript.txt  |  9 ++++----
 .../superTypeCallNameClashWithAnnotation.txt  |  8 +++----
 ...ClashWithAnnotationImplicitConstructor.txt |  8 +++----
 ...ithAnnotationImplicitConstructorScript.txt |  9 ++++----
 ...rTypeCallNameClashWithAnnotationScript.txt |  9 ++++----
 .../classes/superTypeCallNestedNameClash.txt  |  8 +++----
 ...CallNestedNameClashImplicitConstructor.txt |  8 +++----
 ...stedNameClashImplicitConstructorScript.txt |  9 ++++----
 .../superTypeCallNestedNameClashScript.txt    |  9 ++++----
 ...rTypeCallNestedNameClashWithAnnotation.txt |  8 +++----
 ...ClashWithAnnotationImplicitConstructor.txt |  8 +++----
 ...ithAnnotationImplicitConstructorScript.txt |  9 ++++----
 ...allNestedNameClashWithAnnotationScript.txt |  9 ++++----
 .../functions/superTypeCallNameClash.txt      | 20 ++++++++---------
 ...erTypeCallNameClashImplicitConstructor.txt | 20 ++++++++---------
 ...CallNameClashImplicitConstructorScript.txt | 21 +++++++++---------
 .../superTypeCallNameClashScript.txt          | 21 +++++++++---------
 .../superTypeCallNameClashWithAnnotation.txt  | 20 ++++++++---------
 ...ClashWithAnnotationImplicitConstructor.txt | 20 ++++++++---------
 ...ithAnnotationImplicitConstructorScript.txt | 21 +++++++++---------
 ...rTypeCallNameClashWithAnnotationScript.txt | 21 +++++++++---------
 .../superTypeCallNestedNameClash.txt          | 20 ++++++++---------
 ...CallNestedNameClashImplicitConstructor.txt | 20 ++++++++---------
 ...stedNameClashImplicitConstructorScript.txt | 21 +++++++++---------
 .../superTypeCallNestedNameClashScript.txt    | 21 +++++++++---------
 ...rTypeCallNestedNameClashWithAnnotation.txt | 20 ++++++++---------
 ...ClashWithAnnotationImplicitConstructor.txt | 20 ++++++++---------
 ...ithAnnotationImplicitConstructorScript.txt | 21 +++++++++---------
 ...allNestedNameClashWithAnnotationScript.txt | 21 +++++++++---------
 .../transformers/FirTypeResolveTransformer.kt | 22 +++++++++++++------
 34 files changed, 259 insertions(+), 232 deletions(-)

diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
index 222f5e5490b..f621d027ceb 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTypeLazyResolver.kt
@@ -135,13 +135,16 @@ private class LLFirTypeTargetResolver(
                 val scopesBeforeContainingClass = transformer.scopesBefore
                     ?: errorWithFirSpecificEntries("The containing class scope is not found", fir = target)
 
+                val staticScopesBeforeContainingClass = transformer.staticScopesBefore
+                    ?: errorWithFirSpecificEntries("The containing class static scope is not found", fir = target)
+
                 @OptIn(PrivateForInline::class)
                 transformer.withScopeCleanup {
                     val clazz = transformer.classDeclarationsStack.last()
                     if (!transformer.removeOuterTypeParameterScope(clazz)) {
                         transformer.scopes = scopesBeforeContainingClass
                     } else {
-                        transformer.scopes = transformer.staticScopes
+                        transformer.scopes = staticScopesBeforeContainingClass
                         transformer.addTypeParametersScope(clazz)
                     }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClash.txt
index de554ea234e..b4ba2427547 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClash.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClash.txt
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructor.txt
index a551317bf5c..37d6c7e8bac 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructor.txt
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructorScript.txt
index 83afb45f839..4918a1b89c5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashImplicitConstructorScript.txt
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashScript.txt
index 4070f81facb..c84e2eb00a9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashScript.txt
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotation.txt
index 558097c4565..89fa96fbb11 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotation.txt
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotation.kt
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
index b026de0913b..7f65a2ad2bf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
index 3a545e71237..00f8e552559 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationScript.txt
index 9c09aa9ee19..bf139004147 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNameClashWithAnnotationScript.txt
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClash.txt
index a1fd85af059..7423d279379 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClash.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClash.txt
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructor.txt
index aa0b0842854..e6b9c90ab4a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructor.txt
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructorScript.txt
index 6ca4c9f0590..3d97feafbd6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashImplicitConstructorScript.txt
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashScript.txt
index 22f22ac7668..410c1eea628 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashScript.txt
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotation.txt
index 977da7f19b0..9a2ddd69bb2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotation.txt
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotation.kt
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
index 9cafa62bdd8..38ad48e2343 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
index 286d5d67bbb..d6c098399ba 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationScript.txt
index 898594497f2..bf1d4d1d9d9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/superTypeCallNestedNameClashWithAnnotationScript.txt
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt
index a69802d9c98..4f4e2ea20af 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt
@@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -206,7 +206,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -228,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt
index 5e45afb1814..f37f3283ae6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt
@@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -206,7 +206,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -228,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base|>
+            LAZY_super<R|second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base|>()
+            super<R|second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt
index 1bec1fb0acd..53c74eec9ed 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt
@@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashImplicitConstructorScript
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt
index 4939f6a1fa3..33cffb73ffd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt
@@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base|>
+                LAZY_super<R|second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base|>()
+                super<R|second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotation.txt
index 0e3d8e8578e..7db3bf98650 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotation.txt
@@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -309,7 +309,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -357,7 +357,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -405,7 +405,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -453,7 +453,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -501,7 +501,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotation.kt
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
index dd13b93fb59..50e90b13805 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructor.txt
@@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -309,7 +309,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -357,7 +357,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -405,7 +405,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -453,7 +453,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -501,7 +501,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+        public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
index 62835ea0806..0f92f849a9e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationImplicitConstructorScript.txt
@@ -314,7 +314,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -371,7 +371,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -428,7 +428,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -485,7 +485,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -542,7 +542,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -599,7 +599,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationImplicitCon
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationScript.txt
index 4805ddcd1c7..5ff487d4bff 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashWithAnnotationScript.txt
@@ -314,7 +314,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -371,7 +371,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -428,7 +428,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -485,7 +485,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -542,7 +542,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -599,7 +599,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
+            public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor(): R|second/MyClass.Base| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt
index 19a9c239c9f..a1e7ad56d1b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt
@@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -206,7 +206,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -228,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClash.kt
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt
index 4febcfcf991..9c9e5a2d139 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt
@@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -206,7 +206,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -228,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+            LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -250,11 +250,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt
     }
     public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -272,7 +272,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
     }
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+            super<R|second/Base<second/Base<kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt
index 8d69f80e683..17f0a411dad 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt
@@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashImplicitConstructor
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt
index eeb717bb35a..2b3bc95cc32 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt
@@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>
+                LAZY_super<R|second/Base<second/Base<kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -321,11 +321,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -349,7 +349,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|second/Base<second/Base<kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|second/MyClass.Base<second/Base<kotlin/Int>>|>()
+                super<R|second/Base<second/Base<kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -360,3 +360,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotation.txt
index 44cd8e8595a..a11384af7e6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotation.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotation.txt
@@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -309,7 +309,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -357,7 +357,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -405,7 +405,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -453,7 +453,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -501,7 +501,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotation.kt
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotation.kt
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
index e80cb7cee14..9f69241f00d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.txt
@@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -309,7 +309,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -357,7 +357,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -405,7 +405,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -453,7 +453,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -501,7 +501,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
         public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -549,11 +549,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
     public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
         }
 
-        public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-            public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+        public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                 LAZY_super<R|kotlin/Any|>
             }
 
@@ -597,7 +597,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
         public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
     public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+            super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
         }
 
         public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
index b660eff7768..7df0111090c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.txt
@@ -314,7 +314,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -371,7 +371,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -428,7 +428,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -485,7 +485,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -542,7 +542,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -599,7 +599,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationImpli
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationScript.txt
index 6e4391f7ce8..9b0b5f9dd7b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationScript.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashWithAnnotationScript.txt
@@ -314,7 +314,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -371,7 +371,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -428,7 +428,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -485,7 +485,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -542,7 +542,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -599,7 +599,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>| {
             public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/MyClass.Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
+                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
@@ -656,11 +656,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
 
         public final [ResolvedTo(STATUS)] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/MyClass.Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = IntegerLiteral(1).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(2).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  second/Base<@R|second/Anno|(i = IntegerLiteral(3).<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|))  kotlin/Int>>|>()
             }
 
-            public open [ResolvedTo(STATUS)] class Base<[ResolvedTo(STATUS)] T> : R|kotlin/Any| {
-                public [ResolvedTo(STATUS)] [ContainingClassKey=Base] constructor<[ResolvedTo(STATUS)] T>(): R|second/MyClass.Base<T>| {
+            public? open [ResolvedTo(RAW_FIR)] class Base<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Base] constructor<[ResolvedTo(RAW_FIR)] T>(): R|second/MyClass.Base<T>| {
                     LAZY_super<R|kotlin/Any|>
                 }
 
@@ -713,7 +713,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/MyClass.Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
+                super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>|>()
             }
 
             public open [ResolvedTo(BODY_RESOLVE)] class Base<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
@@ -737,3 +737,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] superTypeCallNestedNameClashWithAnnotationScrip
             }
 
         }
+
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
index d44e5d39620..41d4993303b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
@@ -82,6 +82,9 @@ open class FirTypeResolveTransformer(
     @set:PrivateForInline
     var scopesBefore: PersistentList<FirScope>? = null
 
+    @set:PrivateForInline
+    var staticScopesBefore: PersistentList<FirScope>? = null
+
     private var currentDeclaration: FirDeclaration? = null
 
     private inline fun <T> withDeclaration(declaration: FirDeclaration, crossinline action: () -> T): T {
@@ -397,16 +400,21 @@ open class FirTypeResolveTransformer(
 
     inline fun <T> withScopeCleanup(crossinline l: () -> T): T {
         val scopesBeforeSnapshot = scopes
+        val scopesBeforeBeforeSnapshot = scopesBefore
         scopesBefore = scopesBeforeSnapshot
 
-        val staticScopesBefore = staticScopes
+        val staticScopesBeforeSnapshot = staticScopes
+        val staticScopesBeforeBeforeSnapshot = staticScopesBefore
+        staticScopesBefore = staticScopesBeforeSnapshot
 
-        val result = l()
-
-        scopes = scopesBeforeSnapshot
-        staticScopes = staticScopesBefore
-
-        return result
+        return try {
+            l()
+        } finally {
+            scopes = scopesBeforeSnapshot
+            scopesBefore = scopesBeforeBeforeSnapshot
+            staticScopes = staticScopesBeforeSnapshot
+            staticScopesBefore = staticScopesBeforeBeforeSnapshot
+        }
     }
 
     private fun resolveClassContent(