diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
index b5c00a2a7f2..0201b8054c5 100644
--- a/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin-collections.txt
@@ -136,15 +136,6 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 }
 
 public abstract interface Map<K, out V> : R|kotlin/Any| {
-    public abstract interface Entry<out K, out V> : R|kotlin/Any| {
-        public abstract val key: R|K|
-            public get(): R|K|
-
-        public abstract val value: R|V|
-            public get(): R|V|
-
-    }
-
     public abstract fun containsKey(key: R|K|): R|kotlin/Boolean|
 
     public abstract fun containsValue(value: R|V|): R|kotlin/Boolean|
@@ -167,6 +158,15 @@ public abstract interface Map<K, out V> : R|kotlin/Any| {
     public abstract val values: R|kotlin/collections/Collection<V>|
         public get(): R|kotlin/collections/Collection<V>|
 
+    public abstract interface Entry<out K, out V> : R|kotlin/Any| {
+        public abstract val key: R|K|
+            public get(): R|K|
+
+        public abstract val value: R|V|
+            public get(): R|V|
+
+    }
+
 }
 
 public abstract interface MutableCollection<E> : R|kotlin/collections/Collection<E>|, R|kotlin/collections/MutableIterable<E>| {
@@ -239,11 +239,6 @@ public abstract interface MutableListIterator<T> : R|kotlin/collections/ListIter
 }
 
 public abstract interface MutableMap<K, V> : R|kotlin/collections/Map<K, V>| {
-    public abstract interface MutableEntry<K, V> : R|kotlin/collections/Map.Entry<K, V>| {
-        public abstract fun setValue(newValue: R|V|): R|V|
-
-    }
-
     public abstract fun clear(): R|kotlin/Unit|
 
     public abstract fun put(key: R|K|, value: R|V|): R|V?|
@@ -263,6 +258,11 @@ public abstract interface MutableMap<K, V> : R|kotlin/collections/Map<K, V>| {
     public abstract val values: R|kotlin/collections/MutableCollection<V>|
         public get(): R|kotlin/collections/MutableCollection<V>|
 
+    public abstract interface MutableEntry<K, V> : R|kotlin/collections/Map.Entry<K, V>| {
+        public abstract fun setValue(newValue: R|V|): R|V|
+
+    }
+
 }
 
 public abstract interface MutableSet<E> : R|kotlin/collections/Set<E>|, R|kotlin/collections/MutableCollection<E>| {
diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin-ranges.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin-ranges.txt
index 402e948d237..80341cc1e96 100644
--- a/compiler/fir/analysis-tests/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin-ranges.txt
@@ -1,11 +1,4 @@
 public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
-
-        private constructor(): R|kotlin/ranges/CharProgression.Companion|
-
-    }
-
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
@@ -27,6 +20,13 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
+
+        private constructor(): R|kotlin/ranges/CharProgression.Companion|
+
+    }
+
 }
 
 internal final class CharProgressionIterator : R|kotlin/collections/CharIterator| {
@@ -53,14 +53,6 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 }
 
 public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges/ClosedRange<kotlin/Char>|, R|kotlin/ranges/OpenEndRange<kotlin/Char>| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final val EMPTY: R|kotlin/ranges/CharRange|
-            public get(): R|kotlin/ranges/CharRange|
-
-        private constructor(): R|kotlin/ranges/CharRange.Companion|
-
-    }
-
     public open operator fun contains(value: R|kotlin/Char|): R|kotlin/Boolean|
 
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
@@ -82,6 +74,14 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|): R|kotlin/ranges/CharRange|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final val EMPTY: R|kotlin/ranges/CharRange|
+            public get(): R|kotlin/ranges/CharRange|
+
+        private constructor(): R|kotlin/ranges/CharRange.Companion|
+
+    }
+
 }
 
 public abstract interface ClosedRange<T : R|kotlin/Comparable<T>|> : R|kotlin/Any| {
@@ -98,13 +98,6 @@ public abstract interface ClosedRange<T : R|kotlin/Comparable<T>|> : R|kotlin/An
 }
 
 public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
-
-        private constructor(): R|kotlin/ranges/IntProgression.Companion|
-
-    }
-
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
@@ -126,6 +119,13 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
+
+        private constructor(): R|kotlin/ranges/IntProgression.Companion|
+
+    }
+
 }
 
 internal final class IntProgressionIterator : R|kotlin/collections/IntIterator| {
@@ -152,14 +152,6 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 }
 
 public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/ClosedRange<kotlin/Int>|, R|kotlin/ranges/OpenEndRange<kotlin/Int>| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final val EMPTY: R|kotlin/ranges/IntRange|
-            public get(): R|kotlin/ranges/IntRange|
-
-        private constructor(): R|kotlin/ranges/IntRange.Companion|
-
-    }
-
     public open operator fun contains(value: R|kotlin/Int|): R|kotlin/Boolean|
 
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
@@ -181,16 +173,17 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|): R|kotlin/ranges/IntRange|
 
-}
-
-public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>| {
     public final companion object Companion : R|kotlin/Any| {
-        public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
+        public final val EMPTY: R|kotlin/ranges/IntRange|
+            public get(): R|kotlin/ranges/IntRange|
 
-        private constructor(): R|kotlin/ranges/LongProgression.Companion|
+        private constructor(): R|kotlin/ranges/IntRange.Companion|
 
     }
 
+}
+
+public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>| {
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
@@ -212,6 +205,13 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
+
+        private constructor(): R|kotlin/ranges/LongProgression.Companion|
+
+    }
+
 }
 
 internal final class LongProgressionIterator : R|kotlin/collections/LongIterator| {
@@ -238,14 +238,6 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 }
 
 public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges/ClosedRange<kotlin/Long>|, R|kotlin/ranges/OpenEndRange<kotlin/Long>| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final val EMPTY: R|kotlin/ranges/LongRange|
-            public get(): R|kotlin/ranges/LongRange|
-
-        private constructor(): R|kotlin/ranges/LongRange.Companion|
-
-    }
-
     public open operator fun contains(value: R|kotlin/Long|): R|kotlin/Boolean|
 
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
@@ -267,6 +259,14 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|): R|kotlin/ranges/LongRange|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final val EMPTY: R|kotlin/ranges/LongRange|
+            public get(): R|kotlin/ranges/LongRange|
+
+        private constructor(): R|kotlin/ranges/LongRange.Companion|
+
+    }
+
 }
 
 @R|kotlin/SinceKotlin|(version = String(1.7)) @R|kotlin/ExperimentalStdlibApi|() public abstract interface OpenEndRange<T : R|kotlin/Comparable<T>|> : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
index febf00e8b31..67b93def25a 100644
--- a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
+++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
@@ -43,8 +43,6 @@ public open class Any {
 }
 
 public final class Array<T> : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/Array<T>|
-
     public final operator fun get(index: R|kotlin/Int|): R|T|
 
     public final operator fun iterator(): R|kotlin/collections/Iterator<T>|
@@ -56,14 +54,11 @@ public final class Array<T> : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Seri
 
     public constructor<T>(size: R|kotlin/Int|, init: R|(kotlin/Int) -> T|): R|kotlin/Array<T>|
 
+    public final override fun clone(): R|kotlin/Array<T>|
+
 }
 
 public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>|, R|java/io/Serializable| {
-    @R|kotlin/SinceKotlin|(version = String(1.3)) public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|kotlin/Boolean.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final infix fun and(other: R|kotlin/Boolean|): R|kotlin/Boolean|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun compareTo(other: R|kotlin/Boolean|): R|kotlin/Int|
@@ -80,11 +75,14 @@ public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>|, R|java/io/Ser
 
     private constructor(): R|kotlin/Boolean|
 
+    @R|kotlin/SinceKotlin|(version = String(1.3)) public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|kotlin/Boolean.Companion|
+
+    }
+
 }
 
 public final class BooleanArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/BooleanArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Boolean|
 
     public final operator fun iterator(): R|kotlin/collections/BooleanIterator|
@@ -98,26 +96,11 @@ public final class BooleanArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/
 
     public constructor(size: R|kotlin/Int|): R|kotlin/BooleanArray|
 
+    public final override fun clone(): R|kotlin/BooleanArray|
+
 }
 
 public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Byte| = Byte(127)
-            public get(): R|kotlin/Byte|
-
-        public final const val MIN_VALUE: R|kotlin/Byte| = Byte(-128)
-            public get(): R|kotlin/Byte|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(8)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(1)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Byte.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Double|): R|kotlin/Int|
@@ -234,11 +217,26 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>|, R
 
     private constructor(): R|kotlin/Byte|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Byte| = Byte(127)
+            public get(): R|kotlin/Byte|
+
+        public final const val MIN_VALUE: R|kotlin/Byte| = Byte(-128)
+            public get(): R|kotlin/Byte|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(8)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(1)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Byte.Companion|
+
+    }
+
 }
 
 public final class ByteArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/ByteArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Byte|
 
     public final operator fun iterator(): R|kotlin/collections/ByteIterator|
@@ -252,44 +250,11 @@ public final class ByteArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Ser
 
     public constructor(size: R|kotlin/Int|): R|kotlin/ByteArray|
 
+    public final override fun clone(): R|kotlin/ByteArray|
+
 }
 
 public final class Char : R|kotlin/Comparable<kotlin/Char>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_HIGH_SURROGATE: R|kotlin/Char| = Char(56319)
-            public get(): R|kotlin/Char|
-
-        public final const val MAX_LOW_SURROGATE: R|kotlin/Char| = Char(57343)
-            public get(): R|kotlin/Char|
-
-        public final const val MAX_SURROGATE: R|kotlin/Char| = Char(57343)
-            public get(): R|kotlin/Char|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val MAX_VALUE: R|kotlin/Char| = Char(65535)
-            public get(): R|kotlin/Char|
-
-        public final const val MIN_HIGH_SURROGATE: R|kotlin/Char| = Char(55296)
-            public get(): R|kotlin/Char|
-
-        public final const val MIN_LOW_SURROGATE: R|kotlin/Char| = Char(56320)
-            public get(): R|kotlin/Char|
-
-        public final const val MIN_SURROGATE: R|kotlin/Char| = Char(55296)
-            public get(): R|kotlin/Char|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val MIN_VALUE: R|kotlin/Char| = Char(0)
-            public get(): R|kotlin/Char|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(16)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(2)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Char.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun compareTo(other: R|kotlin/Char|): R|kotlin/Int|
 
     public final operator fun dec(): R|kotlin/Char|
@@ -326,11 +291,44 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>|, R|java/io/Serializa
 
     private constructor(): R|kotlin/Char|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_HIGH_SURROGATE: R|kotlin/Char| = Char(56319)
+            public get(): R|kotlin/Char|
+
+        public final const val MAX_LOW_SURROGATE: R|kotlin/Char| = Char(57343)
+            public get(): R|kotlin/Char|
+
+        public final const val MAX_SURROGATE: R|kotlin/Char| = Char(57343)
+            public get(): R|kotlin/Char|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val MAX_VALUE: R|kotlin/Char| = Char(65535)
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_HIGH_SURROGATE: R|kotlin/Char| = Char(55296)
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_LOW_SURROGATE: R|kotlin/Char| = Char(56320)
+            public get(): R|kotlin/Char|
+
+        public final const val MIN_SURROGATE: R|kotlin/Char| = Char(55296)
+            public get(): R|kotlin/Char|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val MIN_VALUE: R|kotlin/Char| = Char(0)
+            public get(): R|kotlin/Char|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(16)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(2)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Char.Companion|
+
+    }
+
 }
 
 public final class CharArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/CharArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Char|
 
     public final operator fun iterator(): R|kotlin/collections/CharIterator|
@@ -344,6 +342,8 @@ public final class CharArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Ser
 
     public constructor(size: R|kotlin/Int|): R|kotlin/CharArray|
 
+    public final override fun clone(): R|kotlin/CharArray|
+
 }
 
 public abstract interface CharSequence : R|kotlin/Any| {
@@ -398,49 +398,23 @@ public abstract interface Comparable<in T> : R|kotlin/Any| {
 }
 
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
-    public final static fun valueOf(value: R|kotlin/String|): R|kotlin/DeprecationLevel| {
-    }
-
-    public final static fun values(): R|kotlin/Array<kotlin/DeprecationLevel>| {
-    }
-
-    public final static val entries: R|kotlin/enums/EnumEntries<kotlin/DeprecationLevel>|
-        public get(): R|kotlin/enums/EnumEntries<kotlin/DeprecationLevel>|
-
     private constructor(): R|kotlin/DeprecationLevel|
 
     public final static enum entry WARNING: R|kotlin/DeprecationLevel|
     public final static enum entry ERROR: R|kotlin/DeprecationLevel|
     public final static enum entry HIDDEN: R|kotlin/DeprecationLevel|
+    public final static fun values(): R|kotlin/Array<kotlin/DeprecationLevel>| {
+    }
+
+    public final static fun valueOf(value: R|kotlin/String|): R|kotlin/DeprecationLevel| {
+    }
+
+    public final static val entries: R|kotlin/enums/EnumEntries<kotlin/DeprecationLevel>|
+        public get(): R|kotlin/enums/EnumEntries<kotlin/DeprecationLevel>|
+
 }
 
 public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Double| = Double(1.7976931348623157E308)
-            public get(): R|kotlin/Double|
-
-        public final const val MIN_VALUE: R|kotlin/Double| = Double(4.9E-324)
-            public get(): R|kotlin/Double|
-
-        public final const val NEGATIVE_INFINITY: R|kotlin/Double| = Double(-Infinity)
-            public get(): R|kotlin/Double|
-
-        public final const val NaN: R|kotlin/Double| = Double(NaN)
-            public get(): R|kotlin/Double|
-
-        public final const val POSITIVE_INFINITY: R|kotlin/Double| = Double(Infinity)
-            public get(): R|kotlin/Double|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| = Int(64)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(8)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Double.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun compareTo(other: R|kotlin/Double|): R|kotlin/Int|
@@ -541,11 +515,35 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
 
     private constructor(): R|kotlin/Double|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Double| = Double(1.7976931348623157E308)
+            public get(): R|kotlin/Double|
+
+        public final const val MIN_VALUE: R|kotlin/Double| = Double(4.9E-324)
+            public get(): R|kotlin/Double|
+
+        public final const val NEGATIVE_INFINITY: R|kotlin/Double| = Double(-Infinity)
+            public get(): R|kotlin/Double|
+
+        public final const val NaN: R|kotlin/Double| = Double(NaN)
+            public get(): R|kotlin/Double|
+
+        public final const val POSITIVE_INFINITY: R|kotlin/Double| = Double(Infinity)
+            public get(): R|kotlin/Double|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| = Int(64)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(8)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Double.Companion|
+
+    }
+
 }
 
 public final class DoubleArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/DoubleArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Double|
 
     public final operator fun iterator(): R|kotlin/collections/DoubleIterator|
@@ -559,6 +557,8 @@ public final class DoubleArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/S
 
     public constructor(size: R|kotlin/Int|): R|kotlin/DoubleArray|
 
+    public final override fun clone(): R|kotlin/DoubleArray|
+
 }
 
 @R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.ANNOTATION_CLASS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/annotation/MustBeDocumented|() @R|kotlin/SinceKotlin|(version = String(1.1)) public final annotation class DslMarker : R|kotlin/Annotation| {
@@ -567,11 +567,6 @@ public final class DoubleArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/S
 }
 
 public abstract class Enum<E : R|kotlin/Enum<E>|> : R|kotlin/Comparable<E>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|kotlin/Enum.Companion|
-
-    }
-
     protected final fun clone(): R|kotlin/Any|
 
     public final operator fun compareTo(other: R|E|): R|kotlin/Int|
@@ -590,6 +585,11 @@ public abstract class Enum<E : R|kotlin/Enum<E>|> : R|kotlin/Comparable<E>|, R|j
 
     public constructor<E : R|kotlin/Enum<E>|>(name: R|kotlin/String| = STUB, ordinal: R|kotlin/Int| = STUB): R|kotlin/Enum<E>|
 
+    public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|kotlin/Enum.Companion|
+
+    }
+
 }
 
 @R|kotlin/RequiresOptIn|(level = R|kotlin/RequiresOptIn.Level.ERROR|) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|, R|kotlin/annotation/AnnotationTarget.ANNOTATION_CLASS|, R|kotlin/annotation/AnnotationTarget.PROPERTY|, R|kotlin/annotation/AnnotationTarget.FIELD|, R|kotlin/annotation/AnnotationTarget.LOCAL_VARIABLE|, R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|, R|kotlin/annotation/AnnotationTarget.FUNCTION|, R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, R|kotlin/annotation/AnnotationTarget.TYPEALIAS|)) @R|kotlin/annotation/MustBeDocumented|() @R|kotlin/SinceKotlin|(version = String(1.3)) public final annotation class ExperimentalStdlibApi : R|kotlin/Annotation| {
@@ -608,32 +608,6 @@ public abstract class Enum<E : R|kotlin/Enum<E>|> : R|kotlin/Comparable<E>|, R|j
 }
 
 public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Float| = Float(3.4028235E38)
-            public get(): R|kotlin/Float|
-
-        public final const val MIN_VALUE: R|kotlin/Float| = Float(1.4E-45)
-            public get(): R|kotlin/Float|
-
-        public final const val NEGATIVE_INFINITY: R|kotlin/Float| = Float(-Infinity)
-            public get(): R|kotlin/Float|
-
-        public final const val NaN: R|kotlin/Float| = Float(NaN)
-            public get(): R|kotlin/Float|
-
-        public final const val POSITIVE_INFINITY: R|kotlin/Float| = Float(Infinity)
-            public get(): R|kotlin/Float|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| = Int(32)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(4)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Float.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Double|): R|kotlin/Int|
@@ -734,11 +708,35 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|,
 
     private constructor(): R|kotlin/Float|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Float| = Float(3.4028235E38)
+            public get(): R|kotlin/Float|
+
+        public final const val MIN_VALUE: R|kotlin/Float| = Float(1.4E-45)
+            public get(): R|kotlin/Float|
+
+        public final const val NEGATIVE_INFINITY: R|kotlin/Float| = Float(-Infinity)
+            public get(): R|kotlin/Float|
+
+        public final const val NaN: R|kotlin/Float| = Float(NaN)
+            public get(): R|kotlin/Float|
+
+        public final const val POSITIVE_INFINITY: R|kotlin/Float| = Float(Infinity)
+            public get(): R|kotlin/Float|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| = Int(32)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(4)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Float.Companion|
+
+    }
+
 }
 
 public final class FloatArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/FloatArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Float|
 
     public final operator fun iterator(): R|kotlin/collections/FloatIterator|
@@ -752,29 +750,14 @@ public final class FloatArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Se
 
     public constructor(size: R|kotlin/Int|): R|kotlin/FloatArray|
 
+    public final override fun clone(): R|kotlin/FloatArray|
+
 }
 
 public abstract interface Function<out R> : R|kotlin/Any| {
 }
 
 public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Int| = Int(2147483647)
-            public get(): R|kotlin/Int|
-
-        public final const val MIN_VALUE: R|kotlin/Int| = Int(-2147483648)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(32)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(4)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Int.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final infix fun and(other: R|kotlin/Int|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
@@ -905,11 +888,26 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>|, R|j
 
     private constructor(): R|kotlin/Int|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Int| = Int(2147483647)
+            public get(): R|kotlin/Int|
+
+        public final const val MIN_VALUE: R|kotlin/Int| = Int(-2147483648)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(32)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(4)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Int.Companion|
+
+    }
+
 }
 
 public final class IntArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/IntArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Int|
 
     public final operator fun iterator(): R|kotlin/collections/IntIterator|
@@ -923,26 +921,11 @@ public final class IntArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Seri
 
     public constructor(size: R|kotlin/Int|): R|kotlin/IntArray|
 
+    public final override fun clone(): R|kotlin/IntArray|
+
 }
 
 public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Long| = Long(9223372036854775807)
-            public get(): R|kotlin/Long|
-
-        public final const val MIN_VALUE: R|kotlin/Long| = Long(-9223372036854775808)
-            public get(): R|kotlin/Long|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(64)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(8)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Long.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final infix fun and(other: R|kotlin/Long|): R|kotlin/Long|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
@@ -1073,11 +1056,26 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>|, R
 
     private constructor(): R|kotlin/Long|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Long| = Long(9223372036854775807)
+            public get(): R|kotlin/Long|
+
+        public final const val MIN_VALUE: R|kotlin/Long| = Long(-9223372036854775808)
+            public get(): R|kotlin/Long|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(64)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(8)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Long.Companion|
+
+    }
+
 }
 
 public final class LongArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/LongArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Long|
 
     public final operator fun iterator(): R|kotlin/collections/LongIterator|
@@ -1091,6 +1089,8 @@ public final class LongArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Ser
 
     public constructor(size: R|kotlin/Int|): R|kotlin/LongArray|
 
+    public final override fun clone(): R|kotlin/LongArray|
+
 }
 
 public final class Nothing {
@@ -1152,22 +1152,6 @@ See https://youtrack.jetbrains.com/issue/KT-46465 for details about the migratio
 }
 
 @R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.ANNOTATION_CLASS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/SinceKotlin|(version = String(1.3)) public final annotation class RequiresOptIn : R|kotlin/Annotation| {
-    public final enum class Level : R|kotlin/Enum<kotlin/RequiresOptIn.Level>| {
-        public final static fun valueOf(value: R|kotlin/String|): R|kotlin/RequiresOptIn.Level| {
-        }
-
-        public final static fun values(): R|kotlin/Array<kotlin/RequiresOptIn.Level>| {
-        }
-
-        public final static val entries: R|kotlin/enums/EnumEntries<kotlin/RequiresOptIn.Level>|
-            public get(): R|kotlin/enums/EnumEntries<kotlin/RequiresOptIn.Level>|
-
-        private constructor(): R|kotlin/RequiresOptIn.Level|
-
-        public final static enum entry WARNING: R|kotlin/RequiresOptIn.Level|
-        public final static enum entry ERROR: R|kotlin/RequiresOptIn.Level|
-    }
-
     public final val level: R|kotlin/RequiresOptIn.Level|
         public get(): R|kotlin/RequiresOptIn.Level|
 
@@ -1176,26 +1160,25 @@ See https://youtrack.jetbrains.com/issue/KT-46465 for details about the migratio
 
     public constructor(message: R|kotlin/String| = STUB, level: R|kotlin/RequiresOptIn.Level| = STUB): R|kotlin/RequiresOptIn|
 
-}
+    public final enum class Level : R|kotlin/Enum<kotlin/RequiresOptIn.Level>| {
+        private constructor(): R|kotlin/RequiresOptIn.Level|
 
-public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final const val MAX_VALUE: R|kotlin/Short| = Short(32767)
-            public get(): R|kotlin/Short|
+        public final static enum entry WARNING: R|kotlin/RequiresOptIn.Level|
+        public final static enum entry ERROR: R|kotlin/RequiresOptIn.Level|
+        public final static fun values(): R|kotlin/Array<kotlin/RequiresOptIn.Level>| {
+        }
 
-        public final const val MIN_VALUE: R|kotlin/Short| = Short(-32768)
-            public get(): R|kotlin/Short|
+        public final static fun valueOf(value: R|kotlin/String|): R|kotlin/RequiresOptIn.Level| {
+        }
 
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(16)
-            public get(): R|kotlin/Int|
-
-        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(2)
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|kotlin/Short.Companion|
+        public final static val entries: R|kotlin/enums/EnumEntries<kotlin/RequiresOptIn.Level>|
+            public get(): R|kotlin/enums/EnumEntries<kotlin/RequiresOptIn.Level>|
 
     }
 
+}
+
+public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|, R|java/io/Serializable| {
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Byte|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public final operator fun compareTo(other: R|kotlin/Double|): R|kotlin/Int|
@@ -1312,11 +1295,26 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|,
 
     private constructor(): R|kotlin/Short|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final const val MAX_VALUE: R|kotlin/Short| = Short(32767)
+            public get(): R|kotlin/Short|
+
+        public final const val MIN_VALUE: R|kotlin/Short| = Short(-32768)
+            public get(): R|kotlin/Short|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BITS: R|kotlin/Int| = Int(16)
+            public get(): R|kotlin/Int|
+
+        @PROPERTY:R|kotlin/SinceKotlin|(version = String(1.3)) public final const val SIZE_BYTES: R|kotlin/Int| = Int(2)
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|kotlin/Short.Companion|
+
+    }
+
 }
 
 public final class ShortArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Serializable| {
-    public final override fun clone(): R|kotlin/ShortArray|
-
     public final operator fun get(index: R|kotlin/Int|): R|kotlin/Short|
 
     public final operator fun iterator(): R|kotlin/collections/ShortIterator|
@@ -1330,6 +1328,8 @@ public final class ShortArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Se
 
     public constructor(size: R|kotlin/Int|): R|kotlin/ShortArray|
 
+    public final override fun clone(): R|kotlin/ShortArray|
+
 }
 
 @R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|, R|kotlin/annotation/AnnotationTarget.PROPERTY|, R|kotlin/annotation/AnnotationTarget.FIELD|, R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|, R|kotlin/annotation/AnnotationTarget.FUNCTION|, R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, R|kotlin/annotation/AnnotationTarget.TYPEALIAS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/annotation/MustBeDocumented|() public final annotation class SinceKotlin : R|kotlin/Annotation| {
@@ -1341,11 +1341,6 @@ public final class ShortArray : R|kotlin/Any|, R|kotlin/Cloneable|, R|java/io/Se
 }
 
 public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSequence|, R|java/io/Serializable| {
-    public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|kotlin/String.Companion|
-
-    }
-
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun compareTo(other: R|kotlin/String|): R|kotlin/Int|
 
     @R|kotlin/internal/IntrinsicConstEvaluation|() public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
@@ -1363,6 +1358,11 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public constructor(): R|kotlin/String|
 
+    public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|kotlin/String.Companion|
+
+    }
+
 }
 
 @R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/SinceKotlin|(version = String(1.8)) @R|kotlin/ExperimentalSubclassOptIn|() public final annotation class SubclassOptInRequired : R|kotlin/Annotation| {
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index 14592bb57bd..a0dd4ad5736 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -4,6 +4,8 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     public final companion object Companion : R|kotlin/Any| {
         @FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -13,6 +15,4 @@ public final class Class : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Class|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
index dcfdffe0060..d9d25b8c42c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
@@ -4,16 +4,16 @@ public final annotation class Ann : R|kotlin/Annotation| {
 }
 
 public sealed class Sealed : R|kotlin/Any| {
-    public final class Derived : R|test/Sealed| {
-        @R|test/Ann|() public constructor(z: R|test/Z|): R|test/Sealed.Derived|
-
-    }
-
     public final val z: R|test/Z|
         public get(): R|test/Z|
 
     @R|test/Ann|() protected constructor(@R|test/Ann|() z: R|test/Z|): R|test/Sealed|
 
+    public final class Derived : R|test/Sealed| {
+        @R|test/Ann|() public constructor(z: R|test/Z|): R|test/Sealed.Derived|
+
+    }
+
 }
 
 public final class Test : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
index 74bb7d6b2d3..c58db154c75 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
@@ -1,29 +1,30 @@
 public final class A : R|kotlin/Any| {
+    public constructor(): R|test/A|
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|test/A.Companion|
+
         public final annotation class Anno1 : R|kotlin/Annotation| {
             public constructor(): R|test/A.Companion.Anno1|
 
         }
 
         public final class B : R|kotlin/Any| {
+            public constructor(): R|test/A.Companion.B|
+
             public final annotation class Anno2 : R|kotlin/Annotation| {
                 public constructor(): R|test/A.Companion.B.Anno2|
 
             }
 
-            public constructor(): R|test/A.Companion.B|
-
         }
 
-        private constructor(): R|test/A.Companion|
-
     }
 
-    public constructor(): R|test/A|
-
 }
 
 @R|test/A.Companion.Anno1|() @R|test/A.Companion.B.Anno2|() public final class C : R|kotlin/Any| {
     public constructor(): R|test/C|
 
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
index 963961bc27e..0fc9ae3a0bb 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
@@ -4,16 +4,17 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|test/Class.Companion|
+
         @R|test/Anno|() public final class Nested : R|kotlin/Any| {
             public constructor(): R|test/Class.Companion.Nested|
 
         }
 
-        private constructor(): R|test/Class.Companion|
-
     }
 
-    public constructor(): R|test/Class|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
index 1dc34da9fbf..a0c3ff6882b 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
@@ -4,11 +4,11 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     @R|test/Anno|() public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
     }
 
-    public constructor(): R|test/Class|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
index 450ab24061b..4076b7159d2 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
@@ -1,5 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public constructor(): R|test/A|
+
     public final class B : R|kotlin/Any| {
+        public constructor(): R|test/A.B|
+
         public final companion object Companion : R|kotlin/Any| {
             public final val TEST: R|kotlin/Int|
                 public get(): R|kotlin/Int|
@@ -8,10 +12,6 @@ public final class A : R|kotlin/Any| {
 
         }
 
-        public constructor(): R|test/A.B|
-
     }
 
-    public constructor(): R|test/A|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
index af93ef98725..98a49efed39 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
@@ -1,4 +1,6 @@
 @R|kotlin/Deprecated|(message = String(Class)) public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     @R|kotlin/Deprecated|(message = String(companion object)) public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
@@ -14,6 +16,5 @@
 
     }
 
-    public constructor(): R|test/Class|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
index 36c2b498394..24cf2e86904 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
@@ -7,6 +7,8 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 @R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|) public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     @R|test/Anno|(t = R|java/lang/annotation/ElementType.ANNOTATION_TYPE|) public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
@@ -22,6 +24,4 @@ public final annotation class Anno : R|kotlin/Annotation| {
 
     }
 
-    public constructor(): R|test/Class|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
index ca16ede52d0..974d3c9679d 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
+    public constructor(): R|test/A|
+
     public final annotation class Anno : R|kotlin/Annotation| {
         public constructor(): R|test/A.Anno|
 
     }
 
-    public constructor(): R|test/A|
-
 }
 
 @R|test/A.Anno|() public final class B : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
index 2f8c13c8e7c..4c98760c3a9 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
@@ -4,6 +4,8 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     @R|test/Anno|() public final inner class Inner : R|kotlin/Any| {
         public test/Class.constructor(): R|test/Class.Inner|
 
@@ -14,6 +16,5 @@ public final class Class : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Class|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
index 65a64b36267..69c2ac152ea 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
@@ -7,6 +7,8 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final inner class Inner : R|kotlin/Any| {
         public final val y: R|kotlin/String|
             public get(): R|kotlin/String|
@@ -23,6 +25,5 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index 741948df6ea..35ecbdd281e 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -4,6 +4,8 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     public final companion object Companion : R|kotlin/Any| {
         @PROPERTY:R|test/Anno|() public final val property: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -12,6 +14,4 @@ public final class Class : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Class|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index 0cab4028728..ed8ef7d4b6c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -4,12 +4,12 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(): R|test/Class|
+
     public abstract interface Trait : R|kotlin/Any| {
         @PROPERTY:R|test/Anno|() public abstract val property: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
     }
 
-    public constructor(): R|test/Class|
-
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
index 96efc5c8733..1ff14df58e5 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
@@ -25,13 +25,13 @@ public final class Generic<T> : R|kotlin/Any| {
 }
 
 public final class InnerGeneric<A, B> : R|kotlin/Any| {
+    public constructor<A, B>(): R|test/InnerGeneric<A, B>|
+
     public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
         public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
 
     }
 
-    public constructor<A, B>(): R|test/InnerGeneric<A, B>|
-
 }
 
 public final class Simple : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt
index 86233c6ee20..cf25a91f8ef 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt
@@ -1,9 +1,10 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final inner class Inner : R|kotlin/Any| {
         public test/Outer.constructor(): R|test/Outer.Inner|
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
index 6eedd575db5..cd2200b3caa 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
@@ -1,4 +1,9 @@
 public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any| {
+    public final val some: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public constructor<test>(): R|test/ConstructorTypeParamClassObjectConflict<test>|
+
     public final companion object Companion : R|kotlin/Any| {
         public final val test: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -7,38 +12,25 @@ public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any|
 
     }
 
-    public final val some: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    public constructor<test>(): R|test/ConstructorTypeParamClassObjectConflict<test>|
-
 }
 
 public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/Any| {
-    public final companion object Companion : R|kotlin/Any| {
-        public abstract interface test : R|kotlin/Any| {
-        }
-
-        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
-
-    }
-
     public final val some: R|test?|
         public get(): R|test?|
 
     public constructor<test>(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
-}
-
-public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
-        public final val bla: R|kotlin/Int|
-            public get(): R|kotlin/Int|
+        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
 
-        private constructor(): R|test/TestClassObjectAndClassConflict.Companion|
+        public abstract interface test : R|kotlin/Any| {
+        }
 
     }
 
+}
+
+public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
     public final val bla: R|kotlin/String|
         public get(): R|kotlin/String|
 
@@ -47,9 +39,22 @@ public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
 
     public constructor(): R|test/TestClassObjectAndClassConflict|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final val bla: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|test/TestClassObjectAndClassConflict.Companion|
+
+    }
+
 }
 
 public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
+    public final val some: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
+
     public final companion object Companion : R|kotlin/Any| {
         public final val test: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -58,22 +63,9 @@ public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
 
     }
 
-    public final val some: R|kotlin/String|
-        public get(): R|kotlin/String|
-
-    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
-
 }
 
 public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
-    public final companion object Companion : R|kotlin/Any| {
-        public final val test: R|kotlin/Int|
-            public get(): R|kotlin/Int|
-
-        private constructor(): R|test/TestConstructorValClassObjectConflict.Companion|
-
-    }
-
     public final val some: R|kotlin/String|
         public get(): R|kotlin/String|
 
@@ -82,5 +74,13 @@ public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
 
     public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
 
+    public final companion object Companion : R|kotlin/Any| {
+        public final val test: R|kotlin/Int|
+            public get(): R|kotlin/Int|
+
+        private constructor(): R|test/TestConstructorValClassObjectConflict.Companion|
+
+    }
+
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
index ef9de71991e..eb27c4b4ccc 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
@@ -1,4 +1,6 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public open inner class Inner1 : R|kotlin/Any| {
         public test/Outer.constructor(): R|test/Outer.Inner1|
 
@@ -9,6 +11,5 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt
index 1d5ad4ad359..623ada3bf21 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt
@@ -1,9 +1,10 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final inner class Inner<T> : R|kotlin/Any| {
         public test/Outer.constructor<T>(): R|test/Outer.Inner<T>|
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt
index 9bdf3f53308..1e33bec1f26 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt
@@ -1,5 +1,11 @@
 public final class Outer<E, F> : R|kotlin/Any| {
+    public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
+
+    public constructor<E, F>(): R|test/Outer<E, F>|
+
     public final inner class Inner<G, H, E, F> : R|kotlin/Any| {
+        public test/Outer<E, F>.constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
+
         public final inner class Inner3<I, G, H, E, F> : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
@@ -7,8 +13,6 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
         }
 
-        public test/Outer<E, F>.constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
-
     }
 
     public final inner class Inner2<E, F> : R|kotlin/Any| {
@@ -16,9 +20,5 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
     }
 
-    public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
-
-    public constructor<E, F>(): R|test/Outer<E, F>|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
index 1391af6fe65..a144422b7cd 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
@@ -1,4 +1,6 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
@@ -9,6 +11,5 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
index 866e7ee19c6..8822f0e033c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
@@ -1,5 +1,9 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|test/Outer.Companion|
+
         public final object Obj : R|kotlin/Any| {
             public final fun f(): R|kotlin/String|
 
@@ -10,10 +14,7 @@ public final class Outer : R|kotlin/Any| {
 
         }
 
-        private constructor(): R|test/Outer.Companion|
-
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
index 7cd21b5aabe..634bc6d68a4 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
@@ -1,4 +1,6 @@
 public final object Outer : R|kotlin/Any| {
+    private constructor(): R|test/Outer|
+
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
@@ -9,6 +11,5 @@ public final object Outer : R|kotlin/Any| {
 
     }
 
-    private constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt
index a5c82a6ed62..3aa7fdd7c8f 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt
@@ -1,9 +1,10 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final class Nested : R|kotlin/Any| {
         public constructor(): R|test/Outer.Nested|
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
index 4c0eee8c2ca..9512f831259 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
@@ -1,4 +1,6 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public open class Nested1 : R|kotlin/Any| {
         public constructor(): R|test/Outer.Nested1|
 
@@ -9,6 +11,5 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt
index 3733a9a7742..2ec4e40ef5b 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt
@@ -1,9 +1,10 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final class Nested<T> : R|kotlin/Any| {
         public constructor<T>(): R|test/Outer.Nested<T>|
 
     }
 
-    public constructor(): R|test/Outer|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt
index 5a4cc58b80e..ab282ddc5db 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt
@@ -9,12 +9,12 @@ public final class Inheritor3 : R|test/SealedClass| {
 }
 
 public sealed class SealedClass : R|kotlin/Any| {
+    protected constructor(): R|test/SealedClass|
+
     public final class Inheritor1 : R|test/SealedClass| {
         public constructor(): R|test/SealedClass.Inheritor1|
 
     }
 
-    protected constructor(): R|test/SealedClass|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
index 8b83ca12d8f..13a483b644c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -1,4 +1,6 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectDeclaresProperty|
+
     public final companion object Companion : R|kotlin/Any| {
         public final val i: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -7,6 +9,5 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/ClassObjectDeclaresProperty|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
index 63df20f15e7..4a027a6aa43 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -1,4 +1,6 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectDeclaresProperty|
+
     public final companion object Companion : R|kotlin/Any| {
         public final var s: R|kotlin/String|
             public get(): R|kotlin/String|
@@ -8,6 +10,5 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/ClassObjectDeclaresProperty|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
index 0b903601e36..9d76f2f6abd 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
@@ -1,75 +1,75 @@
 public final class Int : R|kotlin/Any| {
+    public constructor(): R|test/Int|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Int.Companion|
 
     }
 
-    public constructor(): R|test/Int|
-
 }
 
 public final class Outer : R|kotlin/Any| {
+    public constructor(): R|test/Outer|
+
     public final class Int : R|kotlin/Any| {
+        public constructor(): R|test/Outer.Int|
+
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Int.Companion|
 
         }
 
-        public constructor(): R|test/Outer.Int|
-
     }
 
     private final class Pri : R|kotlin/Any| {
+        public constructor(): R|test/Outer.Pri|
+
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pri.Companion|
 
         }
 
-        public constructor(): R|test/Outer.Pri|
-
     }
 
     protected final class Pro : R|kotlin/Any| {
+        public constructor(): R|test/Outer.Pro|
+
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pro.Companion|
 
         }
 
-        public constructor(): R|test/Outer.Pro|
-
     }
 
     public final class Pub : R|kotlin/Any| {
+        public constructor(): R|test/Outer.Pub|
+
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pub.Companion|
 
         }
 
-        public constructor(): R|test/Outer.Pub|
-
     }
 
-    public constructor(): R|test/Outer|
-
 }
 
 private final class Pri : R|kotlin/Any| {
+    public constructor(): R|test/Pri|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Pri.Companion|
 
     }
 
-    public constructor(): R|test/Pri|
-
 }
 
 public final class Pub : R|kotlin/Any| {
+    public constructor(): R|test/Pub|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Pub.Companion|
 
     }
 
-    public constructor(): R|test/Pub|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
index 0c38facfbc3..4aba96aef5d 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
@@ -1,90 +1,90 @@
 internal final class IntInt : R|kotlin/Any| {
+    public constructor(): R|test/IntInt|
+
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntInt.Companion|
 
     }
 
-    public constructor(): R|test/IntInt|
-
 }
 
 internal final class IntPri : R|kotlin/Any| {
+    public constructor(): R|test/IntPri|
+
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntPri.Companion|
 
     }
 
-    public constructor(): R|test/IntPri|
-
 }
 
 internal final class IntPub : R|kotlin/Any| {
+    public constructor(): R|test/IntPub|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntPub.Companion|
 
     }
 
-    public constructor(): R|test/IntPub|
-
 }
 
 private final class PriInt : R|kotlin/Any| {
+    public constructor(): R|test/PriInt|
+
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriInt.Companion|
 
     }
 
-    public constructor(): R|test/PriInt|
-
 }
 
 private final class PriPri : R|kotlin/Any| {
+    public constructor(): R|test/PriPri|
+
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriPri.Companion|
 
     }
 
-    public constructor(): R|test/PriPri|
-
 }
 
 private final class PriPub : R|kotlin/Any| {
+    public constructor(): R|test/PriPub|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriPub.Companion|
 
     }
 
-    public constructor(): R|test/PriPub|
-
 }
 
 public final class PubInt : R|kotlin/Any| {
+    public constructor(): R|test/PubInt|
+
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubInt.Companion|
 
     }
 
-    public constructor(): R|test/PubInt|
-
 }
 
 public final class PubPri : R|kotlin/Any| {
+    public constructor(): R|test/PubPri|
+
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubPri.Companion|
 
     }
 
-    public constructor(): R|test/PubPri|
-
 }
 
 public final class PubPub : R|kotlin/Any| {
+    public constructor(): R|test/PubPub|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubPub.Companion|
 
     }
 
-    public constructor(): R|test/PubPub|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
index 26f008a383c..548e67fb83c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
@@ -2,11 +2,12 @@ public abstract interface Bbb : R|kotlin/Any| {
 }
 
 public final class ClassObjectextendsTrait : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectextendsTrait|
+
     public final companion object Companion : R|test/Bbb| {
         private constructor(): R|test/ClassObjectextendsTrait.Companion|
 
     }
 
-    public constructor(): R|test/ClassObjectextendsTrait|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
index a8812f27dbd..5875f999c2f 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -2,11 +2,12 @@ public abstract interface Bbb<P> : R|kotlin/Any| {
 }
 
 public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectExtendsTraitWithTP|
+
     public final companion object Companion : R|test/Bbb<kotlin/String>| {
         private constructor(): R|test/ClassObjectExtendsTraitWithTP.Companion|
 
     }
 
-    public constructor(): R|test/ClassObjectExtendsTraitWithTP|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
index 106a24a88d3..289d6ed1a6f 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
@@ -1,4 +1,6 @@
 public final class Test : R|kotlin/Any| {
+    public constructor(): R|test/Test|
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
@@ -31,6 +33,5 @@ public final class Test : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/Test|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
index 64314d642fc..34060e31c1e 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
@@ -1,4 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public final val other: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public constructor(): R|test/A|
+
     public final companion object Companion : R|kotlin/Any| {
         public final val some: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -7,9 +12,5 @@ public final class A : R|kotlin/Any| {
 
     }
 
-    public final val other: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    public constructor(): R|test/A|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt
index d2dd830e2ee..769c0994adf 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt
@@ -1,4 +1,8 @@
 public final class A : R|test/T| {
+    public open fun foo(): R|kotlin/Int|
+
+    public constructor(): R|test/A|
+
     public final companion object Companion : R|test/T| {
         public open fun foo(): R|kotlin/Int|
 
@@ -6,13 +10,10 @@ public final class A : R|test/T| {
 
     }
 
-    public open fun foo(): R|kotlin/Int|
-
-    public constructor(): R|test/A|
-
 }
 
 public abstract interface T : R|kotlin/Any| {
     public abstract fun foo(): R|kotlin/Int|
 
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
index 8fdf9deca0c..0781735887f 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
@@ -1,4 +1,6 @@
 public final class TestFirst : R|kotlin/Any| {
+    public constructor(): R|test/TestFirst|
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun testing(a: R|test/TestFirst.InnerClass|): R|kotlin/Int|
 
@@ -18,6 +20,5 @@ public final class TestFirst : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/TestFirst|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
index 219ad1fa909..48ea97fa7b5 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
@@ -1,4 +1,6 @@
 public final class NamedClassObject : R|kotlin/Any| {
+    public constructor(): R|test/NamedClassObject|
+
     public final companion object Named : R|kotlin/Any| {
         public final fun f(): R|kotlin/Int|
 
@@ -6,6 +8,5 @@ public final class NamedClassObject : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/NamedClassObject|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
index 7025cf38869..1a519ba2ed5 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
@@ -1,9 +1,10 @@
 public final class SimpleClassObject : R|kotlin/Any| {
+    public constructor(): R|test/SimpleClassObject|
+
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/SimpleClassObject.Companion|
 
     }
 
-    public constructor(): R|test/SimpleClassObject|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
index d1506b0ad35..10de6ddbfb8 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
@@ -1,9 +1,10 @@
 public final class A : R|kotlin/Any| {
+    public constructor(): R|test/A|
+
     public final class TestConstructor : R|kotlin/Any| {
         public constructor(p: R|kotlin/Int| = STUB): R|test/A.TestConstructor|
 
     }
 
-    public constructor(): R|test/A|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
index 517c12a2ec6..7a2d5c4a02c 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
@@ -1,14 +1,15 @@
 public final class Some : R|kotlin/Any| {
+    public constructor(): R|test/Some|
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor(): R|test/Some.Companion|
+
         public final annotation class TestAnnotation : R|kotlin/Annotation| {
             public constructor(): R|test/Some.Companion.TestAnnotation|
 
         }
 
-        private constructor(): R|test/Some.Companion|
-
     }
 
-    public constructor(): R|test/Some|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
index 0ad2ea99a0c..599b26e2dc5 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
@@ -1,4 +1,6 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
+    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
+
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
     }
 
@@ -16,6 +18,5 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
index d0425ffd110..709d1f14bc2 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -1,4 +1,6 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
+    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
+
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String, kotlin/CharSequence>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence, kotlin/String>| {
     }
 
@@ -16,6 +18,5 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
index 371283c640a..1f6b2ed4945 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
@@ -1,9 +1,10 @@
 public open class InnerClass : R|kotlin/Any| {
+    public constructor(): R|test/InnerClass|
+
     public open inner class Inner : R|kotlin/Any| {
         public test/InnerClass.constructor(): R|test/InnerClass.Inner|
 
     }
 
-    public constructor(): R|test/InnerClass|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
index 481dad0a3d5..aff009dd443 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
@@ -1,9 +1,10 @@
 public open class NestedClass : R|kotlin/Any| {
+    public constructor(): R|test/NestedClass|
+
     public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/NestedClass.Nested|
 
     }
 
-    public constructor(): R|test/NestedClass|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
index fb5a174a038..4dafba34a63 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
@@ -1,4 +1,6 @@
 public final class A : R|kotlin/Any| {
+    public constructor(): R|test/A|
+
     public final object B : R|kotlin/Any| {
         public final fun foo(a: R|kotlin/Int|): R|kotlin/String|
 
@@ -6,6 +8,5 @@ public final class A : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/A|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
index b0b301cf3fa..458f202ccb5 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
@@ -1,10 +1,10 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
-    }
-
     public final fun foo(): R|test/UnboundWildcard.MyClass<*>?|
 
     public constructor(): R|test/UnboundWildcard|
 
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
+    }
+
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
index 360633e02eb..310daf25373 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
@@ -1,10 +1,10 @@
 public final class StarProjection : R|kotlin/Any| {
-    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
-    }
-
     public final fun foo(): R|test/StarProjection.MyClass<*>|
 
     public constructor(): R|test/StarProjection|
 
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
+    }
+
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
index a01d87309bf..930fe2e4eb2 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
@@ -1,18 +1,18 @@
 public final class A : R|kotlin/Any| {
     public final fun f1(): R|kotlin/Unit|
 
+    public final fun f2(): R|kotlin/Unit|
+
+    public final fun f3(): R|kotlin/Unit|
+
     public final fun R|kotlin/Int|.f1(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f1(): R|kotlin/Unit|
 
-    public final fun f2(): R|kotlin/Unit|
-
     public final fun R|kotlin/Int|.f2(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f2(): R|kotlin/Unit|
 
-    public final fun f3(): R|kotlin/Unit|
-
     public final fun R|kotlin/Int|.f3(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f3(): R|kotlin/Unit|
@@ -20,10 +20,10 @@ public final class A : R|kotlin/Any| {
     public final val c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val R|kotlin/Int|.c: R|kotlin/Int|
+    public final val d: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val d: R|kotlin/Int|
+    public final val R|kotlin/Int|.c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
     public final val R|kotlin/Int|.d: R|kotlin/Int|
@@ -32,3 +32,4 @@ public final class A : R|kotlin/Any| {
     public constructor(): R|test/A|
 
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
index d11bfe3c8d0..71a19a2fc1e 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
@@ -2,18 +2,19 @@ public final class A : R|kotlin/Any| {
     public final val a: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public final val R|kotlin/Int|.a: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
     public final val R|kotlin/Int|.b: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val c: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
     public final val R|kotlin/Int|.c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
     public constructor(): R|test/A|
 
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
index d51626eeb1f..1769d7ed098 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
@@ -1,4 +1,6 @@
 public final class O : R|kotlin/Any| {
+    public constructor(): R|test/O|
+
     public final class A1 : R|kotlin/Any| {
         public constructor(): R|test/O.A1|
 
@@ -25,6 +27,5 @@ public final class O : R|kotlin/Any| {
     public abstract interface C2 : R|kotlin/Any| {
     }
 
-    public constructor(): R|test/O|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
index 5f64ca24cf9..e7737eb6413 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
@@ -1,6 +1,12 @@
 public final class A<TA> : R|kotlin/Any| {
+    public constructor<TA>(): R|test/A<TA>|
+
     public final inner class B<TB, TA> : R|kotlin/Any| {
+        public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
+
         public final inner class C<TC, TB, TA> : R|kotlin/Any| {
+            public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
+
             public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
@@ -10,14 +16,9 @@ public final class A<TA> : R|kotlin/Any| {
 
             }
 
-            public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
-
         }
 
-        public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
-
     }
 
-    public constructor<TA>(): R|test/A<TA>|
-
 }
+
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
index cf5f517b3ed..a980e7f7609 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
@@ -1,10 +1,10 @@
 public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
+    public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
+
     public final inner class Inner<Q : R|P|, P> : R|kotlin/Any| {
         public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
 
-    public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
index 83271172a6b..b93f3c1b243 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
@@ -1,4 +1,6 @@
 public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
+    public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
+
     public final inner class Inner<P> : R|kotlin/Any| {
         public final fun <Q : R|P|> f(): R|kotlin/Unit|
 
@@ -14,7 +16,5 @@ public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
 
     }
 
-    public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt
index 8ead5598893..ee8ba0599a8 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt
@@ -10,6 +10,8 @@ public final object A : R|kotlin/Any| {
 }
 
 public final class B : R|kotlin/Any| {
+    public constructor(): R|test/B|
+
     public final companion object Companion : R|kotlin/Any| {
         public final const val inCompanion: R|kotlin/Int| = Int(3)
             public get(): R|kotlin/Int|
@@ -18,7 +20,5 @@ public final class B : R|kotlin/Any| {
 
     }
 
-    public constructor(): R|test/B|
-
 }
 
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
index 6d466e3b1a3..7baddd3ace8 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
@@ -2,6 +2,11 @@ public final val nonConstVal1: R|kotlin/Int| = Int(1)
     public get(): R|kotlin/Int|
 
 public final class C : R|kotlin/Any| {
+    public final val nonConstVal2: R|kotlin/Int| = Int(2)
+        public get(): R|kotlin/Int|
+
+    public constructor(): R|test/C|
+
     public final companion object Companion : R|kotlin/Any| {
         public final val nonConstVal3: R|kotlin/Int| = Int(3)
             public get(): R|kotlin/Int|
@@ -10,11 +15,6 @@ public final class C : R|kotlin/Any| {
 
     }
 
-    public final val nonConstVal2: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-
-    public constructor(): R|test/C|
-
 }
 
 public abstract interface I : R|kotlin/Any| {
diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
index cb9f41873e2..6bd789d08cf 100644
--- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
@@ -203,16 +203,6 @@ fun deserializeClassToSymbol(
             configure(classId)
         }
 
-        declarations.sortWith(object : Comparator<FirDeclaration> {
-            override fun compare(a: FirDeclaration, b: FirDeclaration): Int {
-                // Reorder members based on their type and name only.
-                // See FE 1.0's [DeserializedMemberScope#addMembers].
-                if (a is FirMemberDeclaration && b is FirMemberDeclaration) {
-                    return FirMemberDeclarationComparator.TypeAndNameComparator.compare(a, b)
-                }
-                return 0
-            }
-        })
         companionObjectSymbol = (declarations.firstOrNull { it is FirRegularClass && it.isCompanion } as FirRegularClass?)?.symbol
 
         contextReceivers.addAll(classDeserializer.createContextReceiversForClass(classProto))