diff --git a/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt b/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt
index bfb4e84b3de..dd10194a284 100644
--- a/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt
+++ b/compiler/testData/lazyResolve/diagnostics/AbstractInEnum.txt
@@ -34,7 +34,7 @@ internal final enum class abstract.MyEnum : jet.Any {
     internal final var l1: jet.Int
     internal final var l: jet.Int
     internal final var n: jet.Int
-    internal final object abstract.MyEnum.<class-object-for-MyEnum> {
+    internal final class object abstract.MyEnum.<class-object-for-MyEnum> {
         internal final /*constructor*/ fun <init>(): abstract.MyEnum.<class-object-for-MyEnum>
     }
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt b/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt
index 70a42c9ba6c..87fc172f18f 100644
--- a/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt
+++ b/compiler/testData/lazyResolve/diagnostics/AutocastsForStableIdentifiers.txt
@@ -10,7 +10,7 @@ internal final val y: jet.Any?
 // </namespace name="ns">
 internal final class example.AClass : jet.Any {
     public final /*constructor*/ fun <init>(): example.AClass
-    internal final object example.AClass.<no name provided> : jet.Any {
+    internal final class object example.AClass.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): example.AClass.<no name provided>
         internal final val y: jet.Any?
     }
diff --git a/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt b/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt
index 74e6380542b..bd839591af6 100644
--- a/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt
+++ b/compiler/testData/lazyResolve/diagnostics/ClassObjectCannotAccessClassFields.txt
@@ -3,7 +3,7 @@ namespace <root>
 internal final class A : jet.Any {
     public final /*constructor*/ fun <init>(): A
     internal final val x: jet.Int
-    internal final object A.<no name provided> : jet.Any {
+    internal final class object A.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): A.<no name provided>
         internal final val y: [ERROR : Type for x]
     }
diff --git a/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt b/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt
index 0c27cc88be6..fae72f46adf 100644
--- a/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt
+++ b/compiler/testData/lazyResolve/diagnostics/ClassObjects.txt
@@ -5,7 +5,7 @@ namespace Jet86
 
 internal final class Jet86.A : jet.Any {
     public final /*constructor*/ fun <init>(): Jet86.A
-    internal final object Jet86.A.<no name provided> : jet.Any {
+    internal final class object Jet86.A.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): Jet86.A.<no name provided>
         internal final val x: jet.Int
     }
diff --git a/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt b/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt
index cce7292b9c8..351aace8a33 100644
--- a/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt
+++ b/compiler/testData/lazyResolve/diagnostics/MultipleBounds.txt
@@ -23,7 +23,7 @@ internal final class Jet87.C : Jet87.A, Jet87.B {
 }
 internal final class Jet87.D : jet.Any {
     public final /*constructor*/ fun <init>(): Jet87.D
-    internal final object Jet87.D.<no name provided> : Jet87.A, Jet87.B {
+    internal final class object Jet87.D.<no name provided> : Jet87.A, Jet87.B {
         internal final /*constructor*/ fun <init>(): Jet87.D.<no name provided>
         internal open override /*1*/ fun bar(): jet.Double
         internal final override /*1*/ fun foo(): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt
index f852a63f2f0..645f10b299c 100644
--- a/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt
+++ b/compiler/testData/lazyResolve/diagnostics/nullabilityAndAutoCasts/kt362.txt
@@ -9,15 +9,15 @@ internal final fun test(): jet.Tuple0
 namespace test
 
 internal final class test.Internal : jet.Any {
-    public final val public: jet.Int?
-    protected final val protected: jet.Int?
-    internal final val internal: jet.Int?
     public final /*constructor*/ fun <init>(): test.Internal
+    internal final val internal: jet.Int?
+    protected final val protected: jet.Int?
+    public final val public: jet.Int?
 }
 public final class test.Public : jet.Any {
-    public final val public: jet.Int?
-    protected final val protected: jet.Int?
-    internal final val internal: jet.Int?
     public final /*constructor*/ fun <init>(): test.Public
+    internal final val internal: jet.Int?
+    protected final val protected: jet.Int?
+    public final val public: jet.Int?
 }
 // </namespace name="test">
diff --git a/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt b/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt
index c93803b7356..41d2a464102 100644
--- a/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt
+++ b/compiler/testData/lazyResolve/diagnostics/overload/ConstructorVsFunOverload.txt
@@ -6,7 +6,7 @@ namespace constructorVsFun
 internal final class constructorVsFun.Rtyu : jet.Any {
     public final /*constructor*/ fun <init>(): constructorVsFun.Rtyu
     internal final fun ololo(): jet.Tuple0
-    internal final object constructorVsFun.Rtyu.<no name provided> : jet.Any {
+    internal final class object constructorVsFun.Rtyu.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): constructorVsFun.Rtyu.<no name provided>
         internal final class constructorVsFun.Rtyu.<no name provided>.ololo : jet.Any {
             public final /*constructor*/ fun <init>(): constructorVsFun.Rtyu.<no name provided>.ololo
@@ -22,7 +22,7 @@ internal final class constructorVsFun.Tram : jet.Any {
 }
 internal final class constructorVsFun.Yvayva : jet.Any {
     public final /*constructor*/ fun <init>(): constructorVsFun.Yvayva
-    internal final object constructorVsFun.Yvayva.<no name provided> : jet.Any {
+    internal final class object constructorVsFun.Yvayva.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): constructorVsFun.Yvayva.<no name provided>
         internal final class constructorVsFun.Yvayva.<no name provided>.fghj : jet.Any {
             public final /*constructor*/ fun <init>(): constructorVsFun.Yvayva.<no name provided>.fghj
diff --git a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
index 5858324151f..2096b4bc0b3 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
@@ -6,6 +6,6 @@ internal open class A : jet.Any {
 }
 internal final class B : A {
     public final /*constructor*/ fun <init>(): B
-    internal final fun foo(): jet.String
     invisible_fake final override /*1*/ fun foo(): jet.Int
+    internal final fun foo(): jet.String
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt
index ee4feff2a8e..bbade35c80a 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt1489_1728.txt
@@ -9,11 +9,11 @@ internal abstract trait kt606_dependents.AutoCloseable : jet.Any {
 internal final class kt606_dependents.C : jet.Any {
     public final /*constructor*/ fun <init>(): kt606_dependents.C
     internal final fun bar(): jet.Tuple0
+    internal final fun </*0*/ X : kt606_dependents.AutoCloseable>foo(/*0*/ x: X, /*1*/ body: jet.Function1<X, jet.Tuple0>): jet.Tuple0
     internal final class kt606_dependents.C.Resource : kt606_dependents.AutoCloseable {
         public final /*constructor*/ fun <init>(): kt606_dependents.C.Resource
         internal open override /*1*/ fun close(): jet.Tuple0
     }
-    internal final fun </*0*/ X : kt606_dependents.AutoCloseable>foo(/*0*/ x: X, /*1*/ body: jet.Function1<X, jet.Tuple0>): jet.Tuple0
     internal final fun p(): kt606_dependents.C.Resource?
 }
 internal final val jet.Int.ext: jet.Function0<jet.Int>
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt
index 219081851df..902c1efe49f 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt526UnresolvedReferenceInnerStatic.txt
@@ -5,7 +5,7 @@ namespace demo
 
 internal final class demo.Foo : jet.Any {
     public final /*constructor*/ fun <init>(): demo.Foo
-    internal final object demo.Foo.<no name provided> : jet.Any {
+    internal final class object demo.Foo.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): demo.Foo.<no name provided>
         internal final class demo.Foo.<no name provided>.Bar : jet.Any {
             public final /*constructor*/ fun <init>(): demo.Foo.<no name provided>.Bar
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
index 9824d5fcee3..ccef9682802 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
@@ -11,9 +11,8 @@ internal final class Test : java.lang.Thread {
     public final override /*1*/ fun getPriority(): jet.Int
     public open override /*1*/ fun getStackTrace(): jet.Array<[ERROR : Unresolved java class: StackTraceElement]>?
     public final override /*1*/ fun getThreadGroup(): [ERROR : Unresolved java class: ThreadGroup]
-    public open override /*1*/ fun interrupt(): jet.Tuple0
     invisible_fake final override /*1*/ var inheritableThreadLocals: java.lang.ThreadLocal.ThreadLocalMap?
-    invisible_fake final override /*1*/ var threadLocals: java.lang.ThreadLocal.ThreadLocalMap?
+    public open override /*1*/ fun interrupt(): jet.Tuple0
     public final override /*1*/ fun isAlive(): jet.Boolean
     public final override /*1*/ fun isDaemon(): jet.Boolean
     public open override /*1*/ fun isInterrupted(): jet.Boolean
@@ -30,7 +29,8 @@ internal final class Test : java.lang.Thread {
     public final override /*1*/ fun stop(): jet.Tuple0
     public final override /*1*/ fun stop(/*0*/ p0: jet.Throwable?): jet.Tuple0
     public final override /*1*/ fun suspend(): jet.Tuple0
-    internal final object Test.<no name provided> : jet.Any {
+    invisible_fake final override /*1*/ var threadLocals: java.lang.ThreadLocal.ThreadLocalMap?
+    internal final class object Test.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): Test.<no name provided>
         internal final fun init2(): jet.Tuple0
     }
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt
index b4847e1c74a..7a4b28eaa8b 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt701.txt
@@ -2,7 +2,7 @@ namespace <root>
 
 public final class Throwables : jet.Any {
     public final /*constructor*/ fun <init>(): Throwables
-    internal final object Throwables.<no name provided> : jet.Any {
+    internal final class object Throwables.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): Throwables.<no name provided>
         public final fun </*0*/ X : jet.Throwable?>propagateIfInstanceOf(/*0*/ throwable: jet.Throwable?, /*1*/ declaredType: java.lang.Class<X?>?): jet.Tuple0
         public final fun propagateIfPossible(/*0*/ throwable: jet.Throwable?): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt
index 4a824be7d04..d988c4c6a40 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt2262.txt
@@ -5,13 +5,13 @@ namespace kt2262
 
 internal final class kt2262.Bar : kt2262.Foo {
     public final /*constructor*/ fun <init>(): kt2262.Bar
+    protected final override /*1*/ val color: jet.String
+    protected final val i: jet.Int
     internal final class kt2262.Bar.Baz : jet.Any {
         public final /*constructor*/ fun <init>(): kt2262.Bar.Baz
         internal final val copy: jet.String
         internal final val j: jet.Int
     }
-    protected final override /*1*/ val color: jet.String
-    protected final val i: jet.Int
 }
 internal abstract class kt2262.Foo : jet.Any {
     public final /*constructor*/ fun <init>(): kt2262.Foo
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt
index 9cd8a83d3ab..6616986d1c7 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt587.txt
@@ -2,11 +2,11 @@ namespace <root>
 
 internal final class Main : jet.Any {
     public final /*constructor*/ fun <init>(): Main
-    internal final object Main.<no name provided> : jet.Any {
+    internal final class object Main.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): Main.<no name provided>
         internal final class Main.<no name provided>.States : jet.Any {
             public final /*constructor*/ fun <init>(): Main.<no name provided>.States
-            internal final object Main.<no name provided>.States.<no name provided> : jet.Any {
+            internal final class object Main.<no name provided>.States.<no name provided> : jet.Any {
                 internal final /*constructor*/ fun <init>(): Main.<no name provided>.States.<no name provided>
                 public final val N: Main.<no name provided>.States
             }
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt
index a2782c76846..ce5de5acaf9 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt900-1.txt
@@ -5,11 +5,11 @@ namespace c
 
 internal final class c.A : jet.Any {
     public final /*constructor*/ fun <init>(): c.A
-    internal final object c.A.<no name provided> : jet.Any {
+    internal final class object c.A.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): c.A.<no name provided>
         internal final class c.A.<no name provided>.B : jet.Any {
             public final /*constructor*/ fun <init>(): c.A.<no name provided>.B
-            internal final object c.A.<no name provided>.B.<no name provided> : jet.Any {
+            internal final class object c.A.<no name provided>.B.<no name provided> : jet.Any {
                 internal final /*constructor*/ fun <init>(): c.A.<no name provided>.B.<no name provided>
             }
         }
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt
index f3b6159f0df..776f2458696 100644
--- a/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt
+++ b/compiler/testData/lazyResolve/diagnostics/subtyping/kt2069.txt
@@ -7,7 +7,7 @@ internal final class kt2069.T : kt2069.T1 {
     public final /*constructor*/ fun <init>(): kt2069.T
     internal final fun bar(): jet.Tuple0
     internal open override /*1*/ fun foo(): jet.Tuple0
-    internal final object kt2069.T.<no name provided> : jet.Any {
+    internal final class object kt2069.T.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): kt2069.T.<no name provided>
     }
 }