diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index f4d1948d912..6115bcf67b8 100644
--- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -104,12 +104,13 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
             convert()
 
         private fun KtDeclaration.toFirDeclaration(
-            delegatedSuperType: FirTypeRef?, delegatedSelfType: FirTypeRef, hasPrimaryConstructor: Boolean
+            delegatedSuperType: FirTypeRef?, delegatedSelfType: FirTypeRef, owner: KtClassOrObject, hasPrimaryConstructor: Boolean
         ): FirDeclaration {
             return when (this) {
                 is KtSecondaryConstructor -> toFirConstructor(
                     delegatedSuperType,
                     delegatedSelfType,
+                    owner,
                     hasPrimaryConstructor
                 )
                 else -> convert<FirDeclaration>()
@@ -402,6 +403,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                 firDelegatedCall
             )
             this?.extractAnnotationsTo(firConstructor)
+            owner.extractTypeParametersTo(firConstructor)
             this?.extractValueParametersTo(firConstructor)
             return firConstructor
         }
@@ -464,7 +466,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                 val delegatedSuperType = enumEntry.extractSuperTypeListEntriesTo(firEnumEntry, delegatedSelfType)
                 for (declaration in enumEntry.declarations) {
                     firEnumEntry.declarations += declaration.toFirDeclaration(
-                        delegatedSuperType, delegatedSelfType, hasPrimaryConstructor = true
+                        delegatedSuperType, delegatedSelfType, enumEntry, hasPrimaryConstructor = true
                     )
                 }
                 firEnumEntry
@@ -537,7 +539,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
 
                 for (declaration in classOrObject.declarations) {
                     firClass.declarations += declaration.toFirDeclaration(
-                        delegatedSuperType, delegatedSelfType, hasPrimaryConstructor = primaryConstructor != null
+                        delegatedSuperType, delegatedSelfType, classOrObject, hasPrimaryConstructor = primaryConstructor != null
                     )
                 }
 
@@ -554,7 +556,8 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
 
                 for (declaration in objectDeclaration.declarations) {
                     declarations += declaration.toFirDeclaration(
-                        delegatedSuperType = null, delegatedSelfType = delegatedSelfType, hasPrimaryConstructor = false
+                        delegatedSuperType = null, delegatedSelfType = delegatedSelfType,
+                        owner = objectDeclaration, hasPrimaryConstructor = false
                     )
                 }
             }
@@ -687,6 +690,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
         private fun KtSecondaryConstructor.toFirConstructor(
             delegatedSuperTypeRef: FirTypeRef?,
             delegatedSelfTypeRef: FirTypeRef,
+            owner: KtClassOrObject,
             hasPrimaryConstructor: Boolean
         ): FirConstructor {
             val firConstructor = FirConstructorImpl(
@@ -701,6 +705,7 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
             )
             firFunctions += firConstructor
             extractAnnotationsTo(firConstructor)
+            owner.extractTypeParametersTo(firConstructor)
             extractValueParametersTo(firConstructor)
             firConstructor.body = buildFirBody()
             firFunctions.removeLast()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
index 6060ee2b2de..50bf2187fed 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
@@ -1,9 +1,13 @@
 FILE: F.kt
     public? open class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? class B : A {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|B| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
index e5cfc4a343e..17be018586d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
@@ -1,19 +1,27 @@
 FILE: NestedOfAliasedType.kt
     public? abstract class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
         public? abstract class Nested : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|A.Nested| {
+                super<kotlin/Any>()
+            }
 
         }
 
     }
     public? final typealias TA = A
     public? final? class B : TA {
-        public? constructor(): super<TA>()
+        public? constructor(): R|B| {
+            super<TA>()
+        }
 
         public? final? class NestedInB : Nested {
-            public? constructor(): super<Nested>()
+            public? constructor(): R|B.NestedInB| {
+                super<Nested>()
+            }
 
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
index f9032ede384..4142b5d64c5 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
@@ -1,12 +1,18 @@
 FILE: NestedSuperType.kt
     public? abstract class My : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|p/My| {
+            super<kotlin/Any>()
+        }
 
         public? abstract class NestedOne : My {
-            public? constructor(): super<My>()
+            public? constructor(): R|p/My.NestedOne| {
+                super<My>()
+            }
 
             public? abstract class NestedTwo : NestedOne {
-                public? constructor(): super<NestedOne>()
+                public? constructor(): R|p/My.NestedOne.NestedTwo| {
+                    super<NestedOne>()
+                }
 
             }
 
@@ -14,10 +20,14 @@ FILE: NestedSuperType.kt
 
     }
     public? final? class Your : My {
-        public? constructor(): super<My>()
+        public? constructor(): R|p/Your| {
+            super<My>()
+        }
 
         public? final? class NestedThree : NestedOne {
-            public? constructor(): super<NestedOne>()
+            public? constructor(): R|p/Your.NestedThree| {
+                super<NestedOne>()
+            }
 
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
index b8d8164b10a..9e37cd707a6 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -1,9 +1,13 @@
 FILE: complexTypes.kt
     <T, out S> public? final? class C : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T, out S>(): R|a/b/C<T, S>| {
+            super<kotlin/Any>()
+        }
 
         <R, in P> public? final? inner class D : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor<R, in P>(): R|a/b/C.D<R, P>| {
+                super<kotlin/Any>()
+            }
 
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
index c399ef45a13..37d5b17fdc5 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
@@ -1,13 +1,17 @@
 FILE: derivedClass.kt
     <T> public? open class Base : kotlin/Any {
-        public? constructor(x: T): super<kotlin/Any>()
+        public? constructor<T>(x: T): R|Base<T>| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: T = R|<local>/x|
             public? get(): T
 
     }
     <T : Any> public? final? class Derived : Base<T> {
-        public? constructor(x: T): super<Base<T>>(x#)
+        public? constructor<T : Any>(x: T): R|Derived<T>| {
+            super<Base<T>>(x#)
+        }
 
     }
     <T : Any> public? final? fun create(x: T): Derived<T> {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
index 4fb85984ee9..247eeee974d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
@@ -1,25 +1,35 @@
 FILE: enums.kt
     public? final? enum class Order : kotlin/Enum {
-        private constructor(): super<kotlin/Enum>()
+        private constructor(): R|Order| {
+            super<kotlin/Enum>()
+        }
 
         public? final enum entry FIRST : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.FIRST| {
+                super<kotlin/Any>()
+            }
 
         }
 
         public? final enum entry SECOND : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.SECOND| {
+                super<kotlin/Any>()
+            }
 
         }
 
         public? final enum entry THIRD : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|Order.THIRD| {
+                super<kotlin/Any>()
+            }
 
         }
 
     }
     public? final? enum class Planet : kotlin/Enum {
-        public? constructor(m: Double, r: Double): super<kotlin/Enum>()
+        public? constructor(m: Double, r: Double): R|Planet| {
+            super<kotlin/Enum>()
+        }
 
         public? final? val m: Double = R|<local>/m|
             public? get(): Double
@@ -28,7 +38,9 @@ FILE: enums.kt
             internal get(): Double
 
         public? final enum entry MERCURY : Planet {
-            public? constructor(): super<Planet>(Double(1.0), Double(2.0))
+            public? constructor(): R|Planet.MERCURY| {
+                super<Planet>(Double(1.0), Double(2.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Hello!!!))
@@ -37,7 +49,9 @@ FILE: enums.kt
         }
 
         public? final enum entry VENERA : Planet {
-            public? constructor(): super<Planet>(Double(3.0), Double(4.0))
+            public? constructor(): R|Planet.VENERA| {
+                super<Planet>(Double(3.0), Double(4.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Ola!!!))
@@ -46,7 +60,9 @@ FILE: enums.kt
         }
 
         public? final enum entry EARTH : Planet {
-            public? constructor(): super<Planet>(Double(5.0), Double(6.0))
+            public? constructor(): R|Planet.EARTH| {
+                super<Planet>(Double(5.0), Double(6.0))
+            }
 
             public? open? override fun sayHello(): kotlin/Unit {
                 println#(String(Privet!!!))
@@ -60,7 +76,9 @@ FILE: enums.kt
         public? abstract fun sayHello(): kotlin/Unit
 
         public? final? companion object Companion : kotlin/Any {
-            private constructor(): super<kotlin/Any>()
+            private constructor(): R|Planet.Companion| {
+                super<kotlin/Any>()
+            }
 
             public? final? const val G: <implicit> = Double(6.67E-11)
                 public? get(): <implicit>
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
index 7234efaf48a..ec6db087c3d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
@@ -2,21 +2,29 @@ FILE: enums2.kt
     public? final? interface Some : kotlin/Any {
     }
     public? final? object O1 : Some {
-        private constructor(): super<kotlin/Any>()
+        private constructor(): R|O1| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? object O2 : Some {
-        private constructor(): super<kotlin/Any>()
+        private constructor(): R|O2| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? enum class SomeEnum : kotlin/Enum {
-        public? constructor(x: Some): super<kotlin/Enum>()
+        public? constructor(x: Some): R|SomeEnum| {
+            super<kotlin/Enum>()
+        }
 
         public? final? val x: Some = R|<local>/x|
             public? get(): Some
 
         public? final enum entry FIRST : SomeEnum {
-            public? constructor(): super<SomeEnum>(O1#)
+            public? constructor(): R|SomeEnum.FIRST| {
+                super<SomeEnum>(O1#)
+            }
 
             public? open? override fun check(y: Some): Boolean {
                 ^check Boolean(true)
@@ -25,7 +33,9 @@ FILE: enums2.kt
         }
 
         public? final enum entry SECOND : SomeEnum {
-            public? constructor(): super<SomeEnum>(O2#)
+            public? constructor(): R|SomeEnum.SECOND| {
+                super<SomeEnum>(O2#)
+            }
 
             public? open? override fun check(y: Some): Boolean {
                 ^check ==(y#, O2#)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
index 76e5dd361fe..7c1050dd840 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
@@ -1,13 +1,17 @@
 FILE: expectActual.kt
     public? final? expect class MyClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|MyClass| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? expect fun foo(): String
     public? final? expect val x: Int
         public? get(): Int
     public? final? actual class MyClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|MyClass| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? actual fun foo(): <implicit> {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
index 72dc76ad690..e70751b1e34 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
@@ -5,7 +5,9 @@ FILE: genericFunctions.kt
         ^safeAs (this# as? T)
     }
     public? abstract class Summator : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Summator| {
+            super<kotlin/Any>()
+        }
 
         <T> public? abstract fun plus(first: T, second: T): T
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
index 20373284004..e640bbe7e2c 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
@@ -1,21 +1,29 @@
 FILE: nestedClass.kt
     public? abstract class Base : kotlin/Any {
-        public? constructor(s: String): super<kotlin/Any>()
+        public? constructor(s: String): R|Base| {
+            super<kotlin/Any>()
+        }
 
         public? final? val s: String = R|<local>/s|
             public? get(): String
 
     }
     public? final? class Outer : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Outer| {
+            super<kotlin/Any>()
+        }
 
         public? final? class Derived : Base {
-            public? constructor(s: String): super<Base>(s#)
+            public? constructor(s: String): R|Outer.Derived| {
+                super<Base>(s#)
+            }
 
         }
 
         public? final? object Obj : Base {
-            private constructor(): super<Base>(String())
+            private constructor(): R|Outer.Obj| {
+                super<Base>(String())
+            }
 
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
index 259fdb3bd6f..8ef4ec0c976 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt
@@ -3,10 +3,13 @@ FILE: noPrimaryConstructor.kt
         public? final? val x: String
             public? get(): String
 
-        public? constructor(x: String): super<kotlin/Any>() {
+        public? constructor(x: String): R|NoPrimary| {
+            super<kotlin/Any>()
             this#.x# = x#
         }
 
-        public? constructor(): this<R|NoPrimary|>(String())
+        public? constructor(): R|NoPrimary| {
+            this<R|NoPrimary|>(String())
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
index 4b0ee26dbcb..1741285159f 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
@@ -7,7 +7,9 @@ FILE: simpleClass.kt
 
     }
     public? final? class SomeClass : SomeInterface {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|SomeClass| {
+            super<kotlin/Any>()
+        }
 
         private final? val baz: <implicit> = Int(42)
             private get(): <implicit>
@@ -29,6 +31,8 @@ FILE: simpleClass.kt
 
     }
     public? final? inline class InlineClass : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|InlineClass| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
index b3cc7d02203..dcec09ff45c 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
@@ -3,6 +3,8 @@ FILE: simpleTypeAlias.kt
     }
     public? final typealias C = B
     public? final? class D : C {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|D| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
index 2a66aef753f..39417531481 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
@@ -1,12 +1,16 @@
 FILE: typeAliasWithGeneric.kt
     public? open class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
     }
     <S, T : A> public? final? interface B : kotlin/Any {
     }
     <T> public? final typealias C = B<T, A>
     public? final? class D : C<A> {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|D| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
index bed3dd103e5..3e0a4849905 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -2,10 +2,14 @@ FILE: typeParameterVsNested.kt
     public? final? interface Some : kotlin/Any {
     }
     <T : Some> public? abstract class My : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T : Some>(): R|test/My<T>| {
+            super<kotlin/Any>()
+        }
 
         public? final? inner class T : kotlin/Any {
-            public? constructor(): super<kotlin/Any>()
+            public? constructor(): R|test/My.T| {
+                super<kotlin/Any>()
+            }
 
         }
 
@@ -21,7 +25,9 @@ FILE: typeParameterVsNested.kt
             public? get(): test.My.T
 
         public? final? class Some : T {
-            public? constructor(): super<T>()
+            public? constructor(): R|test/My.Some| {
+                super<T>()
+            }
 
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
index 4a41593ff9b..65ca9ca5737 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
@@ -8,11 +8,15 @@ FILE: typeParameters.kt
     public? final typealias StringList = List<out String>
     public? final typealias AnyList = List<*>
     <out T : Any> public? abstract class AbstractList : List<T> {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<out T : Any>(): R|AbstractList<T>| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? class SomeList : AbstractList<Int> {
-        public? constructor(): super<AbstractList<Int>>()
+        public? constructor(): R|SomeList| {
+            super<AbstractList<Int>>()
+        }
 
         public? open? override fun get(index: Int): Int {
             ^get Int(42)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
index 0ec54f03c62..e26f3c1734b 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
@@ -4,6 +4,8 @@ FILE: where.kt
     public? final? interface B : kotlin/Any {
     }
     <T : A, B> public? final? class C : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor<T : A, B>(): R|C<T>| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
index 4885c9ba791..8485bc6a94d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
@@ -1,6 +1,8 @@
 FILE: annotated.kt
     @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Annotation {
-        public? constructor(): super<kotlin/Annotation>()
+        public? constructor(): R|Ann| {
+            super<kotlin/Annotation>()
+        }
 
     }
     public? final? fun foo(arg: Int): Int {
@@ -23,7 +25,9 @@ FILE: annotated.kt
         ^foo Int(42)
     }
     public? final? data class Two : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Two| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? fun bar(two: Two): kotlin/Unit {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
index d256c367dba..32ea59fe6e4 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
@@ -5,7 +5,9 @@ FILE: arrayAccess.kt
         ^foo Int(1)
     }
     public? final? class Wrapper : kotlin/Any {
-        public? constructor(v: IntArray): super<kotlin/Any>()
+        public? constructor(v: IntArray): R|Wrapper| {
+            super<kotlin/Any>()
+        }
 
         public? final? val v: IntArray = R|<local>/v|
             public? get(): IntArray
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
index 4d25d446fff..5432560c1ed 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
@@ -1,6 +1,8 @@
 FILE: callableReferences.kt
     public? final? class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|A| {
+            super<kotlin/Any>()
+        }
 
         public? final? fun foo(): kotlin/Unit {
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
index 013e2a1cb1e..1ae6cfa4a0d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
@@ -9,7 +9,9 @@ FILE: calls.kt
         ^testRegular distance#(Int(3), Int(4))
     }
     public? final? class My : kotlin/Any {
-        public? constructor(x: Int): super<kotlin/Any>()
+        public? constructor(x: Int): R|My| {
+            super<kotlin/Any>()
+        }
 
         public? final? var x: Int = R|<local>/x|
             public? get(): Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
index 5f1b841b099..04d94a1072c 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
@@ -1,6 +1,8 @@
 FILE: classReference.kt
     public? final? class A : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|test/A| {
+            super<kotlin/Any>()
+        }
 
     }
     public? final? fun test(): kotlin/Unit {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
index ae94d68d7ff..5647767fb33 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
@@ -1,38 +1,52 @@
 FILE: collectionLiterals.kt
     public? final? annotation class Ann1 : kotlin/Annotation {
-        public? constructor(arr: IntArray): super<kotlin/Annotation>()
+        public? constructor(arr: IntArray): R|Ann1| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: IntArray = R|<local>/arr|
             public? get(): IntArray
 
     }
     public? final? annotation class Ann2 : kotlin/Annotation {
-        public? constructor(arr: DoubleArray): super<kotlin/Annotation>()
+        public? constructor(arr: DoubleArray): R|Ann2| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: DoubleArray = R|<local>/arr|
             public? get(): DoubleArray
 
     }
     public? final? annotation class Ann3 : kotlin/Annotation {
-        public? constructor(arr: Array<String>): super<kotlin/Annotation>()
+        public? constructor(arr: Array<String>): R|Ann3| {
+            super<kotlin/Annotation>()
+        }
 
         public? final? val arr: Array<String> = R|<local>/arr|
             public? get(): Array<String>
 
     }
     @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Zero| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|First| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Second| {
+            super<kotlin/Any>()
+        }
 
     }
     @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Third| {
+            super<kotlin/Any>()
+        }
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
index 46a524f4152..5fca598de06 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
@@ -1,6 +1,8 @@
 FILE: destructuring.kt
     public? final? data class Some : kotlin/Any {
-        public? constructor(first: Int, second: Double, third: String): super<kotlin/Any>()
+        public? constructor(first: Int, second: Double, third: String): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? val first: Int = R|<local>/first|
             public? get(): Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
index f5024313c61..5dbe26c0421 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
@@ -25,7 +25,9 @@ FILE: for.kt
 
     }
     public? final? data class Some : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int = R|<local>/x|
             public? get(): Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
index 4a176a27ac0..c131e376400 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
@@ -1,6 +1,8 @@
 FILE: init.kt
     public? final? class WithInit : kotlin/Any {
-        public? constructor(x: Int): super<kotlin/Any>()
+        public? constructor(x: Int): R|WithInit| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int
             public? get(): Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
index b537c3bf82d..7012a43c720 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
@@ -1,6 +1,8 @@
 FILE: lambda.kt
     public? final? data class Tuple : kotlin/Any {
-        public? constructor(x: Int, y: Int): super<kotlin/Any>()
+        public? constructor(x: Int, y: Int): R|Tuple| {
+            super<kotlin/Any>()
+        }
 
         public? final? val x: Int = R|<local>/x|
             public? get(): Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
index ba6588260f9..a3b321e780b 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
@@ -1,7 +1,9 @@
 FILE: locals.kt
     public? final? fun withLocals(p: Int): Int {
         local final? class Local : kotlin/Any {
-            public? constructor(pp: Int): super<kotlin/Any>()
+            public? constructor(pp: Int): R|Local| {
+                super<kotlin/Any>()
+            }
 
             public? final? val pp: Int = R|<local>/pp|
                 public? get(): Int
@@ -18,7 +20,9 @@ FILE: locals.kt
         }
 
         lval code: <implicit> = object : Any {
-            private constructor(): super<Any>()
+            private constructor(): <no name provided> {
+                super<Any>()
+            }
 
             public? final? fun foo(): <implicit> {
                 ^foo hashCode#()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
index a21f99e4220..2838f9e488d 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
@@ -13,7 +13,9 @@ FILE: super.kt
 
     }
     public? final? class C : A, B {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|C| {
+            super<kotlin/Any>()
+        }
 
         public? open? override fun bar(): kotlin/Unit {
             super<<implicit>>.bar#()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
index 53f14bebb18..0ca10368b3b 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
@@ -1,6 +1,8 @@
 FILE: these.kt
     public? final? class Some : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+        public? constructor(): R|Some| {
+            super<kotlin/Any>()
+        }
 
         public? final? fun foo(): Int {
             ^foo Int(1)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
index 50061026d7e..5deb879b3bc 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
@@ -35,7 +35,9 @@ FILE: unary.kt
 
     }
     public? final? class X : kotlin/Any {
-        public? constructor(i: Int): super<kotlin/Any>()
+        public? constructor(i: Int): R|X| {
+            super<kotlin/Any>()
+        }
 
         public? final? val i: Int = R|<local>/i|
             public? get(): Int
@@ -72,7 +74,9 @@ FILE: unary.kt
 
     }
     public? final? class Y : kotlin/Any {
-        public? constructor(arr: Array<Int>): super<kotlin/Any>()
+        public? constructor(arr: Array<Int>): R|Y| {
+            super<kotlin/Any>()
+        }
 
         public? final? val arr: Array<Int> = R|<local>/arr|
             public? get(): Array<Int>
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
index b8b87a94734..8aea98c385e 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
@@ -3,7 +3,7 @@ public abstract class BooleanIterator : R|kotlin/collections/Iterator<kotlin/Boo
 
     public abstract fun nextBoolean(): R|kotlin/Boolean|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/BooleanIterator|
 
 }
 
@@ -12,7 +12,7 @@ public abstract class ByteIterator : R|kotlin/collections/Iterator<kotlin/Byte>|
 
     public abstract fun nextByte(): R|kotlin/Byte|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ByteIterator|
 
 }
 
@@ -21,7 +21,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
 
     public abstract fun nextChar(): R|kotlin/Char|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/CharIterator|
 
 }
 
@@ -41,7 +41,7 @@ public abstract class DoubleIterator : R|kotlin/collections/Iterator<kotlin/Doub
 
     public abstract fun nextDouble(): R|kotlin/Double|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/DoubleIterator|
 
 }
 
@@ -50,7 +50,7 @@ public abstract class FloatIterator : R|kotlin/collections/Iterator<kotlin/Float
 
     public abstract fun nextFloat(): R|kotlin/Float|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/FloatIterator|
 
 }
 
@@ -59,7 +59,7 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
     public abstract fun nextInt(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/IntIterator|
 
 }
 
@@ -118,7 +118,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public abstract fun nextLong(): R|kotlin/Long|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/LongIterator|
 
 }
 
@@ -258,7 +258,6 @@ public abstract class ShortIterator : R|kotlin/collections/Iterator<kotlin/Short
 
     public abstract fun nextShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ShortIterator|
 
 }
-
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index 50e09a0d54d..9483fa88030 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -9,12 +9,12 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharProgression.Companion|
 
     }
 
@@ -25,7 +25,7 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     public open fun nextChar(): R|kotlin/Char|
 
-    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgressionIterator|
 
 }
 
@@ -40,10 +40,10 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|)
+    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|): R|kotlin/ranges/CharRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharRange.Companion|
 
     }
 
@@ -67,12 +67,12 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntProgression.Companion|
 
     }
 
@@ -83,7 +83,7 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     public open fun nextInt(): R|kotlin/Int|
 
-    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgressionIterator|
 
 }
 
@@ -98,10 +98,10 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|)
+    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|): R|kotlin/ranges/IntRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntRange.Companion|
 
     }
 
@@ -118,12 +118,12 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|)
+    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongProgression.Companion|
 
     }
 
@@ -134,7 +134,7 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     public open fun nextLong(): R|kotlin/Long|
 
-    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|)
+    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgressionIterator|
 
 }
 
@@ -149,12 +149,11 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|)
+    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|): R|kotlin/ranges/LongRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongRange.Companion|
 
     }
 
 }
-
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin.txt b/compiler/fir/resolve/testData/builtIns/kotlin.txt
index 185c9f226c1..77ecf59051c 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin.txt
@@ -38,7 +38,7 @@ public open class Any {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|kotlin/Any|
 
 }
 
@@ -49,7 +49,7 @@ public open class Any {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|T|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|): R|kotlin/Array<T>|
 
 }
 
@@ -64,10 +64,10 @@ public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>| {
 
     public final infix fun xor(other: R|kotlin/Boolean|): R|kotlin/Boolean|
 
-    private constructor()
+    private constructor(): R|kotlin/Boolean|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Boolean.Companion|
 
     }
 
@@ -80,9 +80,9 @@ public final class BooleanArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Boolean|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|): R|kotlin/BooleanArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/BooleanArray|
 
 }
 
@@ -201,10 +201,10 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Byte|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Byte.Companion|
 
     }
 
@@ -217,9 +217,9 @@ public final class ByteArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Byte|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|): R|kotlin/ByteArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ByteArray|
 
 }
 
@@ -252,10 +252,10 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>| {
 
     public final fun toShort(): R|kotlin/Short|
 
-    private constructor()
+    private constructor(): R|kotlin/Char|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Char.Companion|
 
     }
 
@@ -268,9 +268,9 @@ public final class CharArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Char|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|): R|kotlin/CharArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/CharArray|
 
 }
 
@@ -292,12 +292,12 @@ public abstract interface Cloneable : R|kotlin/Any| {
 }
 
 public final annotation class Deprecated : R|kotlin/Annotation| {
-    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|)
+    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|): R|kotlin/Deprecated|
 
 }
 
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
-    private constructor()
+    private constructor(): R|kotlin/DeprecationLevel|
 
 }
 
@@ -408,10 +408,10 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
 
     public final operator fun unaryPlus(): R|kotlin/Double|
 
-    private constructor()
+    private constructor(): R|kotlin/Double|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Double.Companion|
 
     }
 
@@ -424,14 +424,14 @@ public final class DoubleArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Double|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|): R|kotlin/DoubleArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/DoubleArray|
 
 }
 
 public final annotation class DslMarker : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/DslMarker|
 
 }
 
@@ -446,17 +446,17 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|)
+    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|): R|kotlin/Enum<E>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Enum.Companion|
 
     }
 
 }
 
 public final annotation class ExtensionFunctionType : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/ExtensionFunctionType|
 
 }
 
@@ -567,10 +567,10 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|
 
     public final operator fun unaryPlus(): R|kotlin/Float|
 
-    private constructor()
+    private constructor(): R|kotlin/Float|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Float.Companion|
 
     }
 
@@ -583,9 +583,9 @@ public final class FloatArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Float|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|): R|kotlin/FloatArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/FloatArray|
 
 }
 
@@ -721,10 +721,10 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
 
     public final infix fun xor(other: R|kotlin/Int|): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Int|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Int.Companion|
 
     }
 
@@ -737,9 +737,9 @@ public final class IntArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|): R|kotlin/IntArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/IntArray|
 
 }
 
@@ -872,10 +872,10 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
 
     public final infix fun xor(other: R|kotlin/Long|): R|kotlin/Long|
 
-    private constructor()
+    private constructor(): R|kotlin/Long|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Long.Companion|
 
     }
 
@@ -888,14 +888,14 @@ public final class LongArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Long|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|): R|kotlin/LongArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/LongArray|
 
 }
 
 public final class Nothing {
-    private constructor()
+    private constructor(): R|kotlin/Nothing|
 
 }
 
@@ -914,22 +914,22 @@ public abstract class Number : R|kotlin/Any| {
 
     public abstract fun toShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/Number|
 
 }
 
 public final annotation class ParameterName : R|kotlin/Annotation| {
-    public constructor(name: R|kotlin/String|)
+    public constructor(name: R|kotlin/String|): R|kotlin/ParameterName|
 
 }
 
 public final annotation class PublishedApi : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/PublishedApi|
 
 }
 
 public final annotation class ReplaceWith : R|kotlin/Annotation| {
-    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|)
+    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|): R|kotlin/ReplaceWith|
 
 }
 
@@ -1048,10 +1048,10 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Short|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Short.Companion|
 
     }
 
@@ -1064,14 +1064,14 @@ public final class ShortArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Short|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|): R|kotlin/ShortArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ShortArray|
 
 }
 
 public final annotation class SinceKotlin : R|kotlin/Annotation| {
-    public constructor(version: R|kotlin/String|)
+    public constructor(version: R|kotlin/String|): R|kotlin/SinceKotlin|
 
 }
 
@@ -1084,40 +1084,39 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
-    public constructor()
+    public constructor(): R|kotlin/String|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/String.Companion|
 
     }
 
 }
 
 public final annotation class Suppress : R|kotlin/Annotation| {
-    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|): R|kotlin/Suppress|
 
 }
 
 public open class Throwable : R|kotlin/Any| {
-    public constructor(message: R|kotlin/String|?)
+    public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
 
-    public constructor(cause: R|kotlin/Throwable|?)
+    public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
-    public constructor()
+    public constructor(): R|kotlin/Throwable|
 
-    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?)
+    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
 }
 
 public final object Unit : R|kotlin/Any| {
     public open fun toString(): R|kotlin/String|
 
-    private constructor()
+    private constructor(): R|kotlin/Unit|
 
 }
 
 public final annotation class UnsafeVariance : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/UnsafeVariance|
 
 }
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
index 54bbcbdb602..303b8c0ae52 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
@@ -1,4 +1,4 @@
 public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/AnnotatedAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
index 53a8d312b0c..f2b0f0c4783 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
@@ -1,6 +1,6 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
     public open fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/AnnotatedMethod|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index b4065833579..8593e27f120 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -1,24 +1,24 @@
 public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/AnnotationInAnnotationArguments|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {
-    public constructor(option: R|test/E|)
+    public constructor(option: R|test/E|): R|test/EnumOption|
 
 }
 
 public final annotation class OptionGroups : R|kotlin/Annotation| {
-    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|)
+    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups|
 
 }
 
 public final annotation class StringOptions : R|kotlin/Annotation| {
-    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|): R|test/StringOptions|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
index 19c836da851..6d9ad87c6ac 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index 7639fd525a1..eaba70c63e1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -1,21 +1,21 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {
-    public constructor(value: R|test/E|)
+    public constructor(value: R|test/E|): R|test/EnumAnno|
 
 }
 
 public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
     public final fun annotated(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/EnumArgumentWithCustomToString|
 
 }
 
 public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
-    public constructor(vararg value: R|kotlin/Array<out test/E>|)
+    public constructor(vararg value: R|kotlin/Array<out test/E>|): R|test/EnumArrayAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
index b68e40cec95..12cefc2662f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/Anno|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
index b5ce602b08d..a3a1aaaa54e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|)
+    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
index 692dcc595f3..ee575f0b513 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
@@ -1,4 +1,4 @@
 public final annotation class SimpleAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/SimpleAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
index 87adcad4ce8..71cadbcbbed 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
@@ -1,4 +1,4 @@
 public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/TargetedAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index d41c02a2200..d1e8c135f26 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
index b18dece9b81..2870e2543dd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/Anno|
 
 }
 
 public final class Constructor : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Constructor|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
index a3a72552a90..788c5256ccd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
index f8d33d1ed6a..e14a195c838 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
@@ -1,14 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|)
+    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|): R|test/Anno|
 
 }
 
 public final annotation class Bnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Bnno|
 
 }
 
 public final enum class Eee : R|kotlin/Enum<test/Eee>| {
-    private constructor()
+    private constructor(): R|test/Eee|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
index bd0f506760a..b374289dc15 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
index 580bd430c14..988402b2605 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
@@ -1,24 +1,24 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Ann|
 
 }
 
 public sealed class Sealed : R|kotlin/Any| {
-    private constructor(z: R|test/Z|)
+    private constructor(z: R|test/Z|): R|test/Sealed|
 
     public final class Derived : R|test/Sealed| {
-        public constructor(z: R|test/Z|)
+        public constructor(z: R|test/Z|): R|test/Sealed.Derived|
 
     }
 
 }
 
 public final class Test : R|kotlin/Any| {
-    public constructor(z: R|test/Z|, a: R|kotlin/Int|)
+    public constructor(z: R|test/Z|, a: R|kotlin/Int|): R|test/Test|
 
-    private constructor(z: R|test/Z|, s: R|kotlin/String|)
+    private constructor(z: R|test/Z|, s: R|kotlin/String|): R|test/Test|
 
-    public constructor(z: R|test/Z|)
+    public constructor(z: R|test/Z|): R|test/Test|
 
 }
 
@@ -29,6 +29,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/Z|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
index 36c71d1b071..ea880a1352a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
@@ -5,6 +5,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(value: R|kotlin/Int|)
+    internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
index d33a0c5cd16..1f525f9e2dc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
@@ -1,19 +1,19 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/A.Companion|
 
         public final annotation class Anno1 : R|kotlin/Annotation| {
-            public constructor()
+            public constructor(): R|test/A.Companion.Anno1|
 
         }
 
         public final class B : R|kotlin/Any| {
-            public constructor()
+            public constructor(): R|test/A.Companion.B|
 
             public final annotation class Anno2 : R|kotlin/Annotation| {
-                public constructor()
+                public constructor(): R|test/A.Companion.B.Anno2|
 
             }
 
@@ -24,6 +24,6 @@ public final class A : R|kotlin/Any| {
 }
 
 public final class C : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
index 55f905fa328..a6282f4642f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
@@ -1,16 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
         public final class Nested : R|kotlin/Any| {
-            public constructor()
+            public constructor(): R|test/Class.Companion.Nested|
 
         }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
index d41c02a2200..d1e8c135f26 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
index d0f9745912e..4c1cdb53c17 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final class B : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/A.B|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/A.B.Companion|
 
         }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
index 751fb1b488d..103534dda9d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
@@ -9,6 +9,6 @@ public final data class My : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/My|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
index 632cc66b653..4c25f27a8b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
@@ -1,18 +1,18 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
index d19f1a8c361..ce0f569f843 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
@@ -1,19 +1,19 @@
 public final annotation class $$$$$$ : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/$$$$$$|
 
 }
 
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Anno$tation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno$tation|
 
 }
 
 public final class Cla$s : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Cla$s|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
index d48d5bf945c..26c6ed7cc72 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
@@ -1,23 +1,23 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
index c16e12956f8..d707eb18b72 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
@@ -1,19 +1,19 @@
 public final annotation class A1 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A1|
 
 }
 
 public final annotation class A2 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A2|
 
 }
 
 public final annotation class A3 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A3|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
index d9f758ab2db..bf423922f47 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
@@ -1,8 +1,8 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final annotation class Anno : R|kotlin/Annotation| {
-        public constructor()
+        public constructor(): R|test/A.Anno|
 
     }
 
@@ -11,6 +11,6 @@ public final class A : R|kotlin/Any| {
 public final class B : R|kotlin/Any| {
     public final fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
index 2a61e99c5bd..08378ed6448 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
@@ -1,18 +1,18 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
index 84f04f5b1f9..74b8b700a71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class X : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/X|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
index 281963d7071..f4833edbb69 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
@@ -1,44 +1,44 @@
 public final annotation class BooleanAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Boolean|)
+    public constructor(value: R|kotlin/Boolean|): R|test/BooleanAnno|
 
 }
 
 public final annotation class ByteAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Byte|)
+    public constructor(value: R|kotlin/Byte|): R|test/ByteAnno|
 
 }
 
 public final annotation class CharAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Char|)
+    public constructor(value: R|kotlin/Char|): R|test/CharAnno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Double|)
+    public constructor(value: R|kotlin/Double|): R|test/DoubleAnno|
 
 }
 
 public final annotation class FloatAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Float|)
+    public constructor(value: R|kotlin/Float|): R|test/FloatAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Int|)
+    public constructor(value: R|kotlin/Int|): R|test/IntAnno|
 
 }
 
 public final annotation class LongAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Long|)
+    public constructor(value: R|kotlin/Long|): R|test/LongAnno|
 
 }
 
 public final annotation class ShortAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Short|)
+    public constructor(value: R|kotlin/Short|): R|test/ShortAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
index ab93d9b6308..9b3536865c2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|)
+    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
index c62a92c619a..411cb2060af 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
@@ -1,6 +1,6 @@
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
index 2283a2a028e..925f0fae089 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|)
+    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
index ba3d034fc3d..30ed424ed0d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
@@ -1,6 +1,6 @@
 public final fun function(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
index 6ffc4e1627e..849195bc081 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
index 261668929e5..1f1ea90102f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|)
+    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
index 2dffe81cd5c..a22bf8874c6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/E|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
index af482dc2f7d..23bdbbb48e5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
@@ -1,6 +1,6 @@
 public final fun R|kotlin/Int|.foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
index bea0cbaff59..831de82c1b0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun R|kotlin/String|.foo(x: R|kotlin/Int|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index cb013f97a2b..75243064807 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
index 26357e3acf9..96490a2cd0a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
index 0838a074b32..1707f1a2337 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
index c091126fda0..eacb781f87e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
@@ -1,18 +1,18 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/A|
 
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor(y: R|kotlin/String|)
+        public constructor(y: R|kotlin/String|): R|test/Outer.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor(x: R|kotlin/String|)
+        public constructor(x: R|kotlin/String|): R|test/Outer.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
index bfe33d4064b..4a802e7346e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
@@ -3,21 +3,21 @@ public final fun bar(x: R|kotlin/Int|): R|kotlin/Unit|
 public final fun foo(x: R|kotlin/Int|, y: R|kotlin/Double|, z: R|kotlin/String|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final annotation class C : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
 
 public final annotation class D : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/D|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
index cb013f97a2b..75243064807 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
index 8ed216488f9..4dfdddc0f39 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
@@ -1,6 +1,6 @@
 public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
index c6b1df0b2a3..33d6afd6763 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index d41c02a2200..d1e8c135f26 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -1,13 +1,13 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
index 24bdbc40288..baf0e5ef288 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
@@ -1,19 +1,19 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
index e39561666b1..d60214e83de 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
@@ -1,14 +1,14 @@
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index 848dcdfb9dc..526ce9cae92 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -1,10 +1,10 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public abstract interface Trait : R|kotlin/Any| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
index 659d26ac8ec..ca31480e717 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
index cfffb0e2a7f..535e56b3a5b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
index ff510c08ac4..39ab94b1f75 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public abstract interface Trait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Trait.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
index 53312d727e3..3b12cc44ef7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
@@ -7,31 +7,31 @@ public final class A : R|kotlin/Any| {
 
     public final fun simple(s: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|): R|test/Ann|
 
 }
 
 <T> public final class Generic : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Generic<T>|
 
 }
 
 <A, B> public final class InnerGeneric : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InnerGeneric<A, B>|
 
     <C, D> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/InnerGeneric.Inner<C, D>|
 
     }
 
 }
 
 public final class Simple : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Simple|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
index fa7ac70f435..beb3006bea4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
@@ -1,6 +1,6 @@
 public final fun R|kotlin/String|.foo(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
index daef209c79a..85a99c727e7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class SimpleTypeAnnotation : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/ranges/IntRange|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
index 6883e1685fb..75091d348dd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
@@ -1,13 +1,13 @@
 public final fun typeAnnotation(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class TypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/TypeParameterAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
index 5d24ccc5172..35430245b58 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -1,5 +1,5 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
index e169028ba46..631c48e0777 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
@@ -1,11 +1,11 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/Ann|
 
 }
 
 public final class TypeAnnotationWithArguments : R|kotlin/Any| {
     public final fun foo(param: R|kotlin/ranges/IntRange|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/TypeAnnotationWithArguments|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
index 1da82d9bfae..da12aa319fa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
@@ -1,6 +1,6 @@
 public final fun foo(bar: R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
index 709bfd8645a..fbc8ed5314b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeParameterAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
index 82cea1ed0c4..d6011a64bee 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/A|
 
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeParameterAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
index 5514dd84a6d..ef69c24a5c7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
@@ -1,16 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final class CustomDelegate : R|kotlin/Any| {
     public final operator fun getValue(thisRef: R|kotlin/Any|?, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/CustomDelegate|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
index 9a6841355a8..1587fee8aa3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
index 8c0d654d6b3..a63fca7660f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
@@ -1,10 +1,10 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Array<kotlin/String>|)
+    public constructor(value: R|kotlin/Array<kotlin/String>|): R|test/B|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
index ec150faa7b3..4be9a9aaae4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
     public final fun R|kotlin/String|.myLength(q: R|kotlin/String|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Ann|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
index 9173e4e2705..203fc2b2dc3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
@@ -1,4 +1,4 @@
 public final class Ramification : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Ramification|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
index 32e52e434ff..256ca299c40 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
@@ -1,4 +1,4 @@
 <T> public final class Wine : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Wine<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
index 31a0a7513aa..a645dae4ed0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
@@ -1,8 +1,8 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
index 62e7efe2a02..2f48f367614 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
@@ -1,18 +1,18 @@
 <test> public final class ConstructorTypeParamClassObjectConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ConstructorTypeParamClassObjectConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ConstructorTypeParamClassObjectConflict.Companion|
 
     }
 
 }
 
 <test> public final class ConstructorTypeParamClassObjectTypeConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
 
         public abstract interface test : R|kotlin/Any| {
         }
@@ -22,30 +22,30 @@
 }
 
 public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/TestClassObjectAndClassConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestClassObjectAndClassConflict.Companion|
 
     }
 
 }
 
 public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
-    public constructor(test: R|kotlin/String|)
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestConstructorParamClassObjectConflict.Companion|
 
     }
 
 }
 
 public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
-    public constructor(test: R|kotlin/String|)
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestConstructorValClassObjectConflict.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
index aa82ea29a5e..39b730383b7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
@@ -1,4 +1,4 @@
 <T> public final class Juice : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Juice<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
index bcba23bb850..d3d9230ed41 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
@@ -1,4 +1,4 @@
 <T> public final class Beer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Beer<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
index b4e8c8ab04c..5ed3c3258bc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
@@ -1,4 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
index b4e8c8ab04c..5ed3c3258bc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
@@ -1,4 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
index 0f238e0c0f2..89e37cb5ff5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
@@ -1,5 +1,5 @@
 <A> public final class ClassParamReferencesSelf : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesSelf<A>|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
index 87f02bd7c71..25e73f4ed28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
index 87f02bd7c71..25e73f4ed28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
index 87f02bd7c71..25e73f4ed28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
index 789aaef95d5..bab20f4b8ae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
index 789aaef95d5..bab20f4b8ae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
index a2c9b1859a5..b5d1c6f8536 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -1,4 +1,4 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
-    private constructor(list: R|kotlin/collections/List<kotlin/String>|?)
+    private constructor(list: R|kotlin/collections/List<kotlin/String>|?): R|test/EnumWithGenericConstructorParameter|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index 212eb164d31..90d7c1e17bd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -1,4 +1,4 @@
 public final enum class EnumWithPrimitiveConstructorParameter : R|kotlin/Enum<test/EnumWithPrimitiveConstructorParameter>| {
-    private constructor(b: R|kotlin/Boolean|)
+    private constructor(b: R|kotlin/Boolean|): R|test/EnumWithPrimitiveConstructorParameter|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
index 1110ad1298d..ea645ad6c0f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
@@ -1,9 +1,9 @@
 public abstract class Aaa : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Aaa|
 
 }
 
 public final class Bbb : R|test/Aaa| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
index 399e61f2afa..18244ac038f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
@@ -1,9 +1,9 @@
 <P> public abstract class Aaa : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Aaa<P>|
 
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
index 9dfaab925cc..90f422577dd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
@@ -8,6 +8,6 @@
 public final class B : R|test/A<kotlin/String>| {
     public open fun bar(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
index 63f8f9dc2ec..72e05b87f30 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
@@ -1,5 +1,5 @@
 public open class Class : R|test/Trait| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
index cc7a7d91673..bbed11acd8e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
@@ -2,6 +2,6 @@
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
index 246de5c9986..a9a56b38efd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
@@ -1,13 +1,13 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public open inner class Inner1 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner1|
 
     }
 
     public final inner class Inner2 : R|test/Outer.Inner1| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner2|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
index 2a51c8d856b..6c4934c8dba 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
@@ -1,8 +1,8 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     <T> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner<T>|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
index 6c99a8e15c7..40e9e4e6d0c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
@@ -1,22 +1,22 @@
 <E, F> public final class Outer : R|kotlin/Any| {
     public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Outer<E, F>|
 
     <G, H> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner<G, H>|
 
         <I> public final inner class Inner3 : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
-            public constructor()
+            public constructor(): R|test/Outer.Inner.Inner3<I>|
 
         }
 
     }
 
     public final inner class Inner2 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Inner2|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
index 2d79d4f5443..940fb06befc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
@@ -1,6 +1,6 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
-    private constructor()
+    private constructor(): R|test/Obj|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
index be72a5e1331..586c3bcfe1b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
@@ -1,10 +1,10 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
-        private constructor()
+        private constructor(): R|test/Outer.Obj|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
index 20fcab10c46..4acb9d791b9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
@@ -1,13 +1,13 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Outer.Companion|
 
         public final object Obj : R|kotlin/Any| {
             public final fun f(): R|kotlin/String|
 
-            private constructor()
+            private constructor(): R|test/Outer.Companion.Obj|
 
         }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
index 80c6f57e51b..3fa3e4db515 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
@@ -1,10 +1,10 @@
 public final object Outer : R|kotlin/Any| {
-    private constructor()
+    private constructor(): R|test/Outer|
 
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
-        private constructor()
+        private constructor(): R|test/Outer.Obj|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index 2d79d4f5443..940fb06befc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -1,6 +1,6 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
-    private constructor()
+    private constructor(): R|test/Obj|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
index 7994d2a97fb..e82307e5b55 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
@@ -1,8 +1,8 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
index dfbd355e003..7ef85d64c50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
@@ -1,13 +1,13 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public open class Nested1 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Nested1|
 
     }
 
     public final class Nested2 : R|test/Outer.Nested1| {
-        public constructor()
+        public constructor(): R|test/Outer.Nested2|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
index 28ed2422497..71db70a17fd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
@@ -1,8 +1,8 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     <T> public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Nested<T>|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
index 7251a85dc6a..70daa1c1570 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
@@ -3,6 +3,6 @@ public open class DifferentGetterAndSetter : R|kotlin/Any| {
 
     public open fun setSomething(p0: R|kotlin/String|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/DifferentGetterAndSetter|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
index 33d6a54c3ff..1a0b515752d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
@@ -1,6 +1,6 @@
 public open class JavaBeanVal : R|kotlin/Any| {
     public open fun getColor(): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/JavaBeanVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
index 01e1b3e92b5..0d3755c5a98 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
@@ -3,6 +3,6 @@ public open class JavaBeanVar : R|kotlin/Any| {
 
     public open fun setColor(p0: R|kotlin/String|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/JavaBeanVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
index 41be34a60ff..86ccc38ceb0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
@@ -3,6 +3,6 @@
 
     public open fun setCharacters(p0: R|java/util/ArrayList<P>|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/JavaBeanVarOfGenericType<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
index ea1d80b72fe..89fa2c0392e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
@@ -3,6 +3,6 @@ public open class TwoSetters : R|kotlin/Any| {
 
     public open fun setSize(p0: R|kotlin/String|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/TwoSetters|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
index 1bb43a3bf6c..a0aaeebe431 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
@@ -1,6 +1,6 @@
 <T> public final class ClassParamUsedInFun : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ClassParamUsedInFun<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
index 1bb43a3bf6c..a0aaeebe431 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
@@ -1,6 +1,6 @@
 <T> public final class ClassParamUsedInFun : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ClassParamUsedInFun<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
index a3ba6c4211f..b6124a00705 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
@@ -4,6 +4,6 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public final class B : R|test/A| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
index 83526d60892..340ab73bbd9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
@@ -1,11 +1,11 @@
 <T> public open class Base : R|kotlin/Any| {
     public final fun foo(): R|T|
 
-    public constructor()
+    public constructor(): R|test/Base<T>|
 
 }
 
 public final class Inh : R|test/Base<kotlin/String>| {
-    public constructor()
+    public constructor(): R|test/Inh|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
index e049155754a..c22f8cc6f24 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -1,8 +1,8 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassObjectDeclaresProperty|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ClassObjectDeclaresProperty.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
index e049155754a..c22f8cc6f24 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -1,8 +1,8 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassObjectDeclaresProperty|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ClassObjectDeclaresProperty.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
index 60a4293f254..56d248aacf1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
@@ -1,51 +1,51 @@
 public final class Int : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Int|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Int.Companion|
 
     }
 
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final class Int : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Int|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/Outer.Int.Companion|
 
         }
 
     }
 
     private final class Pri : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Pri|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/Outer.Pri.Companion|
 
         }
 
     }
 
     protected final class Pro : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Pro|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/Outer.Pro.Companion|
 
         }
 
     }
 
     public final class Pub : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Outer.Pub|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor()
+            private constructor(): R|test/Outer.Pub.Companion|
 
         }
 
@@ -54,20 +54,20 @@ public final class Outer : R|kotlin/Any| {
 }
 
 private final class Pri : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Pri|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Pri.Companion|
 
     }
 
 }
 
 public final class Pub : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Pub|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Pub.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
index a74bcdf9fa6..0c47416687e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
@@ -1,88 +1,88 @@
 internal final class IntInt : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/IntInt|
 
     internal final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/IntInt.Companion|
 
     }
 
 }
 
 internal final class IntPri : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/IntPri|
 
     private final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/IntPri.Companion|
 
     }
 
 }
 
 internal final class IntPub : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/IntPub|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/IntPub.Companion|
 
     }
 
 }
 
 private final class PriInt : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PriInt|
 
     internal final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PriInt.Companion|
 
     }
 
 }
 
 private final class PriPri : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PriPri|
 
     private final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PriPri.Companion|
 
     }
 
 }
 
 private final class PriPub : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PriPub|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PriPub.Companion|
 
     }
 
 }
 
 public final class PubInt : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PubInt|
 
     internal final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PubInt.Companion|
 
     }
 
 }
 
 public final class PubPri : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PubPri|
 
     private final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PubPri.Companion|
 
     }
 
 }
 
 public final class PubPub : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PubPub|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/PubPub.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
index df03e68aef1..3899bca5de1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
@@ -2,10 +2,10 @@ public abstract interface Bbb : R|kotlin/Any| {
 }
 
 public final class ClassObjectextendsTrait : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassObjectextendsTrait|
 
     public final companion object Companion : R|test/Bbb| {
-        private constructor()
+        private constructor(): R|test/ClassObjectextendsTrait.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
index 4b424663c8f..ba647f8e2e1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -2,10 +2,10 @@
 }
 
 public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassObjectExtendsTraitWithTP|
 
     public final companion object Companion : R|test/Bbb<kotlin/String>| {
-        private constructor()
+        private constructor(): R|test/ClassObjectExtendsTraitWithTP.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
index 811382acc54..31374147a5a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
@@ -1,10 +1,10 @@
 public final class Test : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Test|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
-        private constructor()
+        private constructor(): R|test/Test.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
index c509fa4ab89..83debe26071 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
@@ -2,7 +2,7 @@ public abstract interface Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
-        private constructor()
+        private constructor(): R|test/Test.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
index ac714fcce15..f22feb98a19 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
@@ -1,8 +1,8 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/A.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
index 3079c5af02a..0fbcc85ed97 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
@@ -1,12 +1,12 @@
 public final class A : R|test/T| {
     public open fun foo(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/A|
 
     public final companion object Companion : R|test/T| {
         public open fun foo(): R|kotlin/Int|
 
-        private constructor()
+        private constructor(): R|test/A.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
index 88b6c06cad8..f760e25f2ae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
@@ -1,22 +1,22 @@
 public final class TestFirst : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/TestFirst|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun testing(a: R|test/TestFirst.InnerClass|): R|kotlin/Int|
 
         public final fun testing(a: R|test/TestFirst.NotInnerClass|): R|kotlin/Int|
 
-        private constructor()
+        private constructor(): R|test/TestFirst.Companion|
 
     }
 
     public final inner class InnerClass : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/TestFirst.InnerClass|
 
     }
 
     public final inner class NotInnerClass : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/TestFirst.NotInnerClass|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
index 526313bc1c0..2d3f2e854d5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
@@ -1,10 +1,10 @@
 public final class NamedClassObject : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/NamedClassObject|
 
     public final companion object Named : R|kotlin/Any| {
         public final fun f(): R|kotlin/Int|
 
-        private constructor()
+        private constructor(): R|test/NamedClassObject.Named|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
index b72a2388db2..d5aae7ea1f6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
@@ -1,8 +1,8 @@
 public final class SimpleClassObject : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/SimpleClassObject|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/SimpleClassObject.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
index d41a0d83ffa..19f98a9f75d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
@@ -1,4 +1,4 @@
 public final class ClassWithConstructor0 : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithConstructor0|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
index c39e25c0f3b..0f4b96ef706 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
@@ -1,4 +1,4 @@
 public final class ClassWithConstructor1 : R|kotlin/Any| {
-    public constructor(p: R|kotlin/Int|)
+    public constructor(p: R|kotlin/Int|): R|test/ClassWithConstructor1|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
index 06a05101718..124ae8c5424 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
@@ -1,4 +1,4 @@
 public final class ClassWithConstructorWithValueParamWithDefaultValue : R|kotlin/Any| {
-    public constructor(p: R|kotlin/Int|)
+    public constructor(p: R|kotlin/Int|): R|test/ClassWithConstructorWithValueParamWithDefaultValue|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
index 07143c32fb5..71d0b3bcb48 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
@@ -1,4 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
-    public constructor(p: R|kotlin/Int|, s: R|kotlin/Int|)
+    public constructor(p: R|kotlin/Int|, s: R|kotlin/Int|): R|test/TestConstructor|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
index 47ba231beb4..fd7346aa2d1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
@@ -1,4 +1,4 @@
 public final class TestingKotlinCollections : R|kotlin/Any| {
-    public constructor(arguments: R|kotlin/collections/Collection<kotlin/String>|)
+    public constructor(arguments: R|kotlin/collections/Collection<kotlin/String>|): R|test/TestingKotlinCollections|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
index 4ee36bc9daa..c6ac6997285 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor(p0: R|java/lang/Class<kotlin/Any>|?)
+    public constructor(p0: R|java/lang/Class<kotlin/Any>|?): R|test/ConstructorGenericDeep|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
index 701641c7b85..1992ab406a7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/Any|?)
+    public constructor(p0: R|kotlin/Any|?): R|test/ConstructorGenericSimple|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
index 88704e09b08..dbc7b9a47fa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor(p0: R|java/util/RandomAccess|?)
+    public constructor(p0: R|java/util/RandomAccess|?): R|test/ConstructorGenericUpperBound|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
index f219fc3a799..98727ea8919 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
@@ -1,4 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
-    public constructor(p: R|kotlin/Int|, d: R|kotlin/Int|)
+    public constructor(p: R|kotlin/Int|, d: R|kotlin/Int|): R|test/TestConstructor|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
index 23012c1c331..d9a8513dccb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index fc2ca45e8cd..6611177293c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
-    public constructor(q: R|kotlin/Int|)
+    public constructor(q: R|kotlin/Int|): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 5b62e492e30..6db03156dda 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
-    public constructor(q: R|Q|)
+    public constructor(q: R|Q|): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
index ace51302eae..eb54208d6e6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
@@ -1,4 +1,4 @@
 <P> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithConstructorAndTypeParameter<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index abe20bf0b30..67f602549ee 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class OneTypeParameterErased : R|kotlin/Any| {
-    public constructor(q: R|Q|)
+    public constructor(q: R|Q|): R|test/OneTypeParameterErased<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
index 087d2d01d60..3557d89762a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
@@ -1,8 +1,8 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final class TestConstructor : R|kotlin/Any| {
-        public constructor(p: R|kotlin/Int|)
+        public constructor(p: R|kotlin/Int|): R|test/A.TestConstructor|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
index 791b1a8470d..288ee7b5e2f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
@@ -1,4 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
-    private constructor(p: R|kotlin/Int|)
+    private constructor(p: R|kotlin/Int|): R|test/TestConstructor|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
index 2ab56da6994..9f25c101f1c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
@@ -1,4 +1,4 @@
 public final class A : R|kotlin/Any| {
-    public constructor(vararg a: R|kotlin/IntArray|, f: R|kotlin/Function0<kotlin/Unit>|)
+    public constructor(vararg a: R|kotlin/IntArray|, f: R|kotlin/Function0<kotlin/Unit>|): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
index b9b6e935ed7..424e9c91196 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
@@ -1,4 +1,4 @@
 public final class A : R|kotlin/Any| {
-    public constructor(vararg a: R|kotlin/IntArray|)
+    public constructor(vararg a: R|kotlin/IntArray|): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
index 794a0581b5e..67327e4b246 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
@@ -3,6 +3,6 @@ public final fun builder(c: R|error: createSuspendFunctionType not supported|):
 public final class Controller : R|kotlin/Any| {
     public final suspend fun suspendFun(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Controller|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
index 3723fb04fb5..129d9ca4b5c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
@@ -11,6 +11,6 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/String|, z: R|kotlin/Double|)
+    public constructor(x: R|kotlin/String|, z: R|kotlin/Double|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
index e99fc9084ce..dd0479b55f4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
@@ -9,6 +9,6 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/String|)
+    public constructor(x: R|kotlin/String|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
index 70f643e5dda..893e0efb769 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
@@ -11,6 +11,6 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
index 70f643e5dda..893e0efb769 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
@@ -11,6 +11,6 @@ public final data class DataClass : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
index a1479cce83b..fd2fa0a89bd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
@@ -1,14 +1,14 @@
 internal final enum class In : R|kotlin/Enum<test/In>| {
-    private constructor()
+    private constructor(): R|test/In|
 
 }
 
 private final enum class Pr : R|kotlin/Enum<test/Pr>| {
-    private constructor()
+    private constructor(): R|test/Pr|
 
 }
 
 public final enum class Pu : R|kotlin/Enum<test/Pu>| {
-    private constructor()
+    private constructor(): R|test/Pu|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
index 466a4f919ec..32908d4ab05 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
@@ -1,4 +1,4 @@
 public final enum class En : R|kotlin/Enum<test/En>| {
-    private constructor(b: R|kotlin/Boolean|, i: R|kotlin/Int|)
+    private constructor(b: R|kotlin/Boolean|, i: R|kotlin/Int|): R|test/En|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
index f9038cb157c..d7c0af46a03 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
@@ -1,15 +1,15 @@
 public final enum class Enum : R|kotlin/Enum<test/Enum>| {
     public final fun f(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|test/Enum|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Enum.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Enum.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
index 4e5c44c30b2..542ede7def3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
@@ -1,8 +1,8 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final enum class E : R|kotlin/Enum<test/A.E>| {
-        private constructor()
+        private constructor(): R|test/A.E|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
index fd881a25eee..121cb2084e3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
@@ -1,13 +1,13 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/A.Companion|
 
     }
 
     public final enum class E : R|kotlin/Enum<test/A.E>| {
-        private constructor()
+        private constructor(): R|test/A.E|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
index f43e3309949..da515ef0af0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
@@ -1,4 +1,4 @@
 public final enum class MyEnum : R|kotlin/Enum<test/MyEnum>| {
-    private constructor()
+    private constructor(): R|test/MyEnum|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
index 8db182338d3..14884d3fdca 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
@@ -1,6 +1,6 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
     public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>|?): R|kotlin/Array<kotlin/Any>|?
 
-    public constructor()
+    public constructor(): R|test/ArrayTypeVariance|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
index e05788adf23..b5b7ce481a9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
@@ -1,4 +1,4 @@
 public abstract class ClassDoesNotOverrideMethod : R|java/util/Date| {
-    public constructor()
+    public constructor(): R|test/ClassDoesNotOverrideMethod|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
index 5d210823a71..84b937cb396 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
@@ -1,6 +1,6 @@
 public abstract interface TheTrait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TheTrait.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
index 1f9a14a02e8..784affedb41 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
@@ -1,11 +1,11 @@
 public final class Some : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Some|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Some.Companion|
 
         public final annotation class TestAnnotation : R|kotlin/Annotation| {
-            public constructor()
+            public constructor(): R|test/Some.Companion.TestAnnotation|
 
         }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
index 1092e7e0286..060474a26a3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
@@ -1,4 +1,4 @@
 public final class ClassWithConstVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithConstVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
index 5aa19c6c087..3300b166231 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
@@ -1,4 +1,4 @@
 <P> public final class ClassWithTypeP : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypeP<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
index 4cb18a0b66d..3e9e0fb7f37 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
@@ -1,4 +1,4 @@
 <P> public abstract class ClassWithTypePExtendsIterableP : R|kotlin/collections/MutableIterable<P>| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
index e9b96b005b8..d38f7067dfb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
@@ -1,4 +1,4 @@
 <P, Q> public final class ClassWithTypePP : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypePP<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
index 66f7a2721ff..0b708191139 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
@@ -1,4 +1,4 @@
 <R, P> public open class ClassWithTypePRefNext : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
index 94d91f2279a..4e9c8edebba 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
@@ -1,4 +1,4 @@
 <P> public final class ClassWithTypePRefSelf : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypePRefSelf<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
index 05e709a2d88..c31416ee423 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ClassWithTypePRefSelfAndClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
index 3c1b4b50751..4d7fabda64d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
@@ -1,4 +1,4 @@
 public final enum class Test : R|kotlin/Enum<test/Test>| {
-    private constructor(a: R|kotlin/Int|)
+    private constructor(a: R|kotlin/Int|): R|test/Test|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
index f2b7a4cf522..b6b5c39fec2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
@@ -1,4 +1,4 @@
 public final class FieldAsVar : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/FieldAsVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
index e56c8ab810a..a0f6c68a689 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
@@ -1,4 +1,4 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/FieldOfArrayType|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
index 7a14a233869..0def93f10da 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
@@ -1,4 +1,4 @@
 public final class FinalFieldAsVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/FinalFieldAsVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
index f2be61da8c8..de504112b20 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
@@ -1,5 +1,5 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
 
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
index 64f7a9cece2..d5cbc87c231 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -1,5 +1,5 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
 
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String, kotlin/CharSequence>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence, kotlin/String>| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
index 2ec9eb96a15..2a6dbdd903a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
@@ -1,8 +1,8 @@
 public open class InnerClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InnerClass|
 
     public open inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/InnerClass.Inner|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
index 537ff0e4461..bd0f4c765f8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
@@ -1,6 +1,6 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
     <T> public open fun bar(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodTypePOneUpperBound|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
index 1442b6fb6df..87bfade0b0d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
@@ -1,6 +1,6 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
     <T> public open fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodTypePTwoUpperBounds|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
index 05150fda5ef..940781f38b9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
@@ -1,6 +1,6 @@
 public final class MethodWithTypeP : R|kotlin/Any| {
     <P> public final fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithTypeP|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
index 2d9bfcb639a..c32d2e50d0a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
@@ -1,6 +1,6 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
     <P, Q> public final fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithTypePP|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
index d10ff4305b8..06c2a1b0f97 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
@@ -1,6 +1,6 @@
 <P> public open class MethodWithTypePRefClassP : R|kotlin/Any| {
     <Q> public final fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithTypePRefClassP<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
index e5925f7cbd1..7aed5c82d59 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
@@ -1,6 +1,6 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
     <P> public final fun f(p0: R|P|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethosWithPRefTP|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
index d19b0617ec3..83ae2e7b474 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/String|?, p1: R|kotlin/Throwable|?)
+    public constructor(p0: R|kotlin/String|?, p1: R|kotlin/Throwable|?): R|test/MyException|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
index 207bc013b19..98f739b3eeb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
@@ -1,8 +1,8 @@
 public open class NestedClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/NestedClass|
 
     public open class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/NestedClass.Nested|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
index c9b6c5217c9..f474a967506 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
@@ -1,10 +1,10 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
     public final object B : R|kotlin/Any| {
         public final fun foo(a: R|kotlin/Int|): R|kotlin/String|
 
-        private constructor()
+        private constructor(): R|test/A.B|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
index ec9cc0bab0a..4fbdccc52fb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
@@ -1,6 +1,6 @@
 public final object SomeObject : R|kotlin/Any| {
     public final fun test(a: R|kotlin/Int|): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|test/SomeObject|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
index ce9b31fb6ec..77a618ba94f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
@@ -1,4 +1,4 @@
 public final object Bar : R|kotlin/Any| {
-    private constructor()
+    private constructor(): R|test/Bar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
index bfe63f8eaf4..7e56454ef27 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
@@ -1,4 +1,4 @@
 public final class Simple : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Simple|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
index 3728e9509ea..c59fda6fad1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
@@ -1,4 +1,4 @@
 public final class TwoFields : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/TwoFields|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
index d056be17562..c9fda857309 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
@@ -1,7 +1,7 @@
 public final class UnboundWildcard : R|kotlin/Any| {
     public final fun foo(): R|test/UnboundWildcard.MyClass<*>|?
 
-    public constructor()
+    public constructor(): R|test/UnboundWildcard|
 
     <T> public abstract interface MyClass : R|kotlin/Any| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
index 9597588ea67..75f81629991 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
@@ -1,6 +1,6 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
     <T> public open fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/AllBoundsInWhen|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
index 91030f9aa8e..a4ff240605f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
@@ -1,6 +1,6 @@
 public open class ArrayType : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Array<kotlin/String>|
 
-    public constructor()
+    public constructor(): R|test/ArrayType|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
index e0e93b4f203..fa61cbe7ece 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,4 +1,4 @@
 <T> public open class ConstructorWithNewTypeParams : R|kotlin/Any| {
-    public constructor(first: R|kotlin/Any|)
+    public constructor(first: R|kotlin/Any|): R|test/ConstructorWithNewTypeParams<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
index 54c31e81d82..79662830220 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,4 +1,4 @@
 <T> public open class ConstructorWithParentTypeParams : R|kotlin/Any| {
-    public constructor(first: R|T|)
+    public constructor(first: R|T|): R|test/ConstructorWithParentTypeParams<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
index b294c63c8e1..5fd428c19dd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
-    public constructor(integer: R|kotlin/Int|, intField: R|kotlin/Int|, collection: R|java/util/ArrayList<kotlin/String>|)
+    public constructor(integer: R|kotlin/Int|, intField: R|kotlin/Int|, collection: R|java/util/ArrayList<kotlin/String>|): R|test/ConstructorWithSeveralParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
index b6d77d015be..3e5c766637c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithoutParams : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ConstructorWithoutParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
index 2e95e0e946d..36ab064184d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
@@ -1,6 +1,6 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
     public open fun foo(): R|kotlin/collections/MutableList<out kotlin/Number>|
 
-    public constructor()
+    public constructor(): R|test/CustomProjectionKind|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
index 4bd88aa9c8e..2ef3b1e67f1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,6 +1,6 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
     public open fun foo(f: R|kotlin/Function1<kotlin/String, kotlin/String>|): R|kotlin/Function1<kotlin/String, kotlin/String>|?
 
-    public constructor()
+    public constructor(): R|test/MethodWithFunctionTypes|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
index b71f77aadc6..b51b27f099c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
@@ -1,6 +1,6 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
     public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/MethodWithGenerics|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
index 2ac4320c42d..65e7e50e344 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -1,6 +1,6 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
     <T> public open fun copy(dest: R|kotlin/collections/MutableList<in T>|, src: R|kotlin/collections/List<T>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithMappedClasses|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
index d8cd29b7348..65b7a331817 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,6 +1,6 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
     <A, B> public open fun foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithTypeParameters|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
index 4e6f6a594e8..a12dcf9e947 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
@@ -1,6 +1,6 @@
 public open class MethodWithVararg : R|kotlin/Any| {
     public open fun foo(vararg s: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MethodWithVararg|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
index 8f199d129e5..5a9c9d18ebe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,4 +1,4 @@
 <T> public open class PropertyArrayTypes : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PropertyArrayTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
index aa432e7b832..c13ea9c0904 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,4 +1,4 @@
 <T> public open class PropertyComplexTypes : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PropertyComplexTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
index e1e08377731..7668595c961 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
@@ -1,4 +1,4 @@
 public open class PropertySimpleType : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PropertySimpleType|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
index c48f320be71..9b73765808f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
@@ -1,7 +1,7 @@
 public final class StarProjection : R|kotlin/Any| {
     public final fun foo(): R|test/StarProjection.MyClass<*>|
 
-    public constructor()
+    public constructor(): R|test/StarProjection|
 
     <T> public abstract interface MyClass : R|kotlin/Any| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
index daabb9a9fa9..883b2af3051 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
@@ -1,6 +1,6 @@
 public open class AddingNullability : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/AddingNullability|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
index ea3bb610988..03e03b2ca2f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -1,6 +1,6 @@
 public open class ConflictingProjectionKind : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/ConflictingProjectionKind|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 6b98330f7c0..316d9cc4ed9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,4 +1,4 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExplicitFieldGettersAndSetters|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
index 41127f0a566..fa327a38149 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,6 +1,6 @@
 public open class ExtraUpperBound : R|kotlin/Any| {
     <A> public open fun foo(): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/ExtraUpperBound|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
index 8e10c2a3b98..d0b4d801184 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
@@ -1,6 +1,6 @@
 public open class MissingUpperBound : R|kotlin/Any| {
     <A> public open fun foo(): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/MissingUpperBound|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
index e6c9d92fd5f..42d50e1585e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,4 +1,4 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/NoFieldTypeRef|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index 27a6ee4722d..a248f9e86d5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -1,6 +1,6 @@
 public open class NotVarargReplacedWithVararg : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/NotVarargReplacedWithVararg|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
index b63e14a8541..577feda2e22 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 public open class RedundantProjectionKind : R|kotlin/Any| {
     public open fun foo(list: R|kotlin/collections/List<kotlin/Number>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/RedundantProjectionKind|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
index ea936a0c21e..7352cd92eb1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
@@ -1,6 +1,6 @@
 public open class ReturnTypeMissing : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ReturnTypeMissing|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
index 3d59523fe44..6d2c7951d7f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
@@ -1,6 +1,6 @@
 public open class SyntaxError : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Int|?
 
-    public constructor()
+    public constructor(): R|test/SyntaxError|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index fb62deb316c..374dd90977e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,4 +1,4 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/SyntaxErrorInFieldAnnotation|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index 21039e2d32e..8a00a50e2ef 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -1,6 +1,6 @@
 public open class VarargReplacedWithNotVararg : R|kotlin/Any| {
     public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/VarargReplacedWithNotVararg|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
index c6f79bc171f..8191e05dc03 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,4 +1,4 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/WrongFieldInitializer|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
index dbc2ab019e2..134a5cb7cec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,4 +1,4 @@
 public open class WrongFieldMutability : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/WrongFieldMutability|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
index c572939ba6b..81c267f5a44 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,4 +1,4 @@
 public open class WrongFieldName : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/WrongFieldName|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
index 9241b5c1db1..8ca925ddd07 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
@@ -1,6 +1,6 @@
 public open class WrongMethodName : R|kotlin/Any| {
     public open fun foo(): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongMethodName|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
index b26d61e737a..8aca07af292 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -1,6 +1,6 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
     public open fun copy(p0: R|kotlin/Array<out kotlin/Number>|?, p1: R|kotlin/Array<out kotlin/Number>|?): R|kotlin/collections/MutableList<kotlin/Number>|?
 
-    public constructor()
+    public constructor(): R|test/WrongProjectionKind|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index 7cd4d89abe8..01556d03833 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -1,6 +1,6 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongReturnTypeStructure|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
index 5bf2f54b319..d8e3c12c563 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeName1 : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongTypeName1|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
index dfad20e2928..c5e486a04ea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeName2 : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongTypeName2|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
index 532fc83430c..7c63c3f0d92 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeName3 : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongTypeName3|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 7c93e79b532..7da3b493ddc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
     <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index b196f349c41..5deed3fc264 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
     <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/WrongTypeParameterBoundStructure2|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index bbbadc567c5..61165f680f5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,6 +1,6 @@
 public open class WrongTypeParametersCount : R|kotlin/Any| {
     <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/WrongTypeParametersCount|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 0f639cd3fc4..801188d8417 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -1,6 +1,6 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongValueParameterStructure1|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index 8b275c4a2d6..c0d43767cf0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -1,6 +1,6 @@
 public open class WrongValueParameterStructure2 : R|kotlin/Any| {
     public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
 
-    public constructor()
+    public constructor(): R|test/WrongValueParameterStructure2|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
index 6ef33ceba77..0c15fdb8379 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
@@ -1,6 +1,6 @@
 public open class WrongValueParametersCount : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Int|?
 
-    public constructor()
+    public constructor(): R|test/WrongValueParametersCount|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
index 3e907b70b34..349e6a6d5c4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
@@ -1,6 +1,6 @@
 public open class Max : R|kotlin/Any| {
     <T> public open fun max(p0: R|kotlin/collections/Collection<T>|?): R|T|
 
-    public constructor()
+    public constructor(): R|test/Max|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
index c663575801c..a35a5fa0491 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
@@ -1,6 +1,6 @@
 public open class ModalityOfFakeOverrides : R|java/util/AbstractList<kotlin/String>| {
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/ModalityOfFakeOverrides|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
index 0fb2c04b74e..1b470ecbe15 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
@@ -1,4 +1,4 @@
 public open class NotNullField : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/NotNullField|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
index c05114b03f4..af6108db10c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
@@ -1,6 +1,6 @@
 public open class NotNullIntArray : R|kotlin/Any| {
     public open fun hi(): R|kotlin/IntArray|
 
-    public constructor()
+    public constructor(): R|test/NotNullIntArray|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
index 4e7348745dc..5c6efa41335 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
@@ -1,6 +1,6 @@
 public open class NotNullMethod : R|kotlin/Any| {
     public open fun hi(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/NotNullMethod|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
index 8db756229d4..64871997496 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
@@ -1,6 +1,6 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
     public open fun hi(): R|kotlin/Array<kotlin/Any>|
 
-    public constructor()
+    public constructor(): R|test/NotNullObjectArray|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
index 3bac8a4a336..bbf6543b4a3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
@@ -1,6 +1,6 @@
 public open class NotNullParameter : R|kotlin/Any| {
     public open fun hi(p0: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/NotNullParameter|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
index 9a3940dcf46..3b6aadee5b1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
@@ -1,7 +1,7 @@
 public final class B : R|test/X|, R|test/Y| {
     public open fun foo(): R|kotlin/Unit|
 
-    public constructor(a: R|test/X|)
+    public constructor(a: R|test/X|): R|test/B|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
index 50bfc8680aa..6a0c97d2606 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
@@ -1,6 +1,6 @@
 public final class Example : R|kotlin/Any| {
     public final infix fun test(other: R|test/Example|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Example|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
index 98d88b48fbb..1e25c5efa2c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
@@ -1,6 +1,6 @@
 public final class Example : R|kotlin/Any| {
     public final operator fun plus(other: R|test/Example|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Example|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
index 40251124a62..1b4faf4330a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
@@ -6,13 +6,13 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public open class B : R|test/A| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final class C : R|test/B| {
     public open fun bar(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/C|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
index 271e4960fd5..6759e6c3503 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
@@ -1,6 +1,6 @@
 public final class PropagateSubclassOfComparable : R|kotlin/Comparable<test/PropagateSubclassOfComparable>| {
     public open operator fun compareTo(other: R|test/PropagateSubclassOfComparable|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/PropagateSubclassOfComparable|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
index f3406d97bd6..48170459759 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
@@ -1,6 +1,6 @@
 public final class River : R|kotlin/Any| {
     public final fun song(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/River|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
index 97232b30c0c..b6c31795f7d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
@@ -1,6 +1,6 @@
 public final class ClassFunGetFoo : R|kotlin/Any| {
     public final fun getFoo(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ClassFunGetFoo|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
index 5ad8157cf32..fdb587a64c6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -3,6 +3,6 @@ public final class ClassFunGetFoo : R|kotlin/Any| {
 
     public final fun setFoo(p: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/ClassFunGetFoo|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
index d7fd73b1065..5a2620751b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
@@ -1,6 +1,6 @@
 public final class ClassFunGetFoo : R|kotlin/Any| {
     public final fun set(p: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/ClassFunGetFoo|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
index 805eef273bb..35633608c46 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
@@ -1,6 +1,6 @@
 public final class ExtFunInClass : R|kotlin/Any| {
     public final fun R|kotlin/Int|.shuffle(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ExtFunInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
index 253226e36da..39930d325c8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
@@ -1,6 +1,6 @@
 public abstract class ModifierAbstract : R|kotlin/Any| {
     public abstract fun abs(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ModifierAbstract|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
index cb5e52a9954..79fe1718dc3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
@@ -1,6 +1,6 @@
 public open class ModifierOpen : R|kotlin/Any| {
     public open fun abs(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/ModifierOpen|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
index df635265708..4f1013af01b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
@@ -1,6 +1,6 @@
 public open class VarargInt : R|kotlin/Any| {
     public open fun vararg(vararg p0: R|kotlin/IntArray|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/VarargInt|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
index 578a97a0b67..c35c79f79de 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
@@ -1,6 +1,6 @@
 public open class VarargString : R|kotlin/Any| {
     public open fun vararg(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/VarargString|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
index 01c33c19922..61fe1be979a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
@@ -11,6 +11,6 @@ public final class A : R|kotlin/Any| {
 
     public final fun c(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
index 815a5f0ddac..0aee519416c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
@@ -1,4 +1,4 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
index 5b3fdee9ece..c8631227017 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
@@ -17,6 +17,6 @@ public final class A : R|kotlin/Any| {
 
     public final fun R|kotlin/String|.f3(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
index 33411c369ec..c83a10b891b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
@@ -1,4 +1,4 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
index a1dc62c6bcd..08a8032ec0c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
@@ -1,23 +1,23 @@
 public final class O : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/O|
 
     public final class A1 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/O.A1|
 
     }
 
     public final inner class A2 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/O.A2|
 
     }
 
     public final class B1 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/O.B1|
 
     }
 
     public final inner class B2 : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/O.B2|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
index a9e34527640..e57b3e1d76c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
@@ -1,18 +1,18 @@
 <TA> public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A<TA>|
 
     <TB> public final inner class B : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/A.B<TB>|
 
         <TC> public final inner class C : R|kotlin/Any| {
-            public constructor()
+            public constructor(): R|test/A.B.C<TC>|
 
             <TD> public final inner class D : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
                 <P1, P2, P3, P4> public final fun foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
 
-                public constructor()
+                public constructor(): R|test/A.B.C.D<TD>|
 
             }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
index 6068d1b5a82..cbf82aa510f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
@@ -1,8 +1,8 @@
 <P> public final class InnerClassReferencesOuterTP : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InnerClassReferencesOuterTP<P>|
 
     <Q> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/InnerClassReferencesOuterTP.Inner<Q>|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
index 3a25d83642a..bd5a3a32ca9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
@@ -1,12 +1,12 @@
 <P> public final class MembersReferenceOuterTP : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/MembersReferenceOuterTP<P>|
 
     public final inner class Inner : R|kotlin/Any| {
         <Q> public final fun f(): R|kotlin/Unit|
 
         public final fun g(p: R|P|): R|P|
 
-        public constructor()
+        public constructor(): R|test/MembersReferenceOuterTP.Inner|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
index 7442705c289..ee1d6b3a6a6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
@@ -1,4 +1,4 @@
 public final class C : R|java/util/ArrayList<kotlin/String>| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
index 7442705c289..ee1d6b3a6a6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
@@ -1,4 +1,4 @@
 public final class C : R|java/util/ArrayList<kotlin/String>| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
index d00a29f4047..b3bf539fcb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
@@ -1,4 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
index ce41cfe97c6..2cfb3f337e3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
@@ -1,4 +1,4 @@
 public abstract class ClassValAbstract : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassValAbstract|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
index e68766d8ce9..b413c17cc50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
@@ -1,4 +1,4 @@
 public final class ClassVar : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
index e66da5b6993..7a9e5ecdb7a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
@@ -1,13 +1,13 @@
 public final object A : R|kotlin/Any| {
-    private constructor()
+    private constructor(): R|test/A|
 
 }
 
 public final class B : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/B|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/B.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
index 97d4a8346ca..cff35371974 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
@@ -1,4 +1,4 @@
 public final class ExtPropInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtPropInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
index 1d0a79e55ae..62d327e5d0c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -1,4 +1,4 @@
 public final class ExtValInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
index 72e46d5314f..ccbbef80644 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
@@ -1,4 +1,4 @@
 <T> public final class ExtValInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValInClass<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
index be7e7239016..cb2097c35a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
index 074c6b93eea..a121342523e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
index 97d4a8346ca..cff35371974 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
@@ -1,4 +1,4 @@
 public final class ExtPropInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtPropInClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
index be7e7239016..cb2097c35a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
index be7e7239016..cb2097c35a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
index 074c6b93eea..a121342523e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
index 074c6b93eea..a121342523e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,4 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
index 481e540c0bf..97b3e6ccdfd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
@@ -1,8 +1,8 @@
 public final class C : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/C|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/C.Companion|
 
     }
 
@@ -10,7 +10,7 @@ public final class C : R|kotlin/Any| {
 
 public abstract interface I : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/I.Companion|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
index 7ea943006c5..776d87bab69 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
@@ -1,9 +1,9 @@
 public open class BaseClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/BaseClass|
 
 }
 
 public open class Subclass : R|test/BaseClass| {
-    public constructor()
+    public constructor(): R|test/Subclass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
index 3ba2c807917..fbb30f8e102 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
@@ -1,5 +1,5 @@
 public open class Subclass : R|test/Trait| {
-    public constructor()
+    public constructor(): R|test/Subclass|
 
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
index 63c732ad236..e363bab3d01 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
@@ -1,9 +1,9 @@
 public open class BaseClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/BaseClass|
 
 }
 
 public final class Subclass : R|test/BaseClass| {
-    public constructor()
+    public constructor(): R|test/Subclass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
index 5a28b4cea9f..f4420900c9a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
@@ -2,6 +2,6 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public final class B : R|test/A| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
index 72ef63edbf1..928a4b0c13a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
@@ -1,5 +1,5 @@
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
@@ -8,6 +8,6 @@ public final class A : R|kotlin/Any| {
 
     public final operator fun setValue(t: R|T|, p: R|kotlin/reflect/KProperty<*>|, i: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/MyProperty<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
index d00a29f4047..b3bf539fcb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
@@ -1,4 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
index f0046c7a22a..71236edf1d9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
@@ -1,4 +1,4 @@
 public final class ClassValParams : R|kotlin/Any| {
-    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|)
+    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|): R|test/ClassValParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
index d00a29f4047..b3bf539fcb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
@@ -1,4 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
index e68766d8ce9..b413c17cc50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
@@ -1,4 +1,4 @@
 public final class ClassVar : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVar|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
index 97c030c9271..02fe7080a3b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -1,9 +1,9 @@
 public open class ClassVarModality : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVarModality|
 
 }
 
 public abstract class ClassVarModalityAbstract : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVarModalityAbstract|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
index 7f8364c84c2..3bec71e93f4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
@@ -1,4 +1,4 @@
 public final class ClassVarParams : R|kotlin/Any| {
-    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|)
+    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|): R|test/ClassVarParams|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
index d00a29f4047..b3bf539fcb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
@@ -1,4 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
index d00a29f4047..b3bf539fcb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
@@ -1,4 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassVal|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
index ddb4a870e6e..c7d1a045874 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
@@ -1,4 +1,4 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/Ann|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
index b0193959568..a9a034a5128 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
@@ -1,6 +1,6 @@
 <P> public final fun foo(x: R|kotlin/Function1<test/Foo<P>, kotlin/Unit>|): R|kotlin/Unit|
 
 <T> public final class Foo : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Foo<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
index b003a781972..b0cda4b37c3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
@@ -1,4 +1,4 @@
 internal final class InternalClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InternalClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
index d09cb1e88db..29b009fef6c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
@@ -1,4 +1,4 @@
 public final class InternalConstructor : R|kotlin/Any| {
-    internal constructor()
+    internal constructor(): R|test/InternalConstructor|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
index 5c46ec705a4..678ab2a3b7d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
@@ -1,4 +1,4 @@
 private final class PrivateClass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/PrivateClass|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
index 469cb741016..fa9e0d8326c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
@@ -1,6 +1,6 @@
 public final class PrivateClassMembers : R|kotlin/Any| {
     private final fun f(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/PrivateClassMembers|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
index 3c34c354644..ff2207b6e80 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
@@ -1,6 +1,6 @@
 <I> public final class A : R|kotlin/Any| {
     private/*private to this*/ final fun bas(): R|I|
 
-    public constructor()
+    public constructor(): R|test/A<I>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
index 4a9f75d9ebf..9002d892598 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
@@ -1,9 +1,9 @@
 public open class Base : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Base|
 
 }
 
 public final class Child : R|test/Base| {
-    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|)
+    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|): R|test/Child|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
index 4a9f75d9ebf..9002d892598 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
@@ -1,9 +1,9 @@
 public open class Base : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Base|
 
 }
 
 public final class Child : R|test/Base| {
-    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|)
+    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|): R|test/Child|
 
 }
diff --git a/compiler/fir/resolve/testData/resolve/F.txt b/compiler/fir/resolve/testData/resolve/F.txt
index 397cbec412a..46c73cc5314 100644
--- a/compiler/fir/resolve/testData/resolve/F.txt
+++ b/compiler/fir/resolve/testData/resolve/F.txt
@@ -1,9 +1,13 @@
 FILE: F.kt
     public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
index 87013d2cf78..ab62ac69186 100644
--- a/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
+++ b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
@@ -1,19 +1,27 @@
 FILE: NestedOfAliasedType.kt
     public abstract class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public abstract class Nested : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor(): R|A.Nested| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
     }
     public final typealias TA = R|A|
     public final class B : R|TA| {
-        public constructor(): super<R|TA|>()
+        public constructor(): R|B| {
+            super<R|TA|>()
+        }
 
         public final class NestedInB : R|A.Nested| {
-            public constructor(): super<R|A.Nested|>()
+            public constructor(): R|B.NestedInB| {
+                super<R|A.Nested|>()
+            }
 
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/NestedSuperType.txt b/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
index 685cd51f707..3c76d6b8d40 100644
--- a/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
+++ b/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
@@ -1,12 +1,18 @@
 FILE: NestedSuperType.kt
     public abstract class My : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|p/My| {
+            super<R|kotlin/Any|>()
+        }
 
         public abstract class NestedOne : R|p/My| {
-            public constructor(): super<R|p/My|>()
+            public constructor(): R|p/My.NestedOne| {
+                super<R|p/My|>()
+            }
 
             public abstract class NestedTwo : R|p/My.NestedOne| {
-                public constructor(): super<R|p/My.NestedOne|>()
+                public constructor(): R|p/My.NestedOne.NestedTwo| {
+                    super<R|p/My.NestedOne|>()
+                }
 
             }
 
@@ -14,10 +20,14 @@ FILE: NestedSuperType.kt
 
     }
     public final class Your : R|p/My| {
-        public constructor(): super<R|p/My|>()
+        public constructor(): R|p/Your| {
+            super<R|p/My|>()
+        }
 
         public final class NestedThree : R|p/My.NestedOne| {
-            public constructor(): super<R|p/My.NestedOne|>()
+            public constructor(): R|p/Your.NestedThree| {
+                super<R|p/My.NestedOne|>()
+            }
 
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
index 0bef439c549..d7193def9f8 100644
--- a/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
+++ b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
@@ -1,9 +1,13 @@
 FILE: TwoDeclarationsInSameFile.kt
     public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|p/A| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class B : R|p/A| {
-        public constructor(): super<R|p/A|>()
+        public constructor(): R|p/B| {
+            super<R|p/A|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/builtins/lists.txt b/compiler/fir/resolve/testData/resolve/builtins/lists.txt
index 62ef3892704..4fd5e409f23 100644
--- a/compiler/fir/resolve/testData/resolve/builtins/lists.txt
+++ b/compiler/fir/resolve/testData/resolve/builtins/lists.txt
@@ -1,10 +1,14 @@
 FILE: lists.kt
     public abstract class MyStringList : R|kotlin/collections/List<kotlin/String>| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|MyStringList| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|MyMutableStringList| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final fun R|kotlin/collections/List<kotlin/String>|.convert(): R|MyStringList| {
diff --git a/compiler/fir/resolve/testData/resolve/companion.txt b/compiler/fir/resolve/testData/resolve/companion.txt
index a3cab174d5f..99614fe0269 100644
--- a/compiler/fir/resolve/testData/resolve/companion.txt
+++ b/compiler/fir/resolve/testData/resolve/companion.txt
@@ -1,12 +1,18 @@
 FILE: companion.kt
     public abstract class Some : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|test/Some| {
+            super<R|kotlin/Any|>()
+        }
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor(): super<R|kotlin/Any|>()
+            private constructor(): R|test/Some.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
             public final class InCompanion : R|kotlin/Any| {
-                public constructor(): super<R|kotlin/Any|>()
+                public constructor(): R|test/Some.Companion.InCompanion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -17,13 +23,19 @@ FILE: companion.kt
 
     }
     public abstract class Another : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|test/Another| {
+            super<R|kotlin/Any|>()
+        }
 
         public final companion object NamedCompanion : R|kotlin/Any| {
-            private constructor(): super<R|kotlin/Any|>()
+            private constructor(): R|test/Another.NamedCompanion| {
+                super<R|kotlin/Any|>()
+            }
 
             public final class InCompanion : R|kotlin/Any| {
-                public constructor(): super<R|kotlin/Any|>()
+                public constructor(): R|test/Another.NamedCompanion.InCompanion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
diff --git a/compiler/fir/resolve/testData/resolve/derivedClass.txt b/compiler/fir/resolve/testData/resolve/derivedClass.txt
index 32ca627f0d1..f6b7dde87ad 100644
--- a/compiler/fir/resolve/testData/resolve/derivedClass.txt
+++ b/compiler/fir/resolve/testData/resolve/derivedClass.txt
@@ -1,13 +1,17 @@
 FILE: derivedClass.kt
     <T> public open class Base : R|kotlin/Any| {
-        public constructor(x: R|T|): super<R|kotlin/Any|>()
+        public constructor<T>(x: R|T|): R|Base<T>| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val x: R|T| = R|<local>/x|
             public get(): R|T|
 
     }
     <T : R|kotlin/Any|> public final class Derived : R|Base<T>| {
-        public constructor(x: R|T|): super<R|Base<T>|>(R|<local>/x|)
+        public constructor<T : R|kotlin/Any|>(x: R|T|): R|Derived<T>| {
+            super<R|Base<T>|>(R|<local>/x|)
+        }
 
     }
     <T : R|kotlin/Any|> public final fun create(x: R|T|): R|Derived<T>| {
diff --git a/compiler/fir/resolve/testData/resolve/enum.txt b/compiler/fir/resolve/testData/resolve/enum.txt
index 0569cff0ca2..eab21a57dbc 100644
--- a/compiler/fir/resolve/testData/resolve/enum.txt
+++ b/compiler/fir/resolve/testData/resolve/enum.txt
@@ -2,21 +2,29 @@ FILE: enum.kt
     public abstract interface Some : R|kotlin/Any| {
     }
     public final object O1 : R|Some| {
-        private constructor(): super<R|kotlin/Any|>()
+        private constructor(): R|O1| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final object O2 : R|Some| {
-        private constructor(): super<R|kotlin/Any|>()
+        private constructor(): R|O2| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final enum class SomeEnum : R|kotlin/Enum| {
-        private constructor(x: R|Some|): super<R|kotlin/Enum|>()
+        private constructor(x: R|Some|): R|SomeEnum| {
+            super<R|kotlin/Enum|>()
+        }
 
         public final val x: R|Some| = R|<local>/x|
             public get(): R|Some|
 
         public final enum entry FIRST : R|SomeEnum| {
-            public constructor(): super<R|SomeEnum|>(<Unresolved name: O1>#)
+            public constructor(): R|SomeEnum.FIRST| {
+                super<R|SomeEnum|>(<Unresolved name: O1>#)
+            }
 
             public final override fun check(y: R|Some|): R|kotlin/Boolean| {
                 ^check Boolean(true)
@@ -25,7 +33,9 @@ FILE: enum.kt
         }
 
         public final enum entry SECOND : R|SomeEnum| {
-            public constructor(): super<R|SomeEnum|>(<Unresolved name: O2>#)
+            public constructor(): R|SomeEnum.SECOND| {
+                super<R|SomeEnum|>(<Unresolved name: O2>#)
+            }
 
             public final override fun check(y: R|Some|): R|kotlin/Boolean| {
                 ^check ==(R|<local>/y|, <Unresolved name: O2>#)
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/access.txt b/compiler/fir/resolve/testData/resolve/expresssions/access.txt
index dee5a26ffb4..5f07f209f7f 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/access.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/access.txt
@@ -1,6 +1,8 @@
 FILE: access.kt
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val x: R|kotlin/Int| = Int(1)
             public get(): R|kotlin/Int|
@@ -15,7 +17,9 @@ FILE: access.kt
 
     }
     public final class Bar : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Bar| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val x: R|kotlin/String| = String()
             public get(): R|kotlin/String|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
index 0d097e210cb..f058ed078a9 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
@@ -1,6 +1,8 @@
 FILE: constructor.kt
     public final class C : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|C| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun create(): R|C| {
             ^create R|/C.C|()
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
index 0d5227d4c5d..21697bd3ad2 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
@@ -4,7 +4,9 @@ FILE: dispatchReceiver.kt
 
     }
     public final class My : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|My| {
+            super<R|kotlin/Any|>()
+        }
 
         public final lateinit var delegate: R|Base|
             public get(): R|Base|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
index 80b0020f588..945af2320ec 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
@@ -2,7 +2,9 @@ FILE: explicitReceiver.kt
     public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val x: R|Foo| = R|/Foo.Foo|()
             public get(): R|Foo|
@@ -11,8 +13,8 @@ FILE: explicitReceiver.kt
             ^invoke this#
         }
 
-        public final fun bar(): R|Foo| {
-            ^bar R|/Foo.x|.R|/Foo.invoke|()
+        public final fun bar(): R|kotlin/Unit| {
+            ^bar R|/x|()
         }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
index 82aecc03b82..796a5130da3 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
@@ -1,6 +1,8 @@
 FILE: explicitReceiver2.kt
     public final class Bar : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Bar| {
+            super<R|kotlin/Any|>()
+        }
 
         public final operator fun invoke(): R|Foo| {
             ^invoke this#
@@ -10,7 +12,9 @@ FILE: explicitReceiver2.kt
     public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final operator fun R|Bar|.invoke(): R|Foo| {
             ^invoke this#
@@ -19,8 +23,8 @@ FILE: explicitReceiver2.kt
         public final val x: R|Bar| = R|/Bar.Bar|()
             public get(): R|Bar|
 
-        public final fun bar(): R|Foo| {
-            ^bar R|/Foo.x|.R|/Bar.invoke|()
+        public final fun bar(): R|kotlin/Unit| {
+            ^bar R|/x|()
         }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
index 5b7f5020b20..ccd560d3ffe 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
@@ -2,7 +2,9 @@ FILE: extension.kt
     public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
             ^invoke this@Foo
@@ -11,8 +13,8 @@ FILE: extension.kt
         public final val x: R|kotlin/Int| = Int(0)
             public get(): R|kotlin/Int|
 
-        public final fun foo(): R|Foo| {
-            ^foo R|/Foo.x|.R|/Foo.invoke|()
+        public final fun foo(): R|kotlin/Unit| {
+            ^foo R|/x|()
         }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
index bd8014265f0..0526accb5a3 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
@@ -5,7 +5,9 @@ FILE: farInvokeExtension.kt
         ^invoke this@Foo
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val x: R|kotlin/Int| = Int(0)
             public get(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
index c1ed3c3ea1b..e470dc3e190 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
@@ -1,9 +1,11 @@
 FILE: implicitTypeOrder.kt
     public final class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
-        public final fun bar(): R|A| {
-            ^bar R|/foo|.R|/A.invoke|()
+        public final fun bar(): <ERROR TYPE REF: Unresolved name: foo> {
+            ^bar <Unresolved name: foo>#()
         }
 
         public final fun invoke(): R|A| {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
index 2b1b72a8baa..4be02bce53d 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
@@ -1,6 +1,8 @@
 FILE: threeReceivers.kt
     public final class Bar : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Bar| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun R|FooBar|.invoke(): R|Bar| {
             ^invoke this#
@@ -8,15 +10,21 @@ FILE: threeReceivers.kt
 
     }
     public final class Buz : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Buz| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class FooBar : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|FooBar| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val R|Buz|.foobar: R|Bar|
             public get(): R|Bar| {
@@ -24,7 +32,7 @@ FILE: threeReceivers.kt
             }
 
         public final fun R|FooBar|.chk(buz: R|Buz|): R|kotlin/Unit| {
-            R|<local>/buz|.R|/Foo.foobar|.R|/Bar.invoke|()
+            R|<local>/buz|.<Unresolved name: foobar>#()
         }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt b/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
index b9b95d9c34c..3359bb2a53c 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
@@ -1,7 +1,9 @@
 FILE: localImplicitBodies.kt
     public final fun foo(): R|kotlin/Unit| {
         lval x: <ERROR TYPE REF: No result type for initializer> = object : R|kotlin/Any| {
-            private constructor(): super<R|kotlin/Any|>()
+            private constructor(): R|error: Symbol not found, for `<no name provided>`| {
+                super<R|kotlin/Any|>()
+            }
 
             public final fun sss(): <ERROR TYPE REF: Unresolved name: abc> {
                 ^sss <Unresolved name: abc>#()
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/this.txt b/compiler/fir/resolve/testData/resolve/expresssions/this.txt
index a92aa2f6fdf..6ce5edc9e83 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/this.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/this.txt
@@ -1,10 +1,14 @@
 FILE: this.kt
     public final class Bar : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Bar| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class Foo : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun bar(): R|Foo| {
             ^bar this#
diff --git a/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt b/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt
index 90e5925da58..1b9eb6e6b96 100644
--- a/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt
+++ b/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt
@@ -1,13 +1,19 @@
 FILE: fakeRecursiveSupertype.kt
     public final class My : R|error: Recursion detected: R|My|| {
-        public constructor(): super<R|My|>()
+        public constructor(): R|My| {
+            super<R|My|>()
+        }
 
     }
     public final class Your : R|His| {
-        public constructor(): super<R|His|>()
+        public constructor(): R|Your| {
+            super<R|His|>()
+        }
 
     }
     public final class His : R|error: Recursion detected: R|Your|| {
-        public constructor(): super<R|Your|>()
+        public constructor(): R|His| {
+            super<R|Your|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
index 8d4f9da1dfe..db0d621b822 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
@@ -1,9 +1,13 @@
 FILE: complexTypes.kt
     <T, out S> public final class C : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<T, out S>(): R|a/b/C<T, S>| {
+            super<R|kotlin/Any|>()
+        }
 
         <R, in P> public final inner class D : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor<R, in P>(): R|a/b/C.D<R, P>| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
index f9015dceef7..365ea4db8b1 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
@@ -1,25 +1,35 @@
 FILE: enums.kt
     public final enum class Order : R|kotlin/Enum| {
-        private constructor(): super<R|kotlin/Enum|>()
+        private constructor(): R|Order| {
+            super<R|kotlin/Enum|>()
+        }
 
         public final enum entry FIRST : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor(): R|Order.FIRST| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
         public final enum entry SECOND : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor(): R|Order.SECOND| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
         public final enum entry THIRD : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor(): R|Order.THIRD| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
     }
     public final enum class Planet : R|kotlin/Enum| {
-        private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): super<R|kotlin/Enum|>()
+        private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): R|Planet| {
+            super<R|kotlin/Enum|>()
+        }
 
         public final val m: R|kotlin/Double| = R|<local>/m|
             public get(): R|kotlin/Double|
@@ -28,7 +38,9 @@ FILE: enums.kt
             internal get(): R|kotlin/Double|
 
         public final enum entry MERCURY : R|Planet| {
-            public constructor(): super<R|Planet|>(Double(1.0), Double(2.0))
+            public constructor(): R|Planet.MERCURY| {
+                super<R|Planet|>(Double(1.0), Double(2.0))
+            }
 
             public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Hello!!!))
@@ -37,7 +49,9 @@ FILE: enums.kt
         }
 
         public final enum entry VENERA : R|Planet| {
-            public constructor(): super<R|Planet|>(Double(3.0), Double(4.0))
+            public constructor(): R|Planet.VENERA| {
+                super<R|Planet|>(Double(3.0), Double(4.0))
+            }
 
             public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Ola!!!))
@@ -46,7 +60,9 @@ FILE: enums.kt
         }
 
         public final enum entry EARTH : R|Planet| {
-            public constructor(): super<R|Planet|>(Double(5.0), Double(6.0))
+            public constructor(): R|Planet.EARTH| {
+                super<R|Planet|>(Double(5.0), Double(6.0))
+            }
 
             public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Privet!!!))
@@ -60,7 +76,9 @@ FILE: enums.kt
         public abstract fun sayHello(): R|kotlin/Unit|
 
         public final companion object Companion : R|kotlin/Any| {
-            private constructor(): super<R|kotlin/Any|>()
+            private constructor(): R|Planet.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
             public final const val G: R|kotlin/Double| = Double(6.67E-11)
                 public get(): R|kotlin/Double|
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt
index 67ee1396ec2..1d8de32469f 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt
@@ -3,10 +3,13 @@ FILE: noPrimaryConstructor.kt
         public final val x: R|kotlin/String|
             public get(): R|kotlin/String|
 
-        public constructor(x: R|kotlin/String|): super<R|kotlin/Any|>() {
+        public constructor(x: R|kotlin/String|): R|NoPrimary| {
+            super<R|kotlin/Any|>()
             this#.R|/NoPrimary.x| = R|<local>/x|
         }
 
-        public constructor(): this<R|NoPrimary|>(String())
+        public constructor(): R|NoPrimary| {
+            this<R|NoPrimary|>(String())
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
index 31632196f85..e5b99c2639a 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
@@ -7,7 +7,9 @@ FILE: simpleClass.kt
 
     }
     public final class SomeClass : R|SomeInterface| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|SomeClass| {
+            super<R|kotlin/Any|>()
+        }
 
         private final val baz: R|kotlin/Int| = Int(42)
             private get(): R|kotlin/Int|
@@ -29,6 +31,8 @@ FILE: simpleClass.kt
 
     }
     public final inline class InlineClass : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|InlineClass| {
+            super<R|kotlin/Any|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
index 9c68ce8e2fc..2134c061262 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
@@ -8,11 +8,15 @@ FILE: typeParameters.kt
     public final typealias StringList = R|List<out kotlin/String>|
     public final typealias AnyList = R|List<*>|
     <out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<out T : R|kotlin/Any|>(): R|AbstractList<T>| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class SomeList : R|AbstractList<kotlin/Int>| {
-        public constructor(): super<R|AbstractList<kotlin/Int>|>()
+        public constructor(): R|SomeList| {
+            super<R|AbstractList<kotlin/Int>|>()
+        }
 
         public final override fun get(index: R|kotlin/Int|): R|kotlin/Int| {
             ^get Int(42)
diff --git a/compiler/fir/resolve/testData/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
index baf1eac84ca..d3ef56848ce 100644
--- a/compiler/fir/resolve/testData/resolve/genericFunctions.txt
+++ b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
@@ -5,7 +5,9 @@ FILE: genericFunctions.kt
         ^safeAs (this# as? R|T|)
     }
     public abstract class Summator : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Summator| {
+            super<R|kotlin/Any|>()
+        }
 
         <T> public abstract fun plus(first: R|T|, second: R|T|): R|T|
 
diff --git a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
index 8f6bffe1325..009862c1a6f 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
@@ -1,7 +1,9 @@
 FILE: Annotations.kt
     @FILE:R|annotations/Simple|()
     @R|annotations/WithInt|(Int(42)) public abstract class First : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|test/First| {
+            super<R|kotlin/Any|>()
+        }
 
         @R|annotations/Simple|() public abstract fun foo(@R|annotations/WithString|(String(abc)) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
 
@@ -10,7 +12,9 @@ FILE: Annotations.kt
 
     }
     @R|annotations/WithString|(String(xyz)) public final class Second : @R|annotations/WithInt|(Int(0)) R|test/First| {
-        public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(Int(0)) R|test/First|>()
+        public constructor(y: R|kotlin/Char|): R|test/Second| {
+            super<@R|annotations/WithInt|(Int(0)) R|test/First|>()
+        }
 
         public final val y: R|kotlin/Char| = R|<local>/y|
             public get(): R|kotlin/Char|
@@ -23,8 +27,10 @@ FILE: Annotations.kt
                 ^ String()
             }
 
-        @R|annotations/WithString|(String(constructor)) public constructor(): this<R|test/Second|>(Char(
+        @R|annotations/WithString|(String(constructor)) public constructor(): R|test/Second| {
+            this<R|test/Second|>(Char(
 ))
+        }
 
     }
     @R|annotations/WithInt|(Int(24)) @R|annotations/VeryComplex|(Float(3.14), Double(6.67E-11), Boolean(false), Long(123456789012345), Null(null)) @R|annotations/WithInt|(Int(24)) @R|annotations/VeryComplex|(Float(3.14), Double(6.67E-11), Boolean(false), Long(123456789012345), Null(null)) public final typealias Third = @R|annotations/Simple|() R|test/Second|
diff --git a/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt
index 741fe382702..7e5c2bfd0b6 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/NestedSuperType.txt
@@ -1,14 +1,20 @@
 FILE: NestedSuperType.kt
     public final class A : R|b/B| {
-        public constructor(): super<R|b/B|>()
+        public constructor(): R|a/A| {
+            super<R|b/B|>()
+        }
 
         public final class NestedInA1 : R|b/B.NestedInB| {
-            public constructor(): super<R|b/B.NestedInB|>()
+            public constructor(): R|a/A.NestedInA1| {
+                super<R|b/B.NestedInB|>()
+            }
 
         }
 
         public final class NestedInA2 : R|c/C.NestedInC| {
-            public constructor(): super<R|c/C.NestedInC|>()
+            public constructor(): R|a/A.NestedInA2| {
+                super<R|c/C.NestedInC|>()
+            }
 
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt b/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt
index 26a8e0d2e06..d3a84a855f3 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/TypeAliasExpansion.txt
@@ -1,5 +1,7 @@
 FILE: TypeAliasExpansion.kt
     public final class MyClass : R|b/TA| {
-        public constructor(): super<R|b/TA|>()
+        public constructor(): R|a/MyClass| {
+            super<R|b/TA|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
index 3bf5b1111ca..28b39015965 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
@@ -1,6 +1,8 @@
 FILE: sealedStarImport.kt
     public abstract class Factory : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|other/Factory| {
+            super<R|kotlin/Any|>()
+        }
 
         public abstract fun createTest(): R|error: Symbol not found, for `Test`|
 
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt
index 7534e13a53c..ab8704519bf 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleAliasedImport.txt
@@ -1,6 +1,8 @@
 FILE: simpleAliasedImport.kt
     public final class YourClass : R|b/MyClass| {
-        public constructor(): super<R|b/MyClass|>()
+        public constructor(): R|a/YourClass| {
+            super<R|b/MyClass|>()
+        }
 
     }
     public final fun bar(): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
index de8235cd23d..0a4de16218f 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleImport.txt
@@ -1,6 +1,8 @@
 FILE: simpleImport.kt
     public final class YourClass : R|b/MyClass| {
-        public constructor(): super<R|b/MyClass|>()
+        public constructor(): R|a/YourClass| {
+            super<R|b/MyClass|>()
+        }
 
     }
     public final fun bar(): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt
index 264dbdbc131..51fbf1808f9 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleImportNested.txt
@@ -1,5 +1,7 @@
 FILE: simpleImportNested.kt
     public final class YourClass : R|a/MyClass.MyNested| {
-        public constructor(): super<R|a/MyClass.MyNested|>()
+        public constructor(): R|b/YourClass| {
+            super<R|a/MyClass.MyNested|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt
index 97e72331ecd..e64d77a4990 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/simpleImportOuter.txt
@@ -1,5 +1,7 @@
 FILE: simpleImportOuter.kt
     public final class My : R|a/Outer.Nested| {
-        public constructor(): super<R|a/Outer.Nested|>()
+        public constructor(): R|b/My| {
+            super<R|a/Outer.Nested|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/nestedClass.txt b/compiler/fir/resolve/testData/resolve/nestedClass.txt
index 1827e8a2ee8..41c71003889 100644
--- a/compiler/fir/resolve/testData/resolve/nestedClass.txt
+++ b/compiler/fir/resolve/testData/resolve/nestedClass.txt
@@ -1,21 +1,29 @@
 FILE: nestedClass.kt
     public abstract class Base : R|kotlin/Any| {
-        public constructor(s: R|kotlin/String|): super<R|kotlin/Any|>()
+        public constructor(s: R|kotlin/String|): R|Base| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val s: R|kotlin/String| = R|<local>/s|
             public get(): R|kotlin/String|
 
     }
     public final class Outer : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Outer| {
+            super<R|kotlin/Any|>()
+        }
 
         public final class Derived : R|Base| {
-            public constructor(s: R|kotlin/String|): super<R|Base|>(R|<local>/s|)
+            public constructor(s: R|kotlin/String|): R|Outer.Derived| {
+                super<R|Base|>(R|<local>/s|)
+            }
 
         }
 
         public final object Obj : R|Base| {
-            private constructor(): super<R|Base|>(String())
+            private constructor(): R|Outer.Obj| {
+                super<R|Base|>(String())
+            }
 
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/overrides/simple.txt b/compiler/fir/resolve/testData/resolve/overrides/simple.txt
index 55b74a64f73..86595838233 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/simple.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/simple.txt
@@ -1,6 +1,8 @@
 FILE: simple.kt
     public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public open fun foo(): R|A| {
             ^foo this#
@@ -16,7 +18,9 @@ FILE: simple.kt
 
     }
     public final class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
         public final override fun foo(): R|B| {
             ^foo this#
diff --git a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
index ec8e6f7bbc1..e27aa51d58f 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
@@ -1,6 +1,8 @@
 FILE: simpleFakeOverride.kt
     <T> public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<T>(): R|A<T>| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun foo(t: R|T|): R|T| {
             ^foo R|<local>/t|
@@ -8,11 +10,15 @@ FILE: simpleFakeOverride.kt
 
     }
     public final class Some : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Some| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class B : R|A<Some>| {
-        public constructor(): super<R|A<Some>|>()
+        public constructor(): R|B| {
+            super<R|A<Some>|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|FakeOverride</A.foo: R|Some|>|(R|/Some.Some|())
diff --git a/compiler/fir/resolve/testData/resolve/overrides/three.txt b/compiler/fir/resolve/testData/resolve/overrides/three.txt
index ab9a150102b..63ad2a07394 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/three.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/three.txt
@@ -1,6 +1,8 @@
 FILE: three.kt
     public abstract class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun foo(): R|kotlin/Unit| {
         }
@@ -12,7 +14,9 @@ FILE: three.kt
 
     }
     public open class B : R|A|, R|Y| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
         public final fun bar(): R|kotlin/Unit| {
             R|/A.foo|()
@@ -21,7 +25,9 @@ FILE: three.kt
 
     }
     public final class C : R|B| {
-        public constructor(): super<R|B|>()
+        public constructor(): R|C| {
+            super<R|B|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
diff --git a/compiler/fir/resolve/testData/resolve/references/superMember.txt b/compiler/fir/resolve/testData/resolve/references/superMember.txt
index d128639cd2a..7732b397a92 100644
--- a/compiler/fir/resolve/testData/resolve/references/superMember.txt
+++ b/compiler/fir/resolve/testData/resolve/references/superMember.txt
@@ -1,13 +1,17 @@
 FILE: superMember.kt
     public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public open fun foo(): R|kotlin/Unit| {
         }
 
     }
     public final class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
         public final fun bar(): R|kotlin/Unit| {
             R|/A.foo|()
diff --git a/compiler/fir/resolve/testData/resolve/simpleClass.txt b/compiler/fir/resolve/testData/resolve/simpleClass.txt
index 6c11ee9c581..1228a88d511 100644
--- a/compiler/fir/resolve/testData/resolve/simpleClass.txt
+++ b/compiler/fir/resolve/testData/resolve/simpleClass.txt
@@ -7,7 +7,9 @@ FILE: simpleClass.kt
 
     }
     public final class SomeClass : R|SomeInterface| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|SomeClass| {
+            super<R|kotlin/Any|>()
+        }
 
         private final val baz: R|kotlin/Int| = Int(42)
             private get(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
index 011cdba3bdd..9aa20461a17 100644
--- a/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
+++ b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
@@ -3,6 +3,8 @@ FILE: simpleTypeAlias.kt
     }
     public final typealias C = R|B|
     public final class D : R|C| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|D| {
+            super<R|kotlin/Any|>()
+        }
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt b/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
index 43ddafa7a0c..62627337fda 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
@@ -16,7 +16,9 @@ FILE: functionX.kt
 
         public get(): R|kotlin/Function1<kotlin/String, kotlin/String>|
     public final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|MyFunction| {
+            super<R|kotlin/Any|>()
+        }
 
         public final override fun invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| {
         }
diff --git a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
index 1a72dfdb71d..4189878cb62 100644
--- a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
+++ b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
@@ -1,12 +1,16 @@
 FILE: typeAliasWithGeneric.kt
     public open class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     <S, T : R|A|> public abstract interface B : R|kotlin/Any| {
     }
     public final class D : R|C<A>| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|D| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     <T> public final typealias C = R|B<T, A>|
diff --git a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
index 69917bc0dc5..0c7d4fb6e26 100644
--- a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
+++ b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
@@ -2,10 +2,14 @@ FILE: typeParameterVsNested.kt
     public abstract interface Some : R|kotlin/Any| {
     }
     <T : R|test/Some|> public abstract class My : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<T : R|test/My.Some|>(): R|test/My<T>| {
+            super<R|kotlin/Any|>()
+        }
 
         public final inner class T : R|kotlin/Any| {
-            public constructor(): super<R|kotlin/Any|>()
+            public constructor(): R|test/My.T| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -21,7 +25,9 @@ FILE: typeParameterVsNested.kt
             public get(): R|test/My.T|
 
         public final class Some : R|test/My.T| {
-            public constructor(): super<R|T|>()
+            public constructor(): R|test/My.Some| {
+                super<R|T|>()
+            }
 
         }
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index 33dbe9733ee..f0b799549ee 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -196,12 +196,19 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         }
     }
 
+    private fun List<FirTypeParameter>.renderTypeParameters() {
+        if (isNotEmpty()) {
+            print("<")
+            renderSeparated()
+            print(">")
+        }
+    }
+
     override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) {
         memberDeclaration.annotations.renderAnnotations()
+        memberDeclaration.typeParameters.renderTypeParameters()
         if (memberDeclaration.typeParameters.isNotEmpty()) {
-            print("<")
-            memberDeclaration.typeParameters.renderSeparated()
-            print("> ")
+            print(" ")
         }
         print(memberDeclaration.visibility.asString() + " " + memberDeclaration.modalityAsString() + " ")
         if (memberDeclaration.isExpect) {
@@ -354,7 +361,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
 
     override fun visitNamedFunction(namedFunction: FirNamedFunction) {
         visitCallableDeclaration(namedFunction)
-        namedFunction.body?.accept(this)
+        namedFunction.body?.renderBody()
         if (namedFunction.body == null) {
             println()
         }
@@ -363,12 +370,23 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
     override fun visitConstructor(constructor: FirConstructor) {
         constructor.annotations.renderAnnotations()
         print(constructor.visibility.asString() + " constructor")
+        constructor.typeParameters.renderTypeParameters()
         constructor.valueParameters.renderParameters()
-        constructor.delegatedConstructor?.accept(this)
-        constructor.body?.accept(this)
-        if (constructor.body == null) {
-            println()
+        print(": ")
+        constructor.returnTypeRef.accept(this)
+        val body = constructor.body
+        val delegatedConstructor = constructor.delegatedConstructor
+        if (body == null) {
+            if (delegatedConstructor != null) {
+                renderInBraces {
+                    delegatedConstructor.accept(this)
+                    println()
+                }
+            } else {
+                println()
+            }
         }
+        body?.renderBody(listOfNotNull(delegatedConstructor))
     }
 
     override fun visitPropertyAccessor(propertyAccessor: FirPropertyAccessor) {
@@ -378,7 +396,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         propertyAccessor.valueParameters.renderParameters()
         print(": ")
         propertyAccessor.returnTypeRef.accept(this)
-        propertyAccessor.body?.accept(this)
+        propertyAccessor.body?.renderBody()
     }
 
     override fun visitAnonymousFunction(anonymousFunction: FirAnonymousFunction) {
@@ -397,7 +415,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         anonymousFunction.valueParameters.renderParameters()
         print(": ")
         anonymousFunction.returnTypeRef.accept(this)
-        anonymousFunction.body?.accept(this)
+        anonymousFunction.body?.renderBody()
     }
 
     override fun visitFunction(function: FirFunction) {
@@ -407,23 +425,27 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
 
     override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) {
         print("init")
-        anonymousInitializer.body?.accept(this)
+        anonymousInitializer.body?.renderBody()
     }
 
     override fun visitDeclarationWithBody(declarationWithBody: FirDeclarationWithBody) {
         visitDeclaration(declarationWithBody)
-        declarationWithBody.body?.accept(this)
+        declarationWithBody.body?.renderBody()
     }
 
-    override fun visitBlock(block: FirBlock) {
+    private fun FirBlock.renderBody(additionalStatements: List<FirStatement> = emptyList()) {
         renderInBraces {
-            for (statement in block.statements) {
-                statement.accept(this)
+            for (statement in additionalStatements + statements) {
+                statement.accept(this@FirRenderer)
                 println()
             }
         }
     }
 
+    override fun visitBlock(block: FirBlock) {
+        block.renderBody()
+    }
+
     override fun visitTypeAlias(typeAlias: FirTypeAlias) {
         typeAlias.annotations.renderAnnotations()
         visitMemberDeclaration(typeAlias)
@@ -639,9 +661,9 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
 
     override fun visitDelegatedConstructorCall(delegatedConstructorCall: FirDelegatedConstructorCall) {
         if (delegatedConstructorCall.isSuper) {
-            print(": super<")
+            print("super<")
         } else if (delegatedConstructorCall.isThis) {
-            print(": this<")
+            print("this<")
         }
         delegatedConstructorCall.constructedTypeRef.accept(this)
         print(">")
diff --git a/idea/testData/fir/multiModule/basic/m1_java/base.txt b/idea/testData/fir/multiModule/basic/m1_java/base.txt
index cb436533d1e..86707e10bf3 100644
--- a/idea/testData/fir/multiModule/basic/m1_java/base.txt
+++ b/idea/testData/fir/multiModule/basic/m1_java/base.txt
@@ -1,13 +1,17 @@
 FILE: base.kt
     public final class Hello : R|kotlin/Any| {
-        public constructor(msg: R|kotlin/String|): super<R|kotlin/Any|>()
+        public constructor(msg: R|kotlin/String|): R|hello/Hello| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val msg: R|kotlin/String| = R|<local>/msg|
             public get(): R|kotlin/String|
 
     }
     public final class Test : R|kotlin/Any| {
-        public constructor(set: R|java/util/Set<*>|): super<R|kotlin/Any|>()
+        public constructor(set: R|java/util/Set<*>|): R|hello/Test| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val set: R|java/util/Set<*>| = R|<local>/set|
             public get(): R|java/util/Set<*>|
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
index e3d12596ebc..d7d430978e7 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public final class User : R|Annotated| {
-        public constructor(): super<R|Annotated|>()
+        public constructor(): R|User| {
+            super<R|Annotated|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             lval x: R|kotlin/String| = R|/Annotated.foo|(String(123))
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
index 457bc54cadd..db2048caa2c 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public final class User : R|AnnotatedDerived| {
-        public constructor(): super<R|AnnotatedDerived|>()
+        public constructor(): R|User| {
+            super<R|AnnotatedDerived|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             lval x: R|kotlin/String| = R|/AnnotatedDerived.foo|(String(123))
diff --git a/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt
index 212a376584b..e0e5900fc4f 100644
--- a/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithJava/jvm/jvm.txt
@@ -1,5 +1,7 @@
 FILE: jvm.kt
     public final class A : R|Some| {
-        public constructor(): super<R|Some|>()
+        public constructor(): R|A| {
+            super<R|Some|>()
+        }
 
     }
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
index 499642fa000..7cc35a7c146 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
@@ -1,10 +1,14 @@
 FILE: simpleFakeOverride.kt
     public final class Some : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Some| {
+            super<R|kotlin/Any|>()
+        }
 
     }
     public final class B : R|A<Some>| {
-        public constructor(): super<R|A<Some>|>()
+        public constructor(): R|B| {
+            super<R|A<Some>|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|FakeOverride</A.foo: R|ft<T, T?>|!>|(R|/Some.Some|())
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
index f1cd091481f..500c8815d29 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public final class A : R|Some| {
-        public constructor(): super<R|Some|>()
+        public constructor(): R|A| {
+            super<R|Some|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             lval res1: R|kotlin/Boolean| = R|/Some.foo|(Int(1))
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
index 35d8d9b6b17..a520ace058b 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
@@ -2,7 +2,9 @@ FILE: Base.kt
     public abstract interface First : R|kotlin/Any| {
     }
     public open class Second : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|Second| {
+            super<R|kotlin/Any|>()
+        }
 
         public open fun R|First|.foo(s: R|kotlin/String|, i: R|kotlin/Int|): R|kotlin/Unit| {
         }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
index a029dbd3e55..142752655d9 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
@@ -1,6 +1,8 @@
 FILE: Test.kt
     public final class Tester : R|Inheritor|, R|First| {
-        public constructor(): super<R|Inheritor|>()
+        public constructor(): R|Tester| {
+            super<R|Inheritor|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/Inheritor.foo|(String(abc), Int(456))
diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt
index d092eac99b7..09f4269529e 100644
--- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt
+++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Derived.txt
@@ -1,5 +1,7 @@
 FILE: Derived.kt
     public final class Derived : R|Some| {
-        public constructor(): super<R|Some|>()
+        public constructor(): R|Derived| {
+            super<R|Some|>()
+        }
 
     }
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
index 947010b550b..666a037caac 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
@@ -1,16 +1,22 @@
 FILE: common.kt
     <T> public open expect class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<T>(): R|A<T>| {
+            super<R|kotlin/Any|>()
+        }
 
         public open fun foo(arg: R|T|): R|kotlin/Unit|
 
     }
     public open class B : R|A<kotlin/String>| {
-        public constructor(): super<R|A<kotlin/String>|>()
+        public constructor(): R|B| {
+            super<R|A<kotlin/String>|>()
+        }
 
     }
     public open class C : R|B| {
-        public constructor(): super<R|B|>()
+        public constructor(): R|C| {
+            super<R|B|>()
+        }
 
         public open fun bar(arg: R|kotlin/String|): R|kotlin/String| {
             ^bar R|<local>/arg|
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
index 1ad604081c3..4e670e5d5d3 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     <T> public open actual class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor<T>(): R|A<T>| {
+            super<R|kotlin/Any|>()
+        }
 
         public open actual fun foo(arg: R|T|): R|kotlin/Unit| {
         }
@@ -15,7 +17,9 @@ FILE: jvm.kt
 
     }
     public final class D : R|C| {
-        public constructor(): super<R|C|>()
+        public constructor(): R|D| {
+            super<R|C|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
diff --git a/idea/testData/fir/multiModule/mppMemberType/common/common.txt b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
index f5383d814b3..fb1074d3e20 100644
--- a/idea/testData/fir/multiModule/mppMemberType/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
@@ -1,12 +1,16 @@
 FILE: common.kt
     public final expect class MyList : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|MyList| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun get(i: R|kotlin/Int|): R|kotlin/Int|
 
     }
     public open class Wrapper : R|kotlin/Any| {
-        public constructor(list: R|MyList|): super<R|kotlin/Any|>()
+        public constructor(list: R|MyList|): R|Wrapper| {
+            super<R|kotlin/Any|>()
+        }
 
         public final val list: R|MyList| = R|<local>/list|
             public get(): R|MyList|
diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
index 441fba6b5af..de31bcd14d1 100644
--- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public final actual class MyList : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|MyList| {
+            super<R|kotlin/Any|>()
+        }
 
         public final actual fun get(i: R|kotlin/Int|): R|kotlin/Int| {
             ^get R|<local>/i|
@@ -11,7 +13,9 @@ FILE: jvm.kt
 
     }
     public final class DerivedList : R|MyList| {
-        public constructor(): super<R|MyList|>()
+        public constructor(): R|DerivedList| {
+            super<R|MyList|>()
+        }
 
         public final fun useMember(): R|kotlin/Unit| {
             R|/MyList.get|(Int(1))
@@ -24,7 +28,9 @@ FILE: jvm.kt
         R|<local>/list|.R|/MyList.set|(Int(2), Int(3))
     }
     public final class DerivedWrapper : R|Wrapper| {
-        public constructor(): super<R|Wrapper|>()
+        public constructor(): R|DerivedWrapper| {
+            super<R|Wrapper|>()
+        }
 
         public final fun use(): R|kotlin/Unit| {
             R|/Wrapper.list|.R|/MyList.get|(Int(1))
diff --git a/idea/testData/fir/multiModule/mppMembers/common/common.txt b/idea/testData/fir/multiModule/mppMembers/common/common.txt
index c79d128bb88..ff4152056c7 100644
--- a/idea/testData/fir/multiModule/mppMembers/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMembers/common/common.txt
@@ -1,11 +1,15 @@
 FILE: common.kt
     public open expect class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun foo(): R|kotlin/Unit|
 
     }
     public open class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
     }
diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
index bf381975c1a..6ea8f6aa89a 100644
--- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public open actual class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public final actual fun foo(): R|kotlin/Unit| {
         }
@@ -10,7 +12,9 @@ FILE: jvm.kt
 
     }
     public final class C : R|B| {
-        public constructor(): super<R|B|>()
+        public constructor(): R|C| {
+            super<R|B|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
@@ -19,7 +23,9 @@ FILE: jvm.kt
 
     }
     public final class D : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|D| {
+            super<R|A|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
index c79d128bb88..ff4152056c7 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
@@ -1,11 +1,15 @@
 FILE: common.kt
     public open expect class A : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun foo(): R|kotlin/Unit|
 
     }
     public open class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
     }
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
index 3a9ca6ec2ba..0db241de3d4 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
@@ -1,6 +1,8 @@
 FILE: jvm.kt
     public abstract class X : R|kotlin/Any| {
-        public constructor(): super<R|kotlin/Any|>()
+        public constructor(): R|X| {
+            super<R|kotlin/Any|>()
+        }
 
         public final fun bar(): R|kotlin/Unit| {
         }
@@ -12,14 +14,18 @@ FILE: jvm.kt
 
     }
     public open actual class A : R|X|, R|Y| {
-        public constructor(): super<R|X|>()
+        public constructor(): R|A| {
+            super<R|X|>()
+        }
 
         public final actual fun foo(): R|kotlin/Unit| {
         }
 
     }
     public final class C : R|B| {
-        public constructor(): super<R|B|>()
+        public constructor(): R|C| {
+            super<R|B|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
@@ -29,7 +35,9 @@ FILE: jvm.kt
 
     }
     public final class D : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|D| {
+            super<R|A|>()
+        }
 
         public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
index 8a60a1f2617..38a50097d09 100644
--- a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
+++ b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
@@ -1,6 +1,8 @@
 FILE: B.kt
     public final class B : R|A| {
-        public constructor(): super<R|A|>()
+        public constructor(): R|B| {
+            super<R|A|>()
+        }
 
         public final override fun foo(): R|B| {
             ^foo this#