diff --git a/compiler/testData/ir/irText/classes/abstractMembers.kt.txt b/compiler/testData/ir/irText/classes/abstractMembers.kt.txt
index 27b5b6c4a34..3069a90f927 100644
--- a/compiler/testData/ir/irText/classes/abstractMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/abstractMembers.kt.txt
@@ -1,7 +1,7 @@
 abstract class AbstractClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.kt.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.kt.txt
index efcaa40dc09..9ab2b723751 100644
--- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -20,7 +20,7 @@ class Test1 : Base {
     { // BLOCK
       super/*Base*/(x = xx, y = yy)
     }
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -31,7 +31,7 @@ class Test2 : Base {
     { // BLOCK
       super/*Base*/(x = xx, y = yy)
     }
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/classMembers.kt.txt b/compiler/testData/ir/irText/classes/classMembers.kt.txt
index d3b527f9bd1..2242eebf0c2 100644
--- a/compiler/testData/ir/irText/classes/classMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor(x: Int, y: Int, z: Int = 1) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -46,7 +46,7 @@ class C {
   class NestedClass {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -71,7 +71,7 @@ class C {
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/classes.kt.txt b/compiler/testData/ir/irText/classes/classes.kt.txt
index e92e77ca60b..1d635a53e2e 100644
--- a/compiler/testData/ir/irText/classes/classes.kt.txt
+++ b/compiler/testData/ir/irText/classes/classes.kt.txt
@@ -1,7 +1,7 @@
 class TestClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ interface TestInterface {
 object TestObject {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -28,7 +28,7 @@ annotation class TestAnnotationClass : Annotation {
 enum class TestEnumClass : Enum<TestEnumClass> {
   private constructor() /* primary */ {
     super/*Enum*/<TestEnumClass>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/cloneable.kt.txt b/compiler/testData/ir/irText/classes/cloneable.kt.txt
index 54414875278..3f3e225b76d 100644
--- a/compiler/testData/ir/irText/classes/cloneable.kt.txt
+++ b/compiler/testData/ir/irText/classes/cloneable.kt.txt
@@ -1,7 +1,7 @@
 class A : Cloneable {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ interface I : Cloneable {
 class C : I {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -23,7 +23,7 @@ class C : I {
 class OC : I {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/companionObject.kt.txt b/compiler/testData/ir/irText/classes/companionObject.kt.txt
index d98863848f0..c84b9b0b937 100644
--- a/compiler/testData/ir/irText/classes/companionObject.kt.txt
+++ b/compiler/testData/ir/irText/classes/companionObject.kt.txt
@@ -1,14 +1,14 @@
 class Test1 {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -19,14 +19,14 @@ class Test1 {
 class Test2 {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   companion object Named {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
index a6b96771542..83741801142 100644
--- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
@@ -1,7 +1,7 @@
 data class Test1 {
   constructor(stringArray: Array<String>, charArray: CharArray, booleanArray: BooleanArray, byteArray: ByteArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -168,7 +168,7 @@ dataClassArrayMemberToString(arg0 = #doubleArray) +
 data class Test2<T : Any?> {
   constructor(genericArray: Array<T>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -214,7 +214,7 @@ dataClassArrayMemberToString(arg0 = #genericArray) +
 data class Test3 {
   constructor(anyArrayN: Array<Any>?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/dataClasses.kt.txt b/compiler/testData/ir/irText/classes/dataClasses.kt.txt
index d1663fc90ff..98d1074bfa3 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.kt.txt
@@ -1,7 +1,7 @@
 data class Test1 {
   constructor(x: Int, y: String, z: Any) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -78,7 +78,7 @@ data class Test1 {
 data class Test2 {
   constructor(x: Any?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -127,7 +127,7 @@ data class Test2 {
 data class Test3 {
   constructor(d: Double, dn: Double?, f: Float, df: Float?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
index 766c41c024e..c8c07bfc416 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
@@ -1,7 +1,7 @@
 data class Test1<T : Any?> {
   constructor(x: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -50,7 +50,7 @@ data class Test1<T : Any?> {
 data class Test2<T : Number> {
   constructor(x: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -96,7 +96,7 @@ data class Test2<T : Number> {
 data class Test3<T : Any?> {
   constructor(x: List<T>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -142,7 +142,7 @@ data class Test3<T : Any?> {
 data class Test4 {
   constructor(x: List<String>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt
index a69d0ad3620..1a80e772181 100644
--- a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt
@@ -12,7 +12,7 @@ interface IBase<A : Any?> {
 class Test1<E : Any?> : IBase<E> {
   constructor(i: IBase<E>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -39,7 +39,7 @@ class Test1<E : Any?> : IBase<E> {
 class Test2 : IBase<String> {
   constructor(j: IBase<String>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt
index eb5f33ee9e0..94b2b17f666 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt
@@ -8,7 +8,7 @@ interface IBase {
 object BaseImpl : IBase {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -46,7 +46,7 @@ fun otherImpl(x0: String, y0: Int): IOther {
     local class <no name provided> : IOther {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -80,7 +80,7 @@ fun otherImpl(x0: String, y0: Int): IOther {
 class Test1 : IBase {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -102,7 +102,7 @@ class Test1 : IBase {
 class Test2 : IBase, IOther {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt
index e3903ec27f5..d4e4ee378be 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt
@@ -1,7 +1,7 @@
 class Test : J {
   constructor(j: J) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt
index 8f49add819e..9ce32da6eaf 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt
@@ -7,7 +7,7 @@ interface IFooBar {
 object FooBarImpl : IFooBar {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -22,7 +22,7 @@ object FooBarImpl : IFooBar {
 class C : IFooBar {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.kt.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.kt.txt
index e22727b3a35..84e7e981f0b 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.kt.txt
@@ -1,7 +1,7 @@
 open class Cell<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -16,7 +16,7 @@ typealias CStr = Cell<String>
 class C1 : Cell<String> {
   constructor() /* primary */ {
     super/*Cell*/<String>(value = "O")
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -25,7 +25,7 @@ class C1 : Cell<String> {
 class C2 : Cell<String> {
   constructor() /* primary */ {
     super/*Cell*/<String>(value = "K")
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.kt.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.kt.txt
index 0283ae6dc8b..76909b1c2f5 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.kt.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,13 +10,13 @@ open class Base {
 class Test : Base {
   constructor() {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   constructor(xx: Int) {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/enum.kt.txt b/compiler/testData/ir/irText/classes/enum.kt.txt
index 37cbf03ac13..1b1f789592b 100644
--- a/compiler/testData/ir/irText/classes/enum.kt.txt
+++ b/compiler/testData/ir/irText/classes/enum.kt.txt
@@ -1,7 +1,7 @@
 enum class TestEnum1 : Enum<TestEnum1> {
   private constructor() /* primary */ {
     super/*Enum*/<TestEnum1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ enum class TestEnum1 : Enum<TestEnum1> {
 enum class TestEnum2 : Enum<TestEnum2> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<TestEnum2>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -41,7 +41,7 @@ enum class TestEnum2 : Enum<TestEnum2> {
 abstract enum class TestEnum3 : Enum<TestEnum3> {
   private constructor() /* primary */ {
     super/*Enum*/<TestEnum3>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -49,7 +49,7 @@ abstract enum class TestEnum3 : Enum<TestEnum3> {
   private enum entry class TEST : TestEnum3 {
     private constructor() /* primary */ {
       super/*TestEnum3*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -70,7 +70,7 @@ abstract enum class TestEnum3 : Enum<TestEnum3> {
 abstract enum class TestEnum4 : Enum<TestEnum4> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<TestEnum4>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -82,7 +82,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
   private enum entry class TEST1 : TestEnum4 {
     private constructor() /* primary */ {
       super/*TestEnum4*/(x = 1) /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -96,7 +96,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
   private enum entry class TEST2 : TestEnum4 {
     private constructor() /* primary */ {
       super/*TestEnum4*/(x = 2) /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -124,7 +124,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
 enum class TestEnum5 : Enum<TestEnum5> {
   private constructor(x: Int = 0) /* primary */ {
     super/*Enum*/<TestEnum5>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -151,7 +151,7 @@ fun f(): Int {
 enum class TestEnum6 : Enum<TestEnum6> {
   private constructor(x: Int, y: Int) /* primary */ {
     super/*Enum*/<TestEnum6>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.kt.txt b/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
index df83a07a71b..6f2597bcd93 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
@@ -1,7 +1,7 @@
 enum class TestFinalEnum1 : Enum<TestFinalEnum1> {
   private constructor() /* primary */ {
     super/*Enum*/<TestFinalEnum1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -16,7 +16,7 @@ enum class TestFinalEnum1 : Enum<TestFinalEnum1> {
 enum class TestFinalEnum2 : Enum<TestFinalEnum2> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<TestFinalEnum2>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -35,7 +35,7 @@ enum class TestFinalEnum2 : Enum<TestFinalEnum2> {
 enum class TestFinalEnum3 : Enum<TestFinalEnum3> {
   private constructor() /* primary */ {
     super/*Enum*/<TestFinalEnum3>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -53,7 +53,7 @@ enum class TestFinalEnum3 : Enum<TestFinalEnum3> {
 open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
   private constructor() /* primary */ {
     super/*Enum*/<TestOpenEnum1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -61,7 +61,7 @@ open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
   private enum entry class X1 : TestOpenEnum1 {
     private constructor() /* primary */ {
       super/*TestOpenEnum1*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -80,7 +80,7 @@ open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
 open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
   private constructor() /* primary */ {
     super/*Enum*/<TestOpenEnum2>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -88,7 +88,7 @@ open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
   private enum entry class X1 : TestOpenEnum2 {
     private constructor() /* primary */ {
       super/*TestOpenEnum2*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -109,7 +109,7 @@ open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
 abstract enum class TestAbstractEnum1 : Enum<TestAbstractEnum1> {
   private constructor() /* primary */ {
     super/*Enum*/<TestAbstractEnum1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -117,7 +117,7 @@ abstract enum class TestAbstractEnum1 : Enum<TestAbstractEnum1> {
   private enum entry class X1 : TestAbstractEnum1 {
     private constructor() /* primary */ {
       super/*TestAbstractEnum1*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -142,7 +142,7 @@ interface IFoo {
 abstract enum class TestAbstractEnum2 : Enum<TestAbstractEnum2>, IFoo {
   private constructor() /* primary */ {
     super/*Enum*/<TestAbstractEnum2>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -150,7 +150,7 @@ abstract enum class TestAbstractEnum2 : Enum<TestAbstractEnum2>, IFoo {
   private enum entry class X1 : TestAbstractEnum2 {
     private constructor() /* primary */ {
       super/*TestAbstractEnum2*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
index b32cb50bb3c..1eb263c4044 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
@@ -5,7 +5,7 @@ open enum class A : Enum<A> {
   private enum entry class Y : A {
     private constructor() /* primary */ {
       super/*A*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -31,14 +31,14 @@ open enum class A : Enum<A> {
 
   private constructor(arg: String) {
     super/*Enum*/<A>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
     #prop1 = arg
   }
 
   private constructor() {
     super/*Enum*/<A>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
     #prop1 = "default"
     <this>.<set-prop3>(<set-?> = "empty")
diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt
index 263a8dd14b0..0cece93f3bc 100644
--- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt
@@ -1,7 +1,7 @@
 enum class Test0 : Enum<Test0> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<Test0>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -24,7 +24,7 @@ enum class Test0 : Enum<Test0> {
 enum class Test1 : Enum<Test1> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<Test1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -49,7 +49,7 @@ enum class Test1 : Enum<Test1> {
 abstract enum class Test2 : Enum<Test2> {
   private constructor(x: Int) /* primary */ {
     super/*Enum*/<Test2>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -61,7 +61,7 @@ abstract enum class Test2 : Enum<Test2> {
   private enum entry class ZERO : Test2 {
     private constructor() /* primary */ {
       super/*Test2*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -75,7 +75,7 @@ abstract enum class Test2 : Enum<Test2> {
   private enum entry class ONE : Test2 {
     private constructor() /* primary */ {
       super/*Test2*/(x = 1) /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt.txt b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt.txt
index b25c8fe0aee..4d90026fcf6 100644
--- a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt.txt
@@ -1,7 +1,7 @@
 class Test : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt
index b006064a36c..d09ee5936bb 100644
--- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt
+++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt
@@ -6,7 +6,7 @@ interface IFoo {
 class K1 : JFoo {
   constructor() /* primary */ {
     super/*JFoo*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -15,7 +15,7 @@ class K1 : JFoo {
 class K2 : JFoo {
   constructor() /* primary */ {
     super/*JFoo*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -28,7 +28,7 @@ class K2 : JFoo {
 class K3 : JUnrelatedFoo, IFoo {
   constructor() /* primary */ {
     super/*JUnrelatedFoo*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -37,7 +37,7 @@ class K3 : JUnrelatedFoo, IFoo {
 class K4 : JUnrelatedFoo, IFoo {
   constructor() /* primary */ {
     super/*JUnrelatedFoo*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -50,7 +50,7 @@ class K4 : JUnrelatedFoo, IFoo {
 class TestJFoo : IFoo {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -64,7 +64,7 @@ class TestJFoo : IFoo {
 class TestK1 : IFoo {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -78,7 +78,7 @@ class TestK1 : IFoo {
 class TestK2 : IFoo {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -92,7 +92,7 @@ class TestK2 : IFoo {
 class TestK3 : IFoo {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -106,7 +106,7 @@ class TestK3 : IFoo {
 class TestK4 : IFoo {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/initBlock.kt.txt b/compiler/testData/ir/irText/classes/initBlock.kt.txt
index 6163ec91fff..7af4b2a85ee 100644
--- a/compiler/testData/ir/irText/classes/initBlock.kt.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.kt.txt
@@ -1,7 +1,7 @@
 class Test1 {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ class Test1 {
 class Test2 {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -35,7 +35,7 @@ class Test3 {
 
   constructor() {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -48,7 +48,7 @@ class Test4 {
 
   constructor() {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -61,7 +61,7 @@ class Test4 {
 class Test5 {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -72,7 +72,7 @@ class Test5 {
   inner class TestInner {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/initVal.kt.txt b/compiler/testData/ir/irText/classes/initVal.kt.txt
index 4b3f935070a..8dc59032582 100644
--- a/compiler/testData/ir/irText/classes/initVal.kt.txt
+++ b/compiler/testData/ir/irText/classes/initVal.kt.txt
@@ -1,7 +1,7 @@
 class TestInitValFromParameter {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ class TestInitValFromParameter {
 class TestInitValInClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -27,7 +27,7 @@ class TestInitValInClass {
 class TestInitValInInitBlock {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/initValInLambda.kt.txt b/compiler/testData/ir/irText/classes/initValInLambda.kt.txt
index dda935da7a0..debd05f42f1 100644
--- a/compiler/testData/ir/irText/classes/initValInLambda.kt.txt
+++ b/compiler/testData/ir/irText/classes/initValInLambda.kt.txt
@@ -1,7 +1,7 @@
 class TestInitValInLambdaCalledOnce {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/initVar.kt.txt b/compiler/testData/ir/irText/classes/initVar.kt.txt
index 3233525aa99..a997b01012d 100644
--- a/compiler/testData/ir/irText/classes/initVar.kt.txt
+++ b/compiler/testData/ir/irText/classes/initVar.kt.txt
@@ -1,7 +1,7 @@
 class TestInitVarFromParameter {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -15,7 +15,7 @@ class TestInitVarFromParameter {
 class TestInitVarInClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -29,7 +29,7 @@ class TestInitVarInClass {
 class TestInitVarInInitBlock {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -46,7 +46,7 @@ class TestInitVarInInitBlock {
 class TestInitVarWithCustomSetter {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -72,7 +72,7 @@ class TestInitVarWithCustomSetterWithExplicitCtor {
 
   constructor() {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -87,7 +87,7 @@ class TestInitVarWithCustomSetterInCtor {
 
   constructor() {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
     <this>.<set-x>(value = 42)
   }
diff --git a/compiler/testData/ir/irText/classes/inlineClass.kt.txt b/compiler/testData/ir/irText/classes/inlineClass.kt.txt
index ec41ac4d6f0..2f0e8418990 100644
--- a/compiler/testData/ir/irText/classes/inlineClass.kt.txt
+++ b/compiler/testData/ir/irText/classes/inlineClass.kt.txt
@@ -1,7 +1,7 @@
 inline class Test {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.kt.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.kt.txt
index 2f95546e087..7b1babdc1c2 100644
--- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.kt.txt
+++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.kt.txt
@@ -1,7 +1,7 @@
 class C<T : Any?> {
   constructor(t: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class C<T : Any?> {
 inline class IC<TT : Any?> {
   constructor(c: C<TT>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/innerClass.kt.txt b/compiler/testData/ir/irText/classes/innerClass.kt.txt
index e766ce646a8..39793360801 100644
--- a/compiler/testData/ir/irText/classes/innerClass.kt.txt
+++ b/compiler/testData/ir/irText/classes/innerClass.kt.txt
@@ -1,14 +1,14 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   open inner class TestInnerClass {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -17,7 +17,7 @@ class Outer {
   inner class DerivedInnerClass : TestInnerClass {
     constructor() /* primary */ {
       <this>.super/*TestInnerClass*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt.txt
index 49ca52b3f0a..5075b627062 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt.txt
@@ -1,14 +1,14 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class Inner {
     constructor(x: Int) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/kt31649.kt.txt b/compiler/testData/ir/irText/classes/kt31649.kt.txt
index 84a85f99755..29275573344 100644
--- a/compiler/testData/ir/irText/classes/kt31649.kt.txt
+++ b/compiler/testData/ir/irText/classes/kt31649.kt.txt
@@ -1,7 +1,7 @@
 data class TestData {
   constructor(nn: Nothing?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -50,7 +50,7 @@ data class TestData {
 inline class TestInline {
   constructor(nn: Nothing?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt.txt
index 3d89e877f4d..a26997bb63a 100644
--- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt.txt
+++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt.txt
@@ -4,7 +4,7 @@ data class A {
   }
 ) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -52,7 +52,7 @@ data class B {
     local class <no name provided> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -61,7 +61,7 @@ data class B {
     <no name provided>()
   }) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/localClasses.kt.txt b/compiler/testData/ir/irText/classes/localClasses.kt.txt
index c1f5c521051..9d182803012 100644
--- a/compiler/testData/ir/irText/classes/localClasses.kt.txt
+++ b/compiler/testData/ir/irText/classes/localClasses.kt.txt
@@ -2,7 +2,7 @@ fun outer() {
   local class LocalClass {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt.txt
index 8a44e6a8ce3..cdc3e9b1841 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt.txt
@@ -8,7 +8,7 @@ val test1: Any
     local class <no name provided> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -23,7 +23,7 @@ val test2: IFoo
     local class <no name provided> : IFoo {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -40,14 +40,14 @@ val test2: IFoo
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   abstract inner class Inner : IFoo {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -58,7 +58,7 @@ class Outer {
       local class <no name provided> : Inner {
         constructor() /* primary */ {
           <this>.super/*Inner*/()
-                    /* InstanceInitializerCall */
+          /* <init>() */
 
         }
 
@@ -79,7 +79,7 @@ fun Outer.test4(): Inner {
     local class <no name provided> : Inner {
       constructor() /* primary */ {
         <this>.super/*Inner*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.kt.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.kt.txt
index f17d0654ee9..2d07b4d6dd5 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.kt.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.kt.txt
@@ -1,7 +1,7 @@
 abstract class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ abstract class Base {
 object Test : Base {
   private constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.kt.txt b/compiler/testData/ir/irText/classes/outerClassAccess.kt.txt
index bcf17a607a9..3e14ce133d8 100644
--- a/compiler/testData/ir/irText/classes/outerClassAccess.kt.txt
+++ b/compiler/testData/ir/irText/classes/outerClassAccess.kt.txt
@@ -1,7 +1,7 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -11,7 +11,7 @@ class Outer {
   inner class Inner {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -22,7 +22,7 @@ class Outer {
     inner class Inner2 {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.kt.txt b/compiler/testData/ir/irText/classes/primaryConstructor.kt.txt
index 17c007334ee..60c21475f3b 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.kt.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.kt.txt
@@ -1,7 +1,7 @@
 class Test1 {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class Test1 {
 class Test2 {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -35,7 +35,7 @@ class Test2 {
 class Test3 {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
index b2b8e87b6bf..52ff9edb877 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ open class Base {
 class TestImplicitPrimaryConstructor : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -19,7 +19,7 @@ class TestImplicitPrimaryConstructor : Base {
 class TestExplicitPrimaryConstructor : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -28,7 +28,7 @@ class TestExplicitPrimaryConstructor : Base {
 class TestWithDelegatingConstructor : Base {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt
index 70c147ecab9..6f9d3519e5b 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.kt.txt
@@ -23,7 +23,7 @@ interface IRight {
 class CBoth : ILeft, IRight {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/sealedClasses.kt.txt b/compiler/testData/ir/irText/classes/sealedClasses.kt.txt
index 118d203db34..6478ced9ad6 100644
--- a/compiler/testData/ir/irText/classes/sealedClasses.kt.txt
+++ b/compiler/testData/ir/irText/classes/sealedClasses.kt.txt
@@ -1,14 +1,14 @@
 sealed class Expr {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   class Const : Expr {
     constructor(number: Double) /* primary */ {
       super/*Expr*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -21,7 +21,7 @@ sealed class Expr {
   class Sum : Expr {
     constructor(e1: Expr, e2: Expr) /* primary */ {
       super/*Expr*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -38,7 +38,7 @@ sealed class Expr {
   object NotANumber : Expr {
     private constructor() /* primary */ {
       super/*Expr*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
index b3b9e2c55da..a31ec922d9f 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ class TestProperty : Base {
 
   constructor() {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -30,13 +30,13 @@ class TestInitBlock : Base {
 
   constructor() {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   constructor(z: Any) {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructors.kt.txt b/compiler/testData/ir/irText/classes/secondaryConstructors.kt.txt
index c267adaeb30..84a77059e81 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructors.kt.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructors.kt.txt
@@ -5,7 +5,7 @@ class C {
 
   constructor(x: Int) {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/superCalls.kt.txt b/compiler/testData/ir/irText/classes/superCalls.kt.txt
index 93cf125f348..687a71a5e3c 100644
--- a/compiler/testData/ir/irText/classes/superCalls.kt.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -21,7 +21,7 @@ open class Base {
 class Derived : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt b/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt
index 471013b28f6..bd02444c9cb 100644
--- a/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt
+++ b/compiler/testData/ir/irText/classes/superCallsComposed.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -24,7 +24,7 @@ interface BaseI {
 class Derived : Base, BaseI {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt
index 6a73fe8de59..dd685ea127e 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt
@@ -22,7 +22,7 @@ interface IFoo {
 class DFoo : IFoo {
   constructor(d: IFoo) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt
index 7ff0acf5306..40b5ffcdbd6 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt
@@ -9,7 +9,7 @@ annotation class A : Annotation {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
index d847caba86d..98dacab33e4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
@@ -10,7 +10,7 @@ annotation class TestAnn : Annotation {
 class TestClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -25,7 +25,7 @@ interface TestInterface {
 object TestObject {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -34,7 +34,7 @@ object TestObject {
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -42,7 +42,7 @@ class Host {
   companion object TestCompanion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -54,7 +54,7 @@ class Host {
 enum class TestEnum : Enum<TestEnum> {
   private constructor() /* primary */ {
     super/*Enum*/<TestEnum>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt
index 506df0bf49d..8920ef5e3db 100644
--- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt
@@ -10,7 +10,7 @@ class TestClass {
   @TestAnn(x = 1)
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt
index 357f2ac0469..f41515d8c15 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt
@@ -9,7 +9,7 @@ annotation class A : Annotation {
 class Cell {
   constructor(value: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
index c75c1884183..a409bf197a4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
@@ -9,7 +9,7 @@ annotation class TestAnn : Annotation {
 open enum class TestEnum : Enum<TestEnum> {
   private constructor() /* primary */ {
     super/*Enum*/<TestEnum>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -22,7 +22,7 @@ open enum class TestEnum : Enum<TestEnum> {
   private enum entry class ENTRY2 : TestEnum {
     private constructor() /* primary */ {
       super/*TestEnum*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
index d242b9165bf..5163a81efd1 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
@@ -1,7 +1,7 @@
 enum class En : Enum<En> {
   private constructor() /* primary */ {
     super/*Enum*/<En>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.kt.txt
index 3151a9e8a65..05dc5755fca 100644
--- a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.kt.txt
@@ -6,7 +6,7 @@ annotation class Ann : Annotation {
 class Test {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt
index 0235470af25..714ac0e7f4d 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt
@@ -9,7 +9,7 @@ annotation class A : Annotation {
 class C {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.kt.txt
index 454dd388aac..1db19eec87e 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.kt.txt
@@ -11,7 +11,7 @@ var p: Int
 class C {
   constructor(p: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.kt.txt
index 71c6e613a39..198a977fa67 100644
--- a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.kt.txt
@@ -6,7 +6,7 @@ annotation class Ann : Annotation {
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.kt.txt
index b105f6e0f5d..13caad3c889 100644
--- a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.kt.txt
@@ -12,7 +12,7 @@ fun testFun(x: Int) {
 class TestClassConstructor1 {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.kt.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.kt.txt
index ae08381b7f1..cdc06bc23e6 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.kt.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.kt.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.kt.txt
index 205c61703d2..e64cbcacc1a 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.kt.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.kt.txt
@@ -10,7 +10,7 @@ val test1: Int /* by */
 class C {
   constructor(map: MutableMap<String, Any>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/extensionProperties.kt.txt b/compiler/testData/ir/irText/declarations/extensionProperties.kt.txt
index 267b1e31f28..bec04c48d3a 100644
--- a/compiler/testData/ir/irText/declarations/extensionProperties.kt.txt
+++ b/compiler/testData/ir/irText/declarations/extensionProperties.kt.txt
@@ -13,7 +13,7 @@ var String.test2: Int
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.kt.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.kt.txt
index 4110a02f158..f2f8577ba34 100644
--- a/compiler/testData/ir/irText/declarations/fakeOverrides.kt.txt
+++ b/compiler/testData/ir/irText/declarations/fakeOverrides.kt.txt
@@ -12,7 +12,7 @@ interface IBar {
 abstract class CFoo<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -24,7 +24,7 @@ abstract class CFoo<T : Any?> {
 class Test1 : CFoo<String>, IFooStr, IBar {
   constructor() /* primary */ {
     super/*CFoo*/<String>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/genericDelegatedProperty.kt.txt b/compiler/testData/ir/irText/declarations/genericDelegatedProperty.kt.txt
index ca34745c9e5..ead82071077 100644
--- a/compiler/testData/ir/irText/declarations/genericDelegatedProperty.kt.txt
+++ b/compiler/testData/ir/irText/declarations/genericDelegatedProperty.kt.txt
@@ -1,7 +1,7 @@
 class C<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ class C<T : Any?> {
 object Delegate {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt.txt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt.txt
index 2e27521ce6f..87d5028821e 100644
--- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt.txt
@@ -1,7 +1,7 @@
 inline class IT {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -36,7 +36,7 @@ inline class IT {
 inline class InlineMutableSet : MutableSet<IT> {
   constructor(ms: MutableSet<IT>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/kt29833.kt.txt b/compiler/testData/ir/irText/declarations/kt29833.kt.txt
index 4f17ab6bb51..fff97c14f7e 100644
--- a/compiler/testData/ir/irText/declarations/kt29833.kt.txt
+++ b/compiler/testData/ir/irText/declarations/kt29833.kt.txt
@@ -3,7 +3,7 @@ package interop
 object Definitions {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/kt35550.kt.txt b/compiler/testData/ir/irText/declarations/kt35550.kt.txt
index 3eefd726acd..66a1472b519 100644
--- a/compiler/testData/ir/irText/declarations/kt35550.kt.txt
+++ b/compiler/testData/ir/irText/declarations/kt35550.kt.txt
@@ -9,7 +9,7 @@ interface I {
 class A : I {
   constructor(i: I) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.kt.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.kt.txt
index be3fb0a6c6f..39087ba773a 100644
--- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.kt.txt
+++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.kt.txt
@@ -2,7 +2,7 @@ fun outer() {
   local abstract class ALocal {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -19,7 +19,7 @@ fun outer() {
   local class Local : ALocal {
     constructor() /* primary */ {
       super/*ALocal*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt
index 7702aaae39a..34fe84697c7 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt
@@ -14,7 +14,7 @@ expect open class B : A {
 abstract class A {
   protected constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -25,7 +25,7 @@ abstract class A {
 open class B : A {
   constructor(i: Int) /* primary */ {
     super/*A*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
index c7f3b5d4ed7..b18ea4a2487 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
@@ -12,7 +12,7 @@ expect enum class MyEnum : Enum<MyEnum> {
 enum class MyEnum : Enum<MyEnum> {
   private constructor() /* primary */ {
     super/*Enum*/<MyEnum>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt
index ec28ed7f4c7..6f95f6af0b4 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt
@@ -11,7 +11,7 @@ expect class Add : Ops {
 sealed class Ops {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -20,7 +20,7 @@ sealed class Ops {
 class Add : Ops {
   constructor() /* primary */ {
     super/*Ops*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.kt.txt b/compiler/testData/ir/irText/declarations/parameters/class.kt.txt
index 414681de8f4..be10a108b61 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.kt.txt
@@ -8,14 +8,14 @@ interface TestInterface<T : Any?> {
 class Test<T0 : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   class TestNested<T1 : Any?> {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -24,7 +24,7 @@ class Test<T0 : Any?> {
   inner class TestInner<T2 : Any?> {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.kt.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.kt.txt
index b0970a65095..e05d745e196 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.kt.txt
@@ -1,7 +1,7 @@
 class Test1<T1 : Any?, T2 : Any?> {
   constructor(x: T1, y: T2) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class Test1<T1 : Any?, T2 : Any?> {
 class Test2 {
   constructor(x: Int, y: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -29,7 +29,7 @@ class Test2 {
   inner class TestInner<Z : Any?> {
     constructor(z: Z) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -48,7 +48,7 @@ class Test2 {
 class Test3 {
   constructor(x: Int, y: String = "") /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -65,7 +65,7 @@ class Test3 {
 class Test4<T : Any?> {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
index 74902ebe9b5..e2e22c91071 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
@@ -1,7 +1,7 @@
 data class Test<T : Any?> {
   constructor(x: T, y: String = "") /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.kt.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.kt.txt
index a94798f1eac..6e106cd3538 100644
--- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.kt.txt
@@ -10,7 +10,7 @@ var test2: Int
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -28,7 +28,7 @@ class Host {
 class InPrimaryCtor<T : Any?> {
   constructor(testInPrimaryCtor1: T, testInPrimaryCtor2: Int = 42) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt
index a49deaf0140..f5b15febf27 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt
@@ -10,7 +10,7 @@ interface IBase<T : Any?> {
 class Test<TT : Any?> : IBase<TT> {
   constructor(impl: IBase<TT>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/fun.kt.txt b/compiler/testData/ir/irText/declarations/parameters/fun.kt.txt
index f985b350851..3e20cb6f7e1 100644
--- a/compiler/testData/ir/irText/declarations/parameters/fun.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/fun.kt.txt
@@ -13,7 +13,7 @@ fun String.textExt1(i: Int, j: String) {
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt.txt
index 503250dcd03..807626363fd 100644
--- a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.kt.txt
@@ -1,14 +1,14 @@
 class Outer<T1 : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class Inner<T2 : Any?> {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.kt.txt b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.kt.txt
index 5165f6c13d8..c167871e1f3 100644
--- a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.kt.txt
@@ -37,7 +37,7 @@ var <T : Any?> T.testExt4: Int
 class Host<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.kt.txt b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.kt.txt
index f7f88a64ada..0961a8e7862 100644
--- a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.kt.txt
@@ -1,7 +1,7 @@
 class Test1<T : U, U : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.kt.txt b/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.kt.txt
index 0407f0fedf2..27b79cd61e2 100644
--- a/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.kt.txt
@@ -1,7 +1,7 @@
 abstract class Base1<T : Derived1> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ abstract class Base1<T : Derived1> {
 class Derived1 : Base1<Derived1> {
   constructor() /* primary */ {
     super/*Base1*/<Derived1>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -19,7 +19,7 @@ class Derived1 : Base1<Derived1> {
 abstract class Base2 {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -31,7 +31,7 @@ abstract class Base2 {
 class Derived2 : Base2 {
   constructor() /* primary */ {
     super/*Base2*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt.txt
index d6e01b5c993..933cbd371df 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt.txt
@@ -1,7 +1,7 @@
 class Test {
   constructor(x: Int = 0) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt.txt
index 59230d68345..8ebd89a3b02 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor(test1: Int, test2: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt.txt
index 995dc1647e9..8efa4a30fda 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt.txt
@@ -1,7 +1,7 @@
 class MyClass {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.kt.txt
index f59a769225a..85d9f427021 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/local.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.kt.txt
@@ -1,7 +1,7 @@
 class Delegate {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class Delegate {
 class DelegateProvider {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.kt.txt
index 4cfecc03c66..56b89e59655 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.kt.txt
@@ -1,7 +1,7 @@
 class MyClass {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.kt.txt
index 881cb1e698e..8e117b1728e 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.kt.txt
@@ -1,7 +1,7 @@
 class Delegate {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class Delegate {
 class DelegateProvider {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -35,7 +35,7 @@ class DelegateProvider {
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.kt.txt
index 2175f0337a6..65135b040d1 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.kt.txt
@@ -1,14 +1,14 @@
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   class StringDelegate {
     constructor(s: String) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.kt.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.kt.txt
index 3b97be38e4e..eee35c45df1 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.kt.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.kt.txt
@@ -1,7 +1,7 @@
 class Delegate {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ class Delegate {
 class DelegateProvider {
   constructor(value: String) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt
index 80cf0757892..fd388f1a6f8 100644
--- a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt
+++ b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt
@@ -7,7 +7,7 @@ fun foo() {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.kt.txt b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.kt.txt
index be2ddfddf77..248707a1ec8 100644
--- a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.kt.txt
+++ b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt.txt
index dc6157aa590..9765c14f760 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.kt.txt
@@ -9,7 +9,7 @@ fun bar(): Int {
 class C {
   constructor(x: IntArray) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/assignments.kt.txt b/compiler/testData/ir/irText/expressions/assignments.kt.txt
index 2bb0575af4a..c0d911db18c 100644
--- a/compiler/testData/ir/irText/expressions/assignments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.kt.txt
@@ -1,7 +1,7 @@
 class Ref {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt.txt
index 20f7ee9d601..1d20e1313c0 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.kt.txt b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.kt.txt
index b68fc3d5dce..81ee66c9bc8 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.kt.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.kt.txt
@@ -1,7 +1,7 @@
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.kt.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.kt.txt
index 42e41290c72..931ca56c3eb 100644
--- a/compiler/testData/ir/irText/expressions/boundCallableReferences.kt.txt
+++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/adaptedExtensionFunctions.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/adaptedExtensionFunctions.kt.txt
index ff78f303dc0..59c4b5eb534 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/adaptedExtensionFunctions.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/adaptedExtensionFunctions.kt.txt
@@ -4,7 +4,7 @@ fun use(f: @ExtensionFunctionType Function2<C, Int, Unit>) {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.kt.txt
index f283591c503..b033722a959 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/boundInnerGenericConstructor.kt.txt
@@ -3,14 +3,14 @@ package test
 class Foo<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class Inner<P : Any?> {
     constructor(a: T, b: P) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt
index d45da24e38c..2a8da60a737 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt
@@ -10,7 +10,7 @@ fun interface IFoo2 : IFoo {
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -19,7 +19,7 @@ object A {
 object B {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.kt.txt
index d259c3e1edd..71a408fd35b 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.kt.txt
@@ -5,7 +5,7 @@ fun use(fn: Function1<Int, Any>): Any {
 class C {
   constructor(vararg xs: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,14 +14,14 @@ class C {
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class Inner {
     constructor(vararg xs: Int) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/funWithDefaultParametersAsKCallableStar.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/funWithDefaultParametersAsKCallableStar.kt.txt
index bfaf53bbc2b..3171c63c6b8 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/funWithDefaultParametersAsKCallableStar.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/funWithDefaultParametersAsKCallableStar.kt.txt
@@ -13,7 +13,7 @@ fun varargs(vararg xs: String): Int {
 class C {
   constructor(x: String = "") /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt.txt
index fd79b49f155..bbd8f11082c 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/genericMember.kt.txt
@@ -1,7 +1,7 @@
 class A<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt.txt
index ebb869ef4ef..e35ff17d6df 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/importedFromObject.kt.txt
@@ -3,7 +3,7 @@ package test
 object Foo {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/kt37131.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/kt37131.kt.txt
index b71aa180da8..ae24664ea68 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/kt37131.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/kt37131.kt.txt
@@ -5,7 +5,7 @@ fun foo(x: String = ""): String {
 class C {
   constructor(x: String = "") /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.kt.txt
index 662743840da..0a20ee52a87 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.kt.txt
@@ -26,7 +26,7 @@ fun foo4(i: Int = 42) {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt.txt
index 909ea6478f4..afbc5f32bc8 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.kt.txt
@@ -1,7 +1,7 @@
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.kt.txt
index 2c53f1d3be3..8d2b3fa8a14 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.kt.txt
@@ -7,7 +7,7 @@ fun use2(fn: Function1<Int, Unit>) {
 open class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -20,7 +20,7 @@ open class A {
 object Obj : A {
   private constructor() /* primary */ {
     super/*A*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt.txt
index 9ef62ca6265..de12596b249 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.kt.txt
@@ -24,7 +24,7 @@ fun fnWithVarargs(vararg xs: Int): String {
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.kt.txt
index 778c1d5ef1f..90bbd40c144 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.kt.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.kt.txt
@@ -5,7 +5,7 @@ fun use(fn: Function1<Int, Unit>) {
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/castToTypeParameter.kt.txt b/compiler/testData/ir/irText/expressions/castToTypeParameter.kt.txt
index d37018e51b7..5041b4ffcf2 100644
--- a/compiler/testData/ir/irText/expressions/castToTypeParameter.kt.txt
+++ b/compiler/testData/ir/irText/expressions/castToTypeParameter.kt.txt
@@ -14,7 +14,7 @@ val <T : Any?> T.castExtVal: T
 class Host<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
index 44aa31dbb1f..343cf760287 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/classReference.kt.txt b/compiler/testData/ir/irText/expressions/classReference.kt.txt
index ee6e13d7e6f..7cd8b17a945 100644
--- a/compiler/testData/ir/irText/expressions/classReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/classReference.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.kt.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.kt.txt
index 283189eb48b..8a903ad8b97 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.kt.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.kt.txt
@@ -1,7 +1,7 @@
 object X1 {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -13,7 +13,7 @@ object X1 {
   object X2 {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -25,7 +25,7 @@ object X1 {
     object X3 {
       private constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -85,7 +85,7 @@ fun test2() {
 class B {
   constructor(s: Int = 0) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -99,7 +99,7 @@ class B {
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.kt.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.kt.txt
index 322337e59bc..a88b853cbb3 100644
--- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.kt.txt
@@ -9,14 +9,14 @@ fun testJava(): J2<Double, Int> {
 class K1<T1 : Number> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class K2<T2 : CharSequence> {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/contructorCall.kt.txt b/compiler/testData/ir/irText/expressions/contructorCall.kt.txt
index 45f4be27318..639bef3c255 100644
--- a/compiler/testData/ir/irText/expressions/contructorCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/contructorCall.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/destructuring1.kt.txt b/compiler/testData/ir/irText/expressions/destructuring1.kt.txt
index f4e556343c9..05c3716b9cc 100644
--- a/compiler/testData/ir/irText/expressions/destructuring1.kt.txt
+++ b/compiler/testData/ir/irText/expressions/destructuring1.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ object A {
 object B {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.kt.txt b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.kt.txt
index 2d7aaf67116..e1f49ab335c 100644
--- a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.kt.txt
+++ b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ object A {
 object B {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
index bc4951b1792..39513e1e4b9 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
@@ -1,7 +1,7 @@
 abstract enum class X : Enum<X> {
   private constructor() /* primary */ {
     super/*Enum*/<X>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -9,7 +9,7 @@ abstract enum class X : Enum<X> {
   private enum entry class B : X {
     private constructor() /* primary */ {
       super/*X*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
index 15079bfa843..222f0cb65e9 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
@@ -1,7 +1,7 @@
 open enum class MyEnum : Enum<MyEnum> {
   private constructor() /* primary */ {
     super/*Enum*/<MyEnum>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -9,7 +9,7 @@ open enum class MyEnum : Enum<MyEnum> {
   private enum entry class Z : MyEnum {
     private constructor() /* primary */ {
       super/*MyEnum*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -39,7 +39,7 @@ open enum class MyEnum : Enum<MyEnum> {
         local class <no name provided> {
           constructor() /* primary */ {
             super/*Any*/()
-                        /* InstanceInitializerCall */
+            /* <init>() */
 
           }
 
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
index 5c974d8b40f..e38d74c6bc2 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
@@ -1,7 +1,7 @@
 enum class A : Enum<A> {
   private constructor() /* primary */ {
     super/*Enum*/<A>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
index 6dfe5b398c9..c657962dbf4 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
@@ -50,7 +50,7 @@ fun <T : Number> test6(x: Any, y: T): Boolean {
 class F<T : Float> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt.txt
index d0cc3943588..7db77b47e50 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.kt.txt
@@ -1,7 +1,7 @@
 object FiveTimes {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ object FiveTimes {
 class IntCell {
   constructor(value: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/funImportedFromObject.kt.txt b/compiler/testData/ir/irText/expressions/funImportedFromObject.kt.txt
index 0c6c653fdd4..add7154f8a0 100644
--- a/compiler/testData/ir/irText/expressions/funImportedFromObject.kt.txt
+++ b/compiler/testData/ir/irText/expressions/funImportedFromObject.kt.txt
@@ -3,7 +3,7 @@ package test
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt.txt
index d636473a6b8..1fcb4d77db5 100644
--- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt.txt
+++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt.txt
@@ -6,7 +6,7 @@ fun interface Fn<T : Any?, R : Any?> {
 class J {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -21,7 +21,7 @@ val fsi: Fn<String, Int>
     local class <no name provided> : Fn<String, Int> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -40,7 +40,7 @@ val fis: Fn<Int, String>
     local class <no name provided> : Fn<Int, String> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
diff --git a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.kt.txt b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.kt.txt
index 9c9cac7e101..f3cbd3ccae7 100644
--- a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.kt.txt
@@ -12,7 +12,7 @@ inline fun <reified T : Any?> testArray(n: Int, crossinline block: Function0<T>)
 class Box<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyRef.kt.txt b/compiler/testData/ir/irText/expressions/genericPropertyRef.kt.txt
index d8fd56dbcd2..3bb8e604151 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyRef.kt.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyRef.kt.txt
@@ -1,7 +1,7 @@
 class Value<T : Any?> {
   constructor(value: T = null as T, text: String? = null) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -32,7 +32,7 @@ val <T : Any?> Value<T>.additionalValue: Int /* by */
 class DVal {
   constructor(kmember: Any) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.kt.txt
index ea241dbb39c..14dad1853e8 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.kt.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
index 04559c16e41..f6ce5798ce0 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
@@ -20,7 +20,7 @@ val <reified T : Any> Foo<T>.asT: T?
 class Bar<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
index 4325bd0132e..a69a9646d20 100644
--- a/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
+++ b/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
@@ -5,7 +5,7 @@ interface IFoo {
 class Derived1 : JFieldOwner, IFoo {
   constructor() /* primary */ {
     super/*JFieldOwner*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ class Derived1 : JFieldOwner, IFoo {
 class Derived2 : JFieldOwner, IFoo {
   constructor() /* primary */ {
     super/*JFieldOwner*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -23,7 +23,7 @@ class Derived2 : JFieldOwner, IFoo {
 open class Mid : JFieldOwner {
   constructor() /* primary */ {
     super/*JFieldOwner*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -32,7 +32,7 @@ open class Mid : JFieldOwner {
 class DerivedThroughMid1 : Mid, IFoo {
   constructor() /* primary */ {
     super/*Mid*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -41,7 +41,7 @@ class DerivedThroughMid1 : Mid, IFoo {
 class DerivedThroughMid2 : Mid, IFoo {
   constructor() /* primary */ {
     super/*Mid*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt
index 8ead844afc8..9e774c01faf 100644
--- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.kt.txt
@@ -1,7 +1,7 @@
 class Derived : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
index 8061ef43ab6..8e2768d8ae4 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
@@ -14,7 +14,7 @@ var testProp: Any
 class TestClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt16904.kt.txt b/compiler/testData/ir/irText/expressions/kt16904.kt.txt
index f4e3c7039d5..a8c8a13cc4c 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.kt.txt
@@ -1,7 +1,7 @@
 abstract class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -19,7 +19,7 @@ abstract class A {
 class B {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -31,7 +31,7 @@ class B {
 class Test1 : A {
   constructor() {
     super/*A*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
     { // BLOCK
       val tmp0_this: Test1 = <this>
@@ -48,7 +48,7 @@ class Test1 : A {
 class Test2 : J {
   constructor() /* primary */ {
     super/*J*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt16905.kt.txt b/compiler/testData/ir/irText/expressions/kt16905.kt.txt
index 64e44df3078..2ba4dedbf98 100644
--- a/compiler/testData/ir/irText/expressions/kt16905.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt16905.kt.txt
@@ -1,14 +1,14 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   open inner class Inner {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -17,7 +17,7 @@ class Outer {
   inner class InnerDerived0 : Inner {
     constructor() /* primary */ {
       <this>.super/*Inner*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -26,7 +26,7 @@ class Outer {
   inner class InnerDerived1 : Inner {
     constructor() /* primary */ {
       <this>.super/*Inner*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/kt23030.kt.txt b/compiler/testData/ir/irText/expressions/kt23030.kt.txt
index 3a5663bb02c..9ebfac5f270 100644
--- a/compiler/testData/ir/irText/expressions/kt23030.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt23030.kt.txt
@@ -29,7 +29,7 @@ fun testEqualsWithSmartCast(x: Any, y: Any): Boolean {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt28456.kt.txt b/compiler/testData/ir/irText/expressions/kt28456.kt.txt
index 647b654b1c6..c008171be0a 100644
--- a/compiler/testData/ir/irText/expressions/kt28456.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt28456a.kt.txt b/compiler/testData/ir/irText/expressions/kt28456a.kt.txt
index e36f59d42a2..373081eb9e1 100644
--- a/compiler/testData/ir/irText/expressions/kt28456a.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456a.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt28456b.kt.txt b/compiler/testData/ir/irText/expressions/kt28456b.kt.txt
index 2ff00d0d234..78ca854cb33 100644
--- a/compiler/testData/ir/irText/expressions/kt28456b.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456b.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt30020.kt.txt b/compiler/testData/ir/irText/expressions/kt30020.kt.txt
index 72a23624845..19777dc7bad 100644
--- a/compiler/testData/ir/irText/expressions/kt30020.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt30020.kt.txt
@@ -37,7 +37,7 @@ fun MutableList<Any>.testExtensionReceiver() {
 abstract class AML : MutableList<Int> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -48,7 +48,7 @@ abstract class AML : MutableList<Int> {
   inner class Inner {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/kt35730.kt.txt b/compiler/testData/ir/irText/expressions/kt35730.kt.txt
index 76ab247e155..c5f0a004967 100644
--- a/compiler/testData/ir/irText/expressions/kt35730.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt35730.kt.txt
@@ -7,7 +7,7 @@ interface Base {
 object Derived : Base {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt36956.kt.txt b/compiler/testData/ir/irText/expressions/kt36956.kt.txt
index fd7eb787089..c10a620d7f8 100644
--- a/compiler/testData/ir/irText/expressions/kt36956.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt36956.kt.txt
@@ -1,7 +1,7 @@
 class A<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt37570.kt.txt b/compiler/testData/ir/irText/expressions/kt37570.kt.txt
index 063f44f05dc..68d8602f76f 100644
--- a/compiler/testData/ir/irText/expressions/kt37570.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt37570.kt.txt
@@ -5,7 +5,7 @@ fun a(): String {
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/memberTypeArguments.kt.txt b/compiler/testData/ir/irText/expressions/memberTypeArguments.kt.txt
index 117a06696a6..6f23eac262e 100644
--- a/compiler/testData/ir/irText/expressions/memberTypeArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/memberTypeArguments.kt.txt
@@ -1,7 +1,7 @@
 class GenericClass<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.kt.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.kt.txt
index 2eacbd959f6..57b326943ef 100644
--- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.kt.txt
+++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.kt.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.kt.txt
index 67aaed18e2b..08f33b41402 100644
--- a/compiler/testData/ir/irText/expressions/multipleThisReferences.kt.txt
+++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.kt.txt
@@ -1,14 +1,14 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   open inner class Inner {
     constructor(x: Int) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -23,7 +23,7 @@ class Outer {
 class Host {
   constructor(y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -36,7 +36,7 @@ class Host {
       local class <no name provided> : Inner {
         constructor() /* primary */ {
           <this>.super/*Inner*/(x = 42)
-                    /* InstanceInitializerCall */
+          /* <init>() */
 
         }
 
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
index 4db230c91ce..e7c546f9ec5 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ object A {
 enum class En : Enum<En> {
   private constructor() /* primary */ {
     super/*Enum*/<En>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/objectClassReference.kt.txt b/compiler/testData/ir/irText/expressions/objectClassReference.kt.txt
index e6eed1deb85..ea74ca8d175 100644
--- a/compiler/testData/ir/irText/expressions/objectClassReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectClassReference.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/objectReference.kt.txt b/compiler/testData/ir/irText/expressions/objectReference.kt.txt
index 2e51824bd98..200b6e12164 100644
--- a/compiler/testData/ir/irText/expressions/objectReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectReference.kt.txt
@@ -1,7 +1,7 @@
 object Z {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -23,7 +23,7 @@ object Z {
   class Nested {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -58,7 +58,7 @@ object Z {
       local class <no name provided> {
         constructor() /* primary */ {
           super/*Any*/()
-                    /* InstanceInitializerCall */
+          /* <init>() */
 
         }
 
diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.kt.txt b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.kt.txt
index 83e01d4ace8..9672d5107b9 100644
--- a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.kt.txt
@@ -1,7 +1,7 @@
 abstract class Base {
   constructor(lambda: Function0<Any>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -17,7 +17,7 @@ object Test : Base {
       return Test
     }
 )
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.kt.txt b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.kt.txt
index 38519769ffc..a8a1607b643 100644
--- a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.kt.txt b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.kt.txt
index b9239e02aa2..09d035df815 100644
--- a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.kt.txt
@@ -1,7 +1,7 @@
 class Outer {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -11,7 +11,7 @@ class Outer {
   inner class Inner {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt.txt
index 00520217d00..529d112c01d 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt.txt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt.txt
@@ -38,7 +38,7 @@ fun testImplicitArguments(x: Long = 1.unaryMinus().toLong()) {
 class TestImplicitArguments {
   constructor(x: Long = 1.unaryMinus().toLong()) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.kt.txt b/compiler/testData/ir/irText/expressions/propertyReferences.kt.txt
index 6753cc9a772..3b9b20bd3b9 100644
--- a/compiler/testData/ir/irText/expressions/propertyReferences.kt.txt
+++ b/compiler/testData/ir/irText/expressions/propertyReferences.kt.txt
@@ -1,7 +1,7 @@
 object Delegate {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -17,7 +17,7 @@ object Delegate {
 open class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.kt.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.kt.txt
index f05330c983a..6cd23bd7fbe 100644
--- a/compiler/testData/ir/irText/expressions/reflectionLiterals.kt.txt
+++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.kt.txt
@@ -1,7 +1,7 @@
 class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt b/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
index bbf4d5c2f5d..6b3d127ee76 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
index 2e0d38619f9..59e8d49b038 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
@@ -3,7 +3,7 @@ package test
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.kt.txt b/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
index 1c691717344..e67d66ff909 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
@@ -1,7 +1,7 @@
 class Ref {
   constructor(value: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt
index dbb69d78f6c..179e9a35468 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt
@@ -5,7 +5,7 @@ fun test3(f1: Function1<String, String>, f2: Function1<Int, String>): D<@Flexibl
 class Outer<T1 : Any?> {
   constructor(j11: J<T1, T1>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -16,7 +16,7 @@ class Outer<T1 : Any?> {
   inner class Inner<T2 : Any?> {
     constructor(j12: J<T1, T2>) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt
index 6dacaaf3fd5..9bc7b6d8090 100644
--- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt
+++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.kt.txt
@@ -1,7 +1,7 @@
 class Derived : Base {
   constructor() /* primary */ {
     super/*Base*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.kt.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.kt.txt
index 3d5368d3e83..29a835a11f4 100644
--- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.kt.txt
@@ -1,7 +1,7 @@
 class Cell<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
index 512cf347e1e..fabba3bae2c 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
@@ -5,7 +5,7 @@ val n: Any?
 enum class En : Enum<En> {
   private constructor(x: String?) /* primary */ {
     super/*Enum*/<En>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
index 55002ec2aea..893046067fa 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor(x: Any?) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt.txt
index 359f6dd82ef..73718400f8e 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt.txt
@@ -1,7 +1,7 @@
 class Outer<T : Any?> {
   constructor(x: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -12,7 +12,7 @@ class Outer<T : Any?> {
   open inner class Inner {
     constructor(y: Int) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -29,7 +29,7 @@ fun Outer<Int>.test(): Inner<Int> {
     local class <no name provided> : Inner<Int> {
       constructor() /* primary */ {
         <this>.super/*Inner*/(y = 42)
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
diff --git a/compiler/testData/ir/irText/expressions/thisRefToObjectInNestedClassConstructorCall.kt.txt b/compiler/testData/ir/irText/expressions/thisRefToObjectInNestedClassConstructorCall.kt.txt
index b230231eedc..7591fb8ddf8 100644
--- a/compiler/testData/ir/irText/expressions/thisRefToObjectInNestedClassConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/thisRefToObjectInNestedClassConstructorCall.kt.txt
@@ -1,7 +1,7 @@
 open class Base {
   constructor(x: Any) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,14 +14,14 @@ open class Base {
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   class Derived1 : Base {
     constructor() /* primary */ {
       super/*Base*/(x = Host)
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -30,7 +30,7 @@ object Host {
   class Derived2 : Base {
     constructor() /* primary */ {
       super/*Base*/(x = Host)
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt.txt b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt.txt
index d8bd16379d1..cdc21d497b3 100644
--- a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt.txt
+++ b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt.txt
@@ -3,7 +3,7 @@ fun WithCompanion.test() {
     local class <no name provided> : WithCompanion {
       constructor() /* primary */ {
         super/*WithCompanion*/(a = Companion)
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -15,7 +15,7 @@ fun WithCompanion.test() {
     local class <no name provided> : WithCompanion {
       constructor() /* primary */ {
         super/*WithCompanion*/(a = Companion.foo())
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -28,14 +28,14 @@ fun WithCompanion.test() {
 open class WithCompanion {
   constructor(a: Companion) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.kt.txt b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.kt.txt
index 2e197270852..bf53ca70dd7 100644
--- a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.kt.txt
@@ -1,7 +1,7 @@
 class C {
   constructor(x: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -11,14 +11,14 @@ typealias CA = C
 object Host {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   class Nested {
     constructor(x: Int) /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.kt.txt b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.kt.txt
index 86ba0ec7ca5..b60a2348d72 100644
--- a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.kt.txt
+++ b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.kt.txt
@@ -14,7 +14,7 @@ val <reified T : Any> T.classRefExtVal: KClass<T>
 class Host {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.kt.txt b/compiler/testData/ir/irText/expressions/useImportedMember.kt.txt
index 35532431123..cfa75e89d95 100644
--- a/compiler/testData/ir/irText/expressions/useImportedMember.kt.txt
+++ b/compiler/testData/ir/irText/expressions/useImportedMember.kt.txt
@@ -12,7 +12,7 @@ interface I<G : Any?> {
 open class BaseClass {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -26,7 +26,7 @@ open class BaseClass {
 object C : BaseClass, I<String> {
   private constructor() /* primary */ {
     super/*BaseClass*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/expressions/values.kt.txt b/compiler/testData/ir/irText/expressions/values.kt.txt
index 67145c6a26c..3123fc82308 100644
--- a/compiler/testData/ir/irText/expressions/values.kt.txt
+++ b/compiler/testData/ir/irText/expressions/values.kt.txt
@@ -1,7 +1,7 @@
 enum class Enum : Enum<Enum> {
   private constructor() /* primary */ {
     super/*Enum*/<Enum>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -16,7 +16,7 @@ enum class Enum : Enum<Enum> {
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -29,14 +29,14 @@ val a: Int
 class Z {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/expressions/when.kt.txt b/compiler/testData/ir/irText/expressions/when.kt.txt
index e731e9caf78..7b15755d586 100644
--- a/compiler/testData/ir/irText/expressions/when.kt.txt
+++ b/compiler/testData/ir/irText/expressions/when.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.kt.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.kt.txt
index 5d5198585c6..b9611c2e4d0 100644
--- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.kt.txt
@@ -1,7 +1,7 @@
 class MyMap<K : Any, V : Any> : AbstractMutableMap<K, V> {
   constructor() /* primary */ {
     super/*AbstractMutableMap*/<K, V>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt b/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
index 991d64e8f53..05f10d40798 100644
--- a/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
@@ -1,7 +1,7 @@
 class ResolvedCall<C : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ class ResolvedCall<C : Any?> {
 class MyCandidate {
   constructor(resolvedCall: ResolvedCall<*>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt
index 82d9bea15dc..e623affd366 100644
--- a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt
@@ -22,7 +22,7 @@ annotation class State : Annotation {
 class Test {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/BaseFirBuilder.kt.txt b/compiler/testData/ir/irText/firProblems/BaseFirBuilder.kt.txt
index 4f244a4522c..4ef34d3ee53 100644
--- a/compiler/testData/ir/irText/firProblems/BaseFirBuilder.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/BaseFirBuilder.kt.txt
@@ -1,7 +1,7 @@
 abstract class BaseFirBuilder<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
index 73129fe08a1..4c527857596 100644
--- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
@@ -13,7 +13,7 @@ interface ComponentDescriptor {
 abstract class PlatformExtensionsClashResolver<E : PlatformSpecificExtension<E>> {
   constructor(applicableTo: Class<E>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -26,7 +26,7 @@ abstract class PlatformExtensionsClashResolver<E : PlatformSpecificExtension<E>>
 class ClashResolutionDescriptor<E : PlatformSpecificExtension<E>> {
   constructor(container: ComponentContainer, resolver: PlatformExtensionsClashResolver<E>, clashedComponents: List<ComponentDescriptor>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt
index c0afd6ad93a..822b8bc7f0d 100644
--- a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt
@@ -33,7 +33,7 @@ interface IrDeclarationParent {
 class DeepCopyIrTreeWithSymbols {
   constructor(typeRemapper: TypeRemapper) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt
index 1628eec04df..7ba2c787799 100644
--- a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt
@@ -1,7 +1,7 @@
 class Impl : A, B {
   constructor(b: B) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/FirBuilder.kt.txt b/compiler/testData/ir/irText/firProblems/FirBuilder.kt.txt
index a8dfae53657..bd90c729acd 100644
--- a/compiler/testData/ir/irText/firProblems/FirBuilder.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/FirBuilder.kt.txt
@@ -1,7 +1,7 @@
 open class BaseConverter : BaseFirBuilder<Any> {
   constructor() /* primary */ {
     super/*BaseFirBuilder*/<Any>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ open class BaseConverter : BaseFirBuilder<Any> {
 class DeclarationsConverter : BaseConverter {
   constructor() /* primary */ {
     super/*BaseConverter*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt.txt b/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt.txt
index dd2f50ea9eb..d5a94fbaf72 100644
--- a/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt.txt
@@ -3,7 +3,7 @@ fun box(): String {
     local class <no name provided> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -18,7 +18,7 @@ fun box(): String {
       local inner class Some : Base {
         constructor(s: String) /* primary */ {
           <this>.super/*Base*/(s = s)
-                    /* InstanceInitializerCall */
+          /* <init>() */
 
         }
 
@@ -31,7 +31,7 @@ fun box(): String {
       local open inner class Base {
         constructor(s: String) /* primary */ {
           super/*Any*/()
-                    /* InstanceInitializerCall */
+          /* <init>() */
 
         }
 
diff --git a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
index a15efac40c9..36fbbfbde82 100644
--- a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
@@ -1,7 +1,7 @@
 data class Some<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -54,7 +54,7 @@ interface MyList<T : Any?> : List<Some<T>> {
 open class SomeList<T : Any?> : MyList<T>, ArrayList<Some<T>> {
   constructor() /* primary */ {
     super/*ArrayList*/<@FlexibleNullability Some<T>?>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -63,7 +63,7 @@ open class SomeList<T : Any?> : MyList<T>, ArrayList<Some<T>> {
 class FinalList : SomeList<String> {
   constructor() /* primary */ {
     super/*SomeList*/<String>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt
index 77b50e068a2..f26f3f28144 100644
--- a/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt
@@ -2,7 +2,7 @@ typealias Some = Function1<Any, String?>
 object Factory {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -32,7 +32,7 @@ interface Derived : Delegate {
 data class DataClass : Derived, Delegate {
   constructor(delegate: Delegate) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/VarInInit.kt.txt b/compiler/testData/ir/irText/firProblems/VarInInit.kt.txt
index d1ac0d01a32..9b0d6d8165d 100644
--- a/compiler/testData/ir/irText/firProblems/VarInInit.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/VarInInit.kt.txt
@@ -1,7 +1,7 @@
 class Some {
   constructor(foo: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt b/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
index d67903a698c..363ca14617e 100644
--- a/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
@@ -1,7 +1,7 @@
 class Candidate {
   constructor(symbol: AbstractFirBasedSymbol<*>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -14,7 +14,7 @@ class Candidate {
 abstract class AbstractFirBasedSymbol<E> where E : FirSymbolOwner<E>, E : FirDeclaration {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/putIfAbsent.kt.txt b/compiler/testData/ir/irText/firProblems/putIfAbsent.kt.txt
index 8806823616d..bc8a01bb0d3 100644
--- a/compiler/testData/ir/irText/firProblems/putIfAbsent.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/putIfAbsent.kt.txt
@@ -1,7 +1,7 @@
 class Owner {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/v8arrayToList.kt.txt b/compiler/testData/ir/irText/firProblems/v8arrayToList.kt.txt
index c6342544da1..f2c8cc9b007 100644
--- a/compiler/testData/ir/irText/firProblems/v8arrayToList.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/v8arrayToList.kt.txt
@@ -1,7 +1,7 @@
 class V8Array {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.kt.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.kt.txt
index 4a51be9273c..1acd651229a 100644
--- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.kt.txt
+++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.kt.txt
@@ -1,7 +1,7 @@
 data class A {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
index b79e7d54da4..994146b75c1 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
@@ -1,7 +1,7 @@
 object A {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ object A {
 object B {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.kt.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.kt.txt
index 1b6f4313f15..e0f3ad2ecf3 100644
--- a/compiler/testData/ir/irText/regressions/integerCoercionToT.kt.txt
+++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.kt.txt
@@ -9,7 +9,7 @@ inline fun <reified T : CPointed> CPointed.reinterpret(): T {
 class CInt32VarX<T : Any?> : CPointed {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -26,7 +26,7 @@ var <T_INT : Int> CInt32VarX<T_INT>.value: T_INT
 class IdType : CPointed {
   constructor(value: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.kt.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.kt.txt
index 5d5f67df51b..b8442141b85 100644
--- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.kt.txt
+++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.kt.txt
@@ -1,7 +1,7 @@
 class A<Q : Any?> {
   constructor(q: Q) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/singletons/companion.kt.txt b/compiler/testData/ir/irText/singletons/companion.kt.txt
index 4b5b9297218..cfc50d1f2e1 100644
--- a/compiler/testData/ir/irText/singletons/companion.kt.txt
+++ b/compiler/testData/ir/irText/singletons/companion.kt.txt
@@ -1,7 +1,7 @@
 class Z {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -12,7 +12,7 @@ class Z {
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.kt.txt b/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
index 8aa4260c3f1..b789a60e6b7 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
@@ -1,7 +1,7 @@
 open enum class Z : Enum<Z> {
   private constructor() /* primary */ {
     super/*Enum*/<Z>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -9,7 +9,7 @@ open enum class Z : Enum<Z> {
   private enum entry class ENTRY : Z {
     private constructor() /* primary */ {
       super/*Z*/() /*~> Unit */
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
@@ -19,7 +19,7 @@ open enum class Z : Enum<Z> {
     inner class A {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
diff --git a/compiler/testData/ir/irText/singletons/object.kt.txt b/compiler/testData/ir/irText/singletons/object.kt.txt
index dd40a2ad61b..00acb4be5c1 100644
--- a/compiler/testData/ir/irText/singletons/object.kt.txt
+++ b/compiler/testData/ir/irText/singletons/object.kt.txt
@@ -1,7 +1,7 @@
 object Z {
   private constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -11,7 +11,7 @@ object Z {
   class A {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.kt.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.kt.txt
index ef2fdb8760d..fefa1a2c832 100644
--- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.kt.txt
+++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.kt.txt
@@ -1,7 +1,7 @@
 abstract class Base<T : Any?> {
   constructor(x: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.kt.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.kt.txt
index 76e949db83f..1143ff25dd0 100644
--- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.kt.txt
+++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.kt.txt
@@ -1,7 +1,7 @@
 class Derived1<T : Any?> : Base<T> {
   constructor(x: T) /* primary */ {
     super/*Base*/<T>(x = x)
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.kt.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.kt.txt
index c0929319ab2..e81bef77787 100644
--- a/compiler/testData/ir/irText/stubs/javaInnerClass.kt.txt
+++ b/compiler/testData/ir/irText/stubs/javaInnerClass.kt.txt
@@ -1,7 +1,7 @@
 class Test1 : J {
   constructor() /* primary */ {
     super/*J*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
index f77bdd8a423..bdbd716716f 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
@@ -70,7 +70,7 @@ private fun CoroutineScope.asChannel(flow: Flow<*>): ReceiveChannel<Any> {
 class SafeCollector<T : Any?> : FlowCollector<T> {
   constructor(collector: FlowCollector<T>) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -99,7 +99,7 @@ suspend inline fun <T : Any?> Flow<T>.collect(crossinline action: SuspendFunctio
 open class ChannelCoroutine<E : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.kt.txt b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.kt.txt
index 40374b472e6..9d12539159c 100644
--- a/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.kt.txt
+++ b/compiler/testData/ir/irText/types/genericDelegatedDeepProperty.kt.txt
@@ -1,7 +1,7 @@
 class Value<T : Any?, IT : IR<T>> {
   constructor(value1: T, value2: IT) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -34,7 +34,7 @@ interface IR<R : Any?> {
 class CR<R : Any?> : IR<R> {
   constructor(r: R) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -51,7 +51,7 @@ class CR<R : Any?> : IR<R> {
 class P<P1 : Any?, P2 : Any?> {
   constructor(p1: P1, p2: P2) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -70,7 +70,7 @@ val <T : Any?> Value<T, CR<T>>.additionalText: P<T, T> /* by */
     local class <no name provided> : IDelegate1<Value<Any?, CR<Any?>>, P<Any?, Any?>> {
       constructor() /* primary */ {
         super/*Any*/()
-                /* InstanceInitializerCall */
+        /* <init>() */
 
       }
 
@@ -87,7 +87,7 @@ val <T : Any?> Value<T, CR<T>>.additionalText: P<T, T> /* by */
           local class <no name provided> : IDelegate1<Value<Any?, CR<Any?>>, Any?> {
             constructor() /* primary */ {
               super/*Any*/()
-                            /* InstanceInitializerCall */
+              /* <init>() */
 
             }
 
@@ -116,7 +116,7 @@ val <T : Any?> Value<T, CR<T>>.additionalText: P<T, T> /* by */
           local class <no name provided> : IDelegate1<Value<Any?, CR<Any?>>, Any?> {
             constructor() /* primary */ {
               super/*Any*/()
-                            /* InstanceInitializerCall */
+              /* <init>() */
 
             }
 
diff --git a/compiler/testData/ir/irText/types/genericFunWithStar.kt.txt b/compiler/testData/ir/irText/types/genericFunWithStar.kt.txt
index 55c9fa2d75b..40711fc6140 100644
--- a/compiler/testData/ir/irText/types/genericFunWithStar.kt.txt
+++ b/compiler/testData/ir/irText/types/genericFunWithStar.kt.txt
@@ -17,7 +17,7 @@ interface I<G> where G : IFoo, G : IBar {
 abstract class Box<T> : IFoo, IBar where T : IFoo, T : IBar {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/genericPropertyReferenceType.kt.txt b/compiler/testData/ir/irText/types/genericPropertyReferenceType.kt.txt
index d1dc3ceac01..6a041492c78 100644
--- a/compiler/testData/ir/irText/types/genericPropertyReferenceType.kt.txt
+++ b/compiler/testData/ir/irText/types/genericPropertyReferenceType.kt.txt
@@ -1,7 +1,7 @@
 class C<T : Any?> {
   constructor(x: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/intersectionType1_NI.kt.txt b/compiler/testData/ir/irText/types/intersectionType1_NI.kt.txt
index c057dd0ddf2..00b80c7c3ab 100644
--- a/compiler/testData/ir/irText/types/intersectionType1_NI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType1_NI.kt.txt
@@ -1,7 +1,7 @@
 class In<in I : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/intersectionType1_OI.kt.txt b/compiler/testData/ir/irText/types/intersectionType1_OI.kt.txt
index 43d506d5c62..c37fb6f6ba6 100644
--- a/compiler/testData/ir/irText/types/intersectionType1_OI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType1_OI.kt.txt
@@ -1,7 +1,7 @@
 class In<in I : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt b/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
index c5e707977d1..e44bd275323 100644
--- a/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
@@ -9,7 +9,7 @@ interface Foo {
 open class B : Foo, A<B> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ open class B : Foo, A<B> {
 open class C : Foo, A<C> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt b/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
index c5e707977d1..e44bd275323 100644
--- a/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
@@ -9,7 +9,7 @@ interface Foo {
 open class B : Foo, A<B> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -18,7 +18,7 @@ open class B : Foo, A<B> {
 open class C : Foo, A<C> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/javaWildcardType.kt.txt b/compiler/testData/ir/irText/types/javaWildcardType.kt.txt
index cbc7cd71d0d..4425a5dfca8 100644
--- a/compiler/testData/ir/irText/types/javaWildcardType.kt.txt
+++ b/compiler/testData/ir/irText/types/javaWildcardType.kt.txt
@@ -9,7 +9,7 @@ interface K {
 class C : J, K {
   constructor(j: J, k: K) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt
index f966819325d..fb8cf05894b 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt
@@ -4,7 +4,7 @@ fun use(x: Any, y: Any) {
 class P {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -29,7 +29,7 @@ class P {
 class Q<T1 : Any?, T2 : Any?> {
   constructor(x: T1, y: T2) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt
index ce4f471c77a..b3b2bb27bdf 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt
@@ -77,7 +77,7 @@ interface K {
 data class P {
   constructor(x: Int, y: Int) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt
index 11d1be9d399..7b1904b8b20 100644
--- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt
@@ -4,7 +4,7 @@ fun f(s: String) {
 class MySet : Set<String> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.kt.txt b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.kt.txt
index 6cbaf6a8c40..b2d96694b51 100644
--- a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.kt.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.kt.txt
@@ -4,7 +4,7 @@ fun String.extension() {
 class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt b/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt
index 43651f519ba..22ae84768b0 100644
--- a/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt
+++ b/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt
@@ -1,7 +1,7 @@
 class GenericInv<T : Number> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -10,7 +10,7 @@ class GenericInv<T : Number> {
 class GenericIn<in T : Number> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -19,7 +19,7 @@ class GenericIn<in T : Number> {
 class GenericOut<out T : Number> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -40,7 +40,7 @@ fun testReturnsRawGenericOut(j: JRaw): @FlexibleNullability @RawType GenericOut<
 class KRaw : JRaw {
   constructor(j: JRaw) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt b/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
index c076079c977..708f55b2d71 100644
--- a/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
+++ b/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
@@ -14,7 +14,7 @@ interface J : K {
 class A : I, J {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -26,7 +26,7 @@ class A : I, J {
 class B : I, J {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
index ccb1069a61a..a0a86581088 100644
--- a/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
@@ -1,7 +1,7 @@
 open class A {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -32,7 +32,7 @@ open class A {
 class B : A {
   constructor() /* primary */ {
     super/*A*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -55,7 +55,7 @@ class B : A {
 open class GA<T : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -72,7 +72,7 @@ open class GA<T : Any?> {
 class GB<T : Any?, S : Any?> : GA<T> {
   constructor() /* primary */ {
     super/*GA*/<T>()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
diff --git a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.kt.txt b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.kt.txt
index 8ee3aaef8ba..52be2fb85c6 100644
--- a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.kt.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.kt.txt
@@ -26,7 +26,7 @@ fun <T : Any?> testNonSubstitutedTypeParameter(a: Any, b: Any) {
 class Cell<T : Any?> {
   constructor(value: T) /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
@@ -40,14 +40,14 @@ class Cell<T : Any?> {
 class Outer<T1 : Any?> {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }
 
   inner class Inner<T2 : Any?> {
     constructor() /* primary */ {
       super/*Any*/()
-            /* InstanceInitializerCall */
+      /* <init>() */
 
     }
 
diff --git a/compiler/testData/ir/irText/types/starProjection_OI.kt.txt b/compiler/testData/ir/irText/types/starProjection_OI.kt.txt
index 37cb8a60b0c..12b387c3b32 100644
--- a/compiler/testData/ir/irText/types/starProjection_OI.kt.txt
+++ b/compiler/testData/ir/irText/types/starProjection_OI.kt.txt
@@ -5,7 +5,7 @@ interface Continuation<in T : Any?> {
 abstract class C {
   constructor() /* primary */ {
     super/*Any*/()
-        /* InstanceInitializerCall */
+    /* <init>() */
 
   }