diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
index d3ae95d352d..4ed1b719e78 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
@@ -368,15 +368,15 @@ public interface Sink {
 @kotlin.Metadata
 public final class SourceCrossinline$Factory {
     synthetic final static field $$INSTANCE: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     private method <init>(): void
+    public final inner class SourceCrossinline$Factory
 }
 
 @kotlin.Metadata
 public interface SourceCrossinline {
     public final static @org.jetbrains.annotations.NotNull field Factory: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public final inner class SourceCrossinline$Factory
 }
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt
index 3aa15cd92c3..5de1e9cba69 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_1_2.txt
@@ -379,15 +379,15 @@ public interface Sink {
 @kotlin.Metadata
 public final class SourceCrossinline$Factory {
     synthetic final static field $$INSTANCE: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     private method <init>(): void
+    public final inner class SourceCrossinline$Factory
 }
 
 @kotlin.Metadata
 public interface SourceCrossinline {
     public final static @org.jetbrains.annotations.NotNull field Factory: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final inner class SourceCrossinline$Factory
 }
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
index a81149c14df..1b740721c8b 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
@@ -278,15 +278,15 @@ public interface Sink {
 @kotlin.Metadata
 public final class SourceCrossinline$Factory {
     synthetic final static field $$INSTANCE: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     private method <init>(): void
+    public final inner class SourceCrossinline$Factory
 }
 
 @kotlin.Metadata
 public interface SourceCrossinline {
     public final static @org.jetbrains.annotations.NotNull field Factory: SourceCrossinline$Factory
-    inner class SourceCrossinline$Factory
     static method <clinit>(): void
     public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public final inner class SourceCrossinline$Factory
 }
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.txt b/compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.txt
index 043469c049c..471d53ffa78 100644
--- a/compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.txt
+++ b/compiler/testData/codegen/bytecodeListing/annotations/noAdditionalAnnotationsInAccessors.txt
@@ -1,18 +1,18 @@
 @kotlin.Metadata
 public final class Foo$Companion {
-    inner class Foo$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method foo(): void
+    public final inner class Foo$Companion
 }
 
 @kotlin.Metadata
 public final class Foo {
     public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
-    inner class Foo$Companion
     static method <clinit>(): void
     private method <init>(p0: java.lang.String): void
     public synthetic method <init>(p0: java.lang.String, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic final static method access$foo(p0: Foo, p1: java.lang.String): void
     private final method foo(p0: java.lang.String): void
+    public final inner class Foo$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors.txt b/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors.txt
index e5225eef1c3..06f739c75e6 100644
--- a/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors.txt
+++ b/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors.txt
@@ -4,19 +4,19 @@ public annotation class Ann
 
 @kotlin.Metadata
 public final class Foo$Companion {
-    inner class Foo$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method foo(): void
+    public final inner class Foo$Companion
 }
 
 @kotlin.Metadata
 public final class Foo {
     public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
-    inner class Foo$Companion
     static method <clinit>(): void
     private @Ann method <init>(@Ann p0: java.lang.String): void
     public synthetic method <init>(p0: java.lang.String, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic final static method access$foo(p0: Foo, p1: java.lang.String): void
     private final @Ann method foo(@Ann p0: java.lang.String): void
+    public final inner class Foo$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors_ir.txt b/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors_ir.txt
index e5225eef1c3..06f739c75e6 100644
--- a/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/annotations/noAnnotationsInSyntheticAccessors_ir.txt
@@ -4,19 +4,19 @@ public annotation class Ann
 
 @kotlin.Metadata
 public final class Foo$Companion {
-    inner class Foo$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method foo(): void
+    public final inner class Foo$Companion
 }
 
 @kotlin.Metadata
 public final class Foo {
     public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
-    inner class Foo$Companion
     static method <clinit>(): void
     private @Ann method <init>(@Ann p0: java.lang.String): void
     public synthetic method <init>(p0: java.lang.String, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic final static method access$foo(p0: Foo, p1: java.lang.String): void
     private final @Ann method foo(@Ann p0: java.lang.String): void
+    public final inner class Foo$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt
index afea11af2fc..3b0e716ac5c 100644
--- a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt
+++ b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt
@@ -1,59 +1,59 @@
 @kotlin.Metadata
 public final class TestInternalCompanionInClass$Companion {
-    inner class TestInternalCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class TestInternalCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public final class TestInternalCompanionInClass {
     public final static @org.jetbrains.annotations.NotNull field Companion: TestInternalCompanionInClass$Companion
-    inner class TestInternalCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    public final inner class TestInternalCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 final class TestPrivateCompanionInClass$Companion {
-    inner class TestPrivateCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    private final inner class TestPrivateCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public final class TestPrivateCompanionInClass {
     private final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInClass$Companion
-    inner class TestPrivateCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    private final inner class TestPrivateCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 final class TestPrivateCompanionInInterface$Companion {
     synthetic final static field $$INSTANCE: TestPrivateCompanionInInterface$Companion
-    inner class TestPrivateCompanionInInterface$Companion
     static method <clinit>(): void
     private method <init>(): void
+    public final inner class TestPrivateCompanionInInterface$Companion
 }
 
 @kotlin.Metadata
 public interface TestPrivateCompanionInInterface {
     public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInInterface$Companion
-    inner class TestPrivateCompanionInInterface$Companion
     static method <clinit>(): void
+    public final inner class TestPrivateCompanionInInterface$Companion
 }
 
 @kotlin.Metadata
 public final class TestProtectedCompanionInClass$Companion {
-    inner class TestProtectedCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    protected final inner class TestProtectedCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public class TestProtectedCompanionInClass {
     protected final static @org.jetbrains.annotations.NotNull field Companion: TestProtectedCompanionInClass$Companion
-    inner class TestProtectedCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    protected final inner class TestProtectedCompanionInClass$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.txt b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.txt
index 7947360123d..ea62aa2333f 100644
--- a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.txt
+++ b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.txt
@@ -1,59 +1,59 @@
 @kotlin.Metadata
 public final class TestInternalCompanionInClass$Companion {
-    inner class TestInternalCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class TestInternalCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public final class TestInternalCompanionInClass {
     public final static @org.jetbrains.annotations.NotNull field Companion: TestInternalCompanionInClass$Companion
-    inner class TestInternalCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    public final inner class TestInternalCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 final class TestPrivateCompanionInClass$Companion {
-    inner class TestPrivateCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    private final inner class TestPrivateCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public final class TestPrivateCompanionInClass {
     public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInClass$Companion
-    inner class TestPrivateCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    private final inner class TestPrivateCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 final class TestPrivateCompanionInInterface$Companion {
     synthetic final static field $$INSTANCE: TestPrivateCompanionInInterface$Companion
-    inner class TestPrivateCompanionInInterface$Companion
     static method <clinit>(): void
     private method <init>(): void
+    public final inner class TestPrivateCompanionInInterface$Companion
 }
 
 @kotlin.Metadata
 public interface TestPrivateCompanionInInterface {
     public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInInterface$Companion
-    inner class TestPrivateCompanionInInterface$Companion
     static method <clinit>(): void
+    public final inner class TestPrivateCompanionInInterface$Companion
 }
 
 @kotlin.Metadata
 public final class TestProtectedCompanionInClass$Companion {
-    inner class TestProtectedCompanionInClass$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    protected final inner class TestProtectedCompanionInClass$Companion
 }
 
 @kotlin.Metadata
 public class TestProtectedCompanionInClass {
     public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field Companion: TestProtectedCompanionInClass$Companion
-    inner class TestProtectedCompanionInClass$Companion
     static method <clinit>(): void
     public method <init>(): void
+    protected final inner class TestProtectedCompanionInClass$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt
index 2bb24bbd560..99547f73c9c 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt
@@ -21,14 +21,14 @@ public final class Component1Kt {
 
 @kotlin.Metadata
 public final class Foo$DefaultImpls {
-    inner class Foo$DefaultImpls
     public static @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.NotNull p1: Result, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object
+    public final inner class Foo$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Foo {
-    inner class Foo$DefaultImpls
     public abstract @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: Result, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
+    public final inner class Foo$DefaultImpls
 }
 
 @kotlin.Metadata
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt
index f33478c4fef..8ae763fc146 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt
@@ -20,14 +20,14 @@ public final class FieldKt {
 
 @kotlin.Metadata
 public final class Foo$DefaultImpls {
-    inner class Foo$DefaultImpls
     public static @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.NotNull p1: Result): java.lang.Object
+    public final inner class Foo$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Foo {
-    inner class Foo$DefaultImpls
     public abstract @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: Result): java.lang.Object
+    public final inner class Foo$DefaultImpls
 }
 
 @kotlin.Metadata
diff --git a/compiler/testData/codegen/bytecodeListing/defaultImpls.txt b/compiler/testData/codegen/bytecodeListing/defaultImpls.txt
index 4e054d3c2a7..c245d9eace4 100644
--- a/compiler/testData/codegen/bytecodeListing/defaultImpls.txt
+++ b/compiler/testData/codegen/bytecodeListing/defaultImpls.txt
@@ -18,42 +18,42 @@ public interface C {
 
 @kotlin.Metadata
 public final class D$DefaultImpls {
-    inner class D$DefaultImpls
     public static method baz(@org.jetbrains.annotations.NotNull p0: D, @org.jetbrains.annotations.NotNull p1: java.lang.String): int
     private static method test(p0: D, p1: java.lang.String): java.lang.String
+    public final inner class D$DefaultImpls
 }
 
 @kotlin.Metadata
 @Anno
 public interface D {
-    inner class D$DefaultImpls
     public abstract method baz(@org.jetbrains.annotations.NotNull p0: java.lang.String): int
+    public final inner class D$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class E$InsideE {
-    inner class E$InsideE
     public method <init>(): void
+    public final inner class E$InsideE
 }
 
 @kotlin.Metadata
 public interface E {
-    inner class E$InsideE
+    public final inner class E$InsideE
 }
 
 @kotlin.Metadata
 public final class F$DefaultImpls {
-    inner class F$DefaultImpls
     public static @org.jetbrains.annotations.NotNull method getBar(@org.jetbrains.annotations.NotNull p0: F): java.lang.String
     private static method getBaz(p0: F): java.lang.String
     public static method setBar(@org.jetbrains.annotations.NotNull p0: F, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
     private static method setBaz(p0: F, p1: java.lang.String): void
+    public final inner class F$DefaultImpls
 }
 
 @kotlin.Metadata
 @Anno
 public interface F {
-    inner class F$DefaultImpls
     public abstract @org.jetbrains.annotations.NotNull method getBar(): java.lang.String
     public abstract method setBar(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final inner class F$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/enum.txt b/compiler/testData/codegen/bytecodeListing/enum.txt
index 35b17ef43f1..260f63609c4 100644
--- a/compiler/testData/codegen/bytecodeListing/enum.txt
+++ b/compiler/testData/codegen/bytecodeListing/enum.txt
@@ -41,7 +41,7 @@ public final enum class WithConstructor {
 
 @kotlin.Metadata
 final class WithEntryClass$A {
-    inner class WithEntryClass$A
+    final inner class WithEntryClass$A
     method <init>(p0: java.lang.String, p1: int): void
     public method foo(): void
 }
@@ -50,7 +50,7 @@ final class WithEntryClass$A {
 public abstract enum class WithEntryClass {
     private synthetic final static field $VALUES: WithEntryClass[]
     public final enum static field A: WithEntryClass
-    inner class WithEntryClass$A
+    final inner class WithEntryClass$A
     static method <clinit>(): void
     private method <init>(p0: java.lang.String, p1: int): void
     public synthetic method <init>(p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt
index aa671a93a55..1de74c1bbb2 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt
@@ -4,51 +4,51 @@ public annotation class Ann
 
 @kotlin.Metadata
 public final class Sealed$Derived {
-    inner class Sealed$Derived
     private method <init>(p0: int): void
     public synthetic @Ann method <init>(p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class Sealed$Derived
 }
 
 @kotlin.Metadata
 public final class Sealed$Inner {
     synthetic final field this$0: Sealed
     private final field z2: int
-    inner class Sealed$Inner
     public synthetic @Ann method <init>(p0: Sealed, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
     private method <init>(p0: Sealed, p1: int, p2: int, p3: java.lang.String): void
     public final method getZ2-a_XrcN0(): int
+    public final inner class Sealed$Inner
 }
 
 @kotlin.Metadata
 public abstract class Sealed {
     private final field z: int
-    inner class Sealed$Derived
-    inner class Sealed$Inner
     private @Ann method <init>(@Ann p0: int): void
     public synthetic method <init>(p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method getZ-a_XrcN0(): int
+    public final inner class Sealed$Derived
+    public final inner class Sealed$Inner
 }
 
 @kotlin.Metadata
 public final class Test$Inner {
     synthetic final field this$0: Test
     private final field z2: int
-    inner class Test$Inner
     public synthetic @Ann method <init>(p0: Test, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
     private method <init>(p0: Test, p1: int, p2: int, p3: java.lang.String): void
     public final method getZ2-a_XrcN0(): int
+    public final inner class Test$Inner
 }
 
 @kotlin.Metadata
 public final class Test {
     private final field z: int
-    inner class Test$Inner
     public synthetic @Ann method <init>(@Ann p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     private method <init>(p0: int): void
     public synthetic @Ann method <init>(p0: int, @Ann p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
     private @Ann method <init>(p0: int, @Ann p1: java.lang.String): void
     private method <init>(p0: int, p1: int): void
     public final method getZ-a_XrcN0(): int
+    public final inner class Test$Inner
 }
 
 @kotlin.Metadata
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt
index b32dad7436b..02883c20a15 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt
@@ -1,9 +1,9 @@
 @kotlin.Metadata
 public final class Foo$Companion {
-    inner class Foo$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method funInCompanion(): void
+    public final inner class Foo$Companion
 }
 
 @kotlin.Metadata
@@ -11,7 +11,6 @@ public final class Foo {
     public final static @org.jetbrains.annotations.NotNull field Companion: Foo$Companion
     private final static field constValInCompanion: int
     private final field x: int
-    inner class Foo$Companion
     static method <clinit>(): void
     private synthetic method <init>(p0: int): void
     public synthetic final static method box-impl(p0: int): Foo
@@ -26,4 +25,5 @@ public final class Foo {
     public method toString(): java.lang.String
     public static method toString-impl(p0: int): java.lang.String
     public synthetic final method unbox-impl(): int
+    public final inner class Foo$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt
index 3ee71774316..070e8fa973f 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt
@@ -36,32 +36,32 @@ public final enum class TestEnum {
 public final class TestInner$Inner {
     synthetic final field this$0: TestInner
     private final field z: int
-    inner class TestInner$Inner
     private method <init>(p0: TestInner, p1: int): void
     public synthetic method <init>(p0: TestInner, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method getZ-a_XrcN0(): int
+    public final inner class TestInner$Inner
 }
 
 @kotlin.Metadata
 public final class TestInner {
-    inner class TestInner$Inner
     public method <init>(): void
+    public final inner class TestInner$Inner
 }
 
 @kotlin.Metadata
 public final class TestSealed$Case {
-    inner class TestSealed$Case
     private method <init>(p0: int): void
     public synthetic method <init>(p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class TestSealed$Case
 }
 
 @kotlin.Metadata
 public abstract class TestSealed {
     private final field z: int
-    inner class TestSealed$Case
     private method <init>(p0: int): void
     public synthetic method <init>(p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final method getZ-a_XrcN0(): int
+    public final inner class TestSealed$Case
 }
 
 @kotlin.Metadata
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecation.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecation.txt
index b1f6229a927..5757d5f7f26 100644
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecation.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecation.txt
@@ -1,15 +1,14 @@
 @kotlin.Metadata
 public final class Base$DefaultImpls {
-    inner class Base$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: Base): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: Base): void
     public synthetic static method withDefault$default(p0: Base, p1: java.lang.String, p2: int, p3: java.lang.Object): void
     public deprecated static @java.lang.Deprecated method withDefault(@org.jetbrains.annotations.NotNull p0: Base, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Base {
-    inner class Base$DefaultImpls
     public synthetic static method access$getProp$jd(p0: Base): java.lang.String
     public synthetic static method access$test$jd(p0: Base): void
     public synthetic static method access$withDefault$jd(p0: Base, p1: java.lang.String): void
@@ -17,36 +16,37 @@ public interface Base {
     public method test(): void
     public synthetic static method withDefault$default(p0: Base, p1: java.lang.String, p2: int, p3: java.lang.Object): void
     public method withDefault(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Deprecated$DefaultImpls {
-    inner class Deprecated$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: Deprecated): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: Deprecated): void
+    public final inner class Deprecated$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Deprecated {
-    inner class Deprecated$DefaultImpls
     public synthetic static method access$getProp$jd(p0: Deprecated): java.lang.String
     public synthetic static method access$test$jd(p0: Deprecated): void
     public @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
     public @java.lang.Deprecated method test(): void
+    public final inner class Deprecated$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Derived$DefaultImpls {
-    inner class Derived$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: Derived): void
     public deprecated static @java.lang.Deprecated method withDefault(@org.jetbrains.annotations.NotNull p0: Derived, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
+    public final inner class Derived$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Derived {
-    inner class Derived$DefaultImpls
     public synthetic static method access$getProp$jd(p0: Derived): java.lang.String
     public synthetic static method access$test$jd(p0: Derived): void
     public synthetic static method access$withDefault$jd(p0: Derived, p1: java.lang.String): void
-}
\ No newline at end of file
+    public final inner class Derived$DefaultImpls
+}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecationWithDefault.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecationWithDefault.txt
index 3b89f672ee1..1457ea42207 100644
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecationWithDefault.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/deprecationWithDefault.txt
@@ -1,15 +1,14 @@
 @kotlin.Metadata
 public final class Deprecated$DefaultImpls {
-    inner class Deprecated$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: Deprecated): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: Deprecated): void
     public synthetic static method withDefault$default(p0: Deprecated, p1: java.lang.String, p2: int, p3: java.lang.Object): void
     public deprecated static @java.lang.Deprecated method withDefault(@org.jetbrains.annotations.NotNull p0: Deprecated, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
+    public final inner class Deprecated$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Deprecated {
-    inner class Deprecated$DefaultImpls
     public synthetic static method access$getProp$jd(p0: Deprecated): java.lang.String
     public synthetic static method access$test$jd(p0: Deprecated): void
     public synthetic static method access$withDefault$jd(p0: Deprecated, p1: java.lang.String): void
@@ -17,4 +16,5 @@ public interface Deprecated {
     public @java.lang.Deprecated method test(): void
     public synthetic static method withDefault$default(p0: Deprecated, p1: java.lang.String, p2: int, p3: java.lang.Object): void
     public @java.lang.Deprecated method withDefault(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final inner class Deprecated$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt
index 489ce7753a0..be3b737070b 100644
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/jvmDefaultWithoutCompatibility.txt
@@ -19,30 +19,30 @@ public interface NoDefaultImpl2FromDefaultImpls {
 
 @kotlin.Metadata
 public final class WithDefaultImpl$DefaultImpls {
-    inner class WithDefaultImpl$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: WithDefaultImpl): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImpl): void
+    public final inner class WithDefaultImpl$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface WithDefaultImpl {
-    inner class WithDefaultImpl$DefaultImpls
     public synthetic static method access$getProp$jd(p0: WithDefaultImpl): java.lang.String
     public synthetic static method access$test$jd(p0: WithDefaultImpl): void
+    public final inner class WithDefaultImpl$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class WithDefaultImplPure$DefaultImpls {
-    inner class WithDefaultImplPure$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: WithDefaultImplPure): java.lang.String
     public deprecated static @java.lang.Deprecated method test(@org.jetbrains.annotations.NotNull p0: WithDefaultImplPure): void
+    public final inner class WithDefaultImplPure$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface WithDefaultImplPure {
-    inner class WithDefaultImplPure$DefaultImpls
     public synthetic static method access$getProp$jd(p0: WithDefaultImplPure): java.lang.String
     public synthetic static method access$test$jd(p0: WithDefaultImplPure): void
     public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
     public method test(): void
+    public final inner class WithDefaultImplPure$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt
index 6ab5966aa58..64bfb5dde68 100644
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndAny.txt
@@ -10,38 +10,38 @@ public class B {
 
 @kotlin.Metadata
 public final class Base$DefaultImpls {
-    inner class Base$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Base {
-    inner class Base$DefaultImpls
     public synthetic static method access$test$jd(p0: Base): java.lang.Integer
     public @org.jetbrains.annotations.Nullable method test(): java.lang.Integer
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Derived$DefaultImpls {
-    inner class Derived$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer
+    public final inner class Derived$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Derived {
-    inner class Derived$DefaultImpls
     public synthetic static method access$test$jd(p0: Derived): int
     public @org.jetbrains.annotations.NotNull method test(): java.lang.Integer
+    public final inner class Derived$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Mixed$DefaultImpls {
-    inner class Mixed$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer
+    public final inner class Mixed$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Mixed {
-    inner class Mixed$DefaultImpls
     public synthetic static method access$test$jd(p0: Mixed): int
+    public final inner class Mixed$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt
index 6ab5966aa58..64bfb5dde68 100644
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/allCompatibility/specialization/primitiveAndNullable.txt
@@ -10,38 +10,38 @@ public class B {
 
 @kotlin.Metadata
 public final class Base$DefaultImpls {
-    inner class Base$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: Base): java.lang.Integer
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Base {
-    inner class Base$DefaultImpls
     public synthetic static method access$test$jd(p0: Base): java.lang.Integer
     public @org.jetbrains.annotations.Nullable method test(): java.lang.Integer
+    public final inner class Base$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Derived$DefaultImpls {
-    inner class Derived$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Derived): java.lang.Integer
+    public final inner class Derived$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Derived {
-    inner class Derived$DefaultImpls
     public synthetic static method access$test$jd(p0: Derived): int
     public @org.jetbrains.annotations.NotNull method test(): java.lang.Integer
+    public final inner class Derived$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class Mixed$DefaultImpls {
-    inner class Mixed$DefaultImpls
     public deprecated static @java.lang.Deprecated @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: Mixed): java.lang.Integer
+    public final inner class Mixed$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface Mixed {
-    inner class Mixed$DefaultImpls
     public synthetic static method access$test$jd(p0: Mixed): int
+    public final inner class Mixed$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.txt b/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.txt
index e0a4fbf83f5..4e1b2d63c79 100644
--- a/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.txt
@@ -40,7 +40,6 @@ public final class BSimpleObject {
 
 @kotlin.Metadata
 public final class CClassWithCompanion$Companion {
-    inner class CClassWithCompanion$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic static method showSnackbar$default(p0: CClassWithCompanion$Companion, p1: java.lang.String, p2: int, p3: int, p4: int, p5: java.lang.Object): void
@@ -57,12 +56,12 @@ public final class CClassWithCompanion$Companion {
     public synthetic static method showSnackbarNoExtension$default(p0: CClassWithCompanion$Companion, p1: int, p2: int, p3: int, p4: java.lang.Object): void
     public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbarNoExtension(@StringRes p0: int): void
     public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbarNoExtension(@StringRes p0: int, p1: int): void
+    public final inner class CClassWithCompanion$Companion
 }
 
 @kotlin.Metadata
 public final class CClassWithCompanion {
     public final static @org.jetbrains.annotations.NotNull field Companion: CClassWithCompanion$Companion
-    inner class CClassWithCompanion$Companion
     static method <clinit>(): void
     public method <init>(): void
     public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbar(@org.jetbrains.annotations.NotNull p0: java.lang.String, @StringRes p1: int): void
@@ -75,12 +74,12 @@ public final class CClassWithCompanion {
     public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbarLongNoExtension(@StringRes p0: int, @LongRes p1: long): void
     public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbarNoExtension(@StringRes p0: int): void
     public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads method showSnackbarNoExtension(@StringRes p0: int, p1: int): void
+    public final inner class CClassWithCompanion$Companion
 }
 
 @kotlin.Metadata
 public final class DClassConstuctors$InnerClass {
     synthetic final field this$0: DClassConstuctors
-    inner class DClassConstuctors$InnerClass
     public @kotlin.jvm.JvmOverloads method <init>(p0: DClassConstuctors, @StringRes p1: int): void
     public @kotlin.jvm.JvmOverloads method <init>(p0: DClassConstuctors, @StringRes p1: int, @DefRes p2: int, @LongRes p3: long): void
     public @kotlin.jvm.JvmOverloads method <init>(p0: DClassConstuctors, @StringRes p1: int, @DefRes p2: int, @LongRes p3: long, @org.jetbrains.annotations.NotNull p4: java.lang.String): void
@@ -88,11 +87,11 @@ public final class DClassConstuctors$InnerClass {
     public @kotlin.jvm.JvmOverloads method <init>(p0: DClassConstuctors, @StringRes p1: int, p2: int): void
     public synthetic method <init>(p0: DClassConstuctors, p1: int, p2: int, p3: int, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic method <init>(p0: DClassConstuctors, p1: int, p2: int, p3: long, p4: java.lang.String, p5: int, p6: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class DClassConstuctors$InnerClass
 }
 
 @kotlin.Metadata
 public final class DClassConstuctors {
-    inner class DClassConstuctors$InnerClass
     public @kotlin.jvm.JvmOverloads method <init>(@StringRes p0: int): void
     public @kotlin.jvm.JvmOverloads method <init>(@StringRes p0: int, @DefRes p1: int, @LongRes p2: long): void
     public @kotlin.jvm.JvmOverloads method <init>(@StringRes p0: int, @DefRes p1: int, @LongRes p2: long, @org.jetbrains.annotations.NotNull p3: java.lang.String): void
@@ -100,6 +99,7 @@ public final class DClassConstuctors {
     public @kotlin.jvm.JvmOverloads method <init>(@StringRes p0: int, p1: int): void
     public synthetic method <init>(p0: int, p1: int, p2: int, p3: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic method <init>(p0: int, p1: int, p2: long, p3: java.lang.String, p4: int, p5: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class DClassConstuctors$InnerClass
 }
 
 @java.lang.annotation.Retention
diff --git a/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.txt b/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.txt
index 451d4203e7f..72dbb38f389 100644
--- a/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters.txt
@@ -9,18 +9,18 @@ public final class AnObject {
 
 @kotlin.Metadata
 public final class WithCompanion$Companion {
-    inner class WithCompanion$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic static method foo$default(p0: WithCompanion$Companion, p1: int, p2: int, p3: java.lang.Object): void
     public final @kotlin.jvm.JvmStatic method foo(p0: int): void
+    public final inner class WithCompanion$Companion
 }
 
 @kotlin.Metadata
 public final class WithCompanion {
     public final static @org.jetbrains.annotations.NotNull field Companion: WithCompanion$Companion
-    inner class WithCompanion$Companion
     static method <clinit>(): void
     public method <init>(): void
     public final static @kotlin.jvm.JvmStatic method foo(p0: int): void
+    public final inner class WithCompanion$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters_ir.txt b/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters_ir.txt
index 451d4203e7f..72dbb38f389 100644
--- a/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/jvmStaticWithDefaultParameters_ir.txt
@@ -9,18 +9,18 @@ public final class AnObject {
 
 @kotlin.Metadata
 public final class WithCompanion$Companion {
-    inner class WithCompanion$Companion
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
     public synthetic static method foo$default(p0: WithCompanion$Companion, p1: int, p2: int, p3: java.lang.Object): void
     public final @kotlin.jvm.JvmStatic method foo(p0: int): void
+    public final inner class WithCompanion$Companion
 }
 
 @kotlin.Metadata
 public final class WithCompanion {
     public final static @org.jetbrains.annotations.NotNull field Companion: WithCompanion$Companion
-    inner class WithCompanion$Companion
     static method <clinit>(): void
     public method <init>(): void
     public final static @kotlin.jvm.JvmStatic method foo(p0: int): void
+    public final inner class WithCompanion$Companion
 }
diff --git a/compiler/testData/codegen/bytecodeListing/multiplatform/optionalExpectation.txt b/compiler/testData/codegen/bytecodeListing/multiplatform/optionalExpectation.txt
index 89dba1c107e..9da382e0e38 100644
--- a/compiler/testData/codegen/bytecodeListing/multiplatform/optionalExpectation.txt
+++ b/compiler/testData/codegen/bytecodeListing/multiplatform/optionalExpectation.txt
@@ -1,15 +1,15 @@
 @kotlin.Metadata
 public interface Foo$Nested {
-    inner class Foo$Nested
+    public inner class Foo$Nested
 }
 
 @kotlin.Metadata
 public final class Foo {
     private field x: int
-    inner class Foo$Nested
     public method <init>(p0: int): void
     public final method bar(): void
     public synthetic deprecated static method getX$annotations(): void
     public final method getX(): int
     public final method setX(p0: int): void
+    public inner class Foo$Nested
 }
diff --git a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt b/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt
index eae41139968..df87845bae6 100644
--- a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt
+++ b/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt
@@ -1,26 +1,26 @@
 @kotlin.Metadata
 public final class A$DefaultImpls {
-    inner class A$DefaultImpls
     private static method bar(p0: A): java.lang.String
     public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A): java.lang.String
     private static method getLog(p0: A): java.lang.String
+    public final inner class A$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface A {
-    inner class A$DefaultImpls
     public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+    public final inner class A$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class B$DefaultImpls {
-    inner class B$DefaultImpls
     public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: B): java.lang.String
+    public final inner class B$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface B {
-    inner class B$DefaultImpls
+    public final inner class B$DefaultImpls
 }
 
 @kotlin.Metadata
diff --git a/compiler/testData/codegen/bytecodeListing/privateDefaultImpls.txt b/compiler/testData/codegen/bytecodeListing/privateDefaultImpls.txt
index 1fb7e4dd884..6e75bb61fe0 100644
--- a/compiler/testData/codegen/bytecodeListing/privateDefaultImpls.txt
+++ b/compiler/testData/codegen/bytecodeListing/privateDefaultImpls.txt
@@ -1,11 +1,11 @@
 @kotlin.Metadata
 public final class A$DefaultImpls {
-    inner class A$DefaultImpls
     private static method foo(p0: A): void
     private static method getX(p0: A): int
+    public final inner class A$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface A {
-    inner class A$DefaultImpls
+    public final inner class A$DefaultImpls
 }
diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt
index 107d7af7c87..53d3de893ac 100644
--- a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt
+++ b/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt
@@ -105,28 +105,28 @@ public abstract class A8 {
 
 @kotlin.Metadata
 public final class I1$DefaultImpls {
-    inner class I1$DefaultImpls
     public static method contains(@org.jetbrains.annotations.NotNull p0: I1, p1: java.lang.Object): boolean
     public static method containsAll(@org.jetbrains.annotations.NotNull p0: I1, @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean
+    public final inner class I1$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface I1 {
-    inner class I1$DefaultImpls
     public abstract method contains(p0: java.lang.Object): boolean
     public abstract method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public final inner class I1$DefaultImpls
 }
 
 @kotlin.Metadata
 public final class I2$DefaultImpls {
-    inner class I2$DefaultImpls
     public static method contains(@org.jetbrains.annotations.NotNull p0: I2, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean
     public static method containsAll(@org.jetbrains.annotations.NotNull p0: I2, @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean
+    public final inner class I2$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface I2 {
-    inner class I2$DefaultImpls
     public abstract method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean
     public abstract method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean
+    public final inner class I2$DefaultImpls
 }
diff --git a/compiler/testData/codegen/kapt/innerClasses.txt b/compiler/testData/codegen/kapt/innerClasses.txt
index c4783d1d26e..42ff2bdfdae 100644
--- a/compiler/testData/codegen/kapt/innerClasses.txt
+++ b/compiler/testData/codegen/kapt/innerClasses.txt
@@ -1,37 +1,37 @@
 @kotlin.Metadata
 public final class test/TopLevel$Companion {
-    inner class test/TopLevel$Companion
     private method <init>(): void
     public final method a(): void
     public synthetic deprecated static @kotlin.jvm.JvmStatic method getQ$annotations(): void
     public final @org.jetbrains.annotations.NotNull method getQ(): java.lang.String
+    public final inner class test/TopLevel$Companion
 }
 
 @kotlin.Metadata
 public interface test/TopLevel$InnerInterface {
-    inner class test/TopLevel$InnerInterface
+    public inner class test/TopLevel$InnerInterface
 }
 
 @kotlin.Metadata
 public final class test/TopLevel$InnerObject {
     public final static @org.jetbrains.annotations.NotNull field INSTANCE: test.TopLevel$InnerObject
-    inner class test/TopLevel$InnerObject
     private method <init>(): void
+    public final inner class test/TopLevel$InnerObject
 }
 
 @kotlin.Metadata
 public final class test/TopLevel$NestedClass$NestedInnerClass {
     synthetic final field this$0: test.TopLevel$NestedClass
-    inner class test/TopLevel$NestedClass
-    inner class test/TopLevel$NestedClass$NestedInnerClass
     public method <init>(p0: test.TopLevel$NestedClass): void
+    public final inner class test/TopLevel$NestedClass
+    public final inner class test/TopLevel$NestedClass$NestedInnerClass
 }
 
 @kotlin.Metadata
 public final class test/TopLevel$NestedClass {
-    inner class test/TopLevel$NestedClass
-    inner class test/TopLevel$NestedClass$NestedInnerClass
     public method <init>(): void
+    public final inner class test/TopLevel$NestedClass
+    public final inner class test/TopLevel$NestedClass$NestedInnerClass
 }
 
 @kotlin.Metadata
@@ -40,13 +40,13 @@ public final class test/TopLevel {
     private final static @org.jetbrains.annotations.NotNull field q: java.lang.String
     private final @org.jetbrains.annotations.NotNull field x: java.lang.String
     private final field y: int
-    inner class test/TopLevel$Companion
-    inner class test/TopLevel$InnerInterface
-    inner class test/TopLevel$InnerObject
-    inner class test/TopLevel$NestedClass
     public method <init>(): void
     public final method b(): void
     public final static @org.jetbrains.annotations.NotNull method getQ(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String
     public final method getY(): int
+    public final inner class test/TopLevel$Companion
+    public final inner class test/TopLevel$InnerObject
+    public final inner class test/TopLevel$NestedClass
+    public inner class test/TopLevel$InnerInterface
 }
diff --git a/compiler/testData/codegen/kapt/interfaceImpls.txt b/compiler/testData/codegen/kapt/interfaceImpls.txt
index 8139ff7337b..0cf3ceed61c 100644
--- a/compiler/testData/codegen/kapt/interfaceImpls.txt
+++ b/compiler/testData/codegen/kapt/interfaceImpls.txt
@@ -1,14 +1,14 @@
 @kotlin.Metadata
 public final class A$DefaultImpls {
-    inner class A$DefaultImpls
     public static method a(@org.jetbrains.annotations.NotNull p0: A): void
+    public final inner class A$DefaultImpls
 }
 
 @kotlin.Metadata
 public interface A {
-    inner class A$DefaultImpls
     public abstract method a(): void
     public abstract method b(): void
+    public final inner class A$DefaultImpls
 }
 
 @kotlin.Metadata
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
index 9d7da9c91e2..312114efef9 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
@@ -146,6 +146,9 @@ class BytecodeListingTextCollectingVisitor(val filter: Filter, val withSignature
         }
     }
 
+    private fun getModifiers(target: ModifierTarget, access: Int) =
+        MODIFIERS.filter { it.hasModifier(access, target) }.joinToString(separator = " ") { it.text }
+
     private fun classOrInterface(access: Int): String {
         return when {
             access and ACC_ANNOTATION != 0 -> "annotation class"
@@ -266,15 +269,21 @@ class BytecodeListingTextCollectingVisitor(val filter: Filter, val withSignature
         if (!filter.shouldWriteInnerClass(name)) {
             return
         }
-        if (innerName == null) {
-            assertNull(outerName, "Anonymous classes should have neither innerName nor outerName. Name=$name, outerName=$outerName")
-            declarationsInsideClass.add(Declaration("inner (anonymous) class $name"))
-        } else if (outerName == null) {
-            declarationsInsideClass.add(Declaration("inner (local) class $name $innerName"))
-        } else if (name == "$outerName$$innerName") {
-            declarationsInsideClass.add(Declaration("inner class $name"))
-        } else {
-            declarationsInsideClass.add(Declaration("inner (unrecognized) class $name $outerName $innerName"))
+
+        when {
+            innerName == null -> {
+                assertNull(outerName, "Anonymous classes should have neither innerName nor outerName. Name=$name, outerName=$outerName")
+                declarationsInsideClass.add(Declaration("inner (anonymous) class $name"))
+            }
+            outerName == null -> {
+                declarationsInsideClass.add(Declaration("inner (local) class $name $innerName"))
+            }
+            name == "$outerName$$innerName" -> {
+                declarationsInsideClass.add(Declaration("${getModifiers(ModifierTarget.CLASS, access)} inner class $name"))
+            }
+            else -> {
+                declarationsInsideClass.add(Declaration("inner (unrecognized) class $name $outerName $innerName"))
+            }
         }
     }
 }
diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt
index f0390263a84..92ad216fcf5 100644
--- a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt
+++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt
@@ -5,23 +5,23 @@ public annotation class AllOpen
 @kotlin.Metadata
 public final class Test$Inner {
     synthetic final field this$0: Test
-    inner class Test$Inner
     public method <init>(p0: Test): void
     public final method innerMethod(): void
+    public final inner class Test$Inner
 }
 
 @kotlin.Metadata
 public final class Test$Nested {
-    inner class Test$Nested
     public method <init>(): void
     public final method nestedMethod(): void
+    public final inner class Test$Nested
 }
 
 @AllOpen
 @kotlin.Metadata
 public class Test {
-    inner class Test$Inner
-    inner class Test$Nested
     public method <init>(): void
     public method testMethod(): void
-}
\ No newline at end of file
+    public final inner class Test$Inner
+    public final inner class Test$Nested
+}
diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt
index 22deef5b30f..fa8f76af356 100644
--- a/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt
+++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt
@@ -4,42 +4,42 @@ public annotation class AllOpen
 
 @kotlin.Metadata
 public class Sealed$C1 {
-    inner class Sealed$C1
     public method <init>(): void
+    public inner class Sealed$C1
 }
 
 @kotlin.Metadata
 public class Sealed$C2 {
-    inner class Sealed$C2
     public method <init>(): void
+    public inner class Sealed$C2
 }
 
 @AllOpen
 @kotlin.Metadata
 public abstract class Sealed {
-    inner class Sealed$C1
-    inner class Sealed$C2
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public inner class Sealed$C1
+    public inner class Sealed$C2
 }
 
 @AllOpen
 @kotlin.Metadata
 public class Sealed2$C1 {
-    inner class Sealed2$C1
     public method <init>(): void
+    public inner class Sealed2$C1
 }
 
 @kotlin.Metadata
 public final class Sealed2$C2 {
-    inner class Sealed2$C2
     public method <init>(): void
+    public final inner class Sealed2$C2
 }
 
 @kotlin.Metadata
 public abstract class Sealed2 {
-    inner class Sealed2$C1
-    inner class Sealed2$C2
     private method <init>(): void
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
\ No newline at end of file
+    public final inner class Sealed2$C2
+    public inner class Sealed2$C1
+}
diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt b/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt
index a9d9102ed51..afd2fdc41be 100644
--- a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt
+++ b/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt
@@ -25,15 +25,15 @@ public abstract class Base_ShouldBeOpen {
 
 @kotlin.Metadata
 public final class Intf$DefaultImpls {
-    inner class Intf$DefaultImpls
     public static method intfMethod(@org.jetbrains.annotations.NotNull p0: Intf): void
+    public final inner class Intf$DefaultImpls
 }
 
 @AllOpen
 @kotlin.Metadata
 public interface Intf {
-    inner class Intf$DefaultImpls
     public abstract method intfMethod(): void
+    public final inner class Intf$DefaultImpls
 }
 
 @kotlin.Metadata
diff --git a/plugins/jvm-abi-gen/testData/content/class/signatures.txt b/plugins/jvm-abi-gen/testData/content/class/signatures.txt
index 6b50970d47a..6fdd003c60f 100644
--- a/plugins/jvm-abi-gen/testData/content/class/signatures.txt
+++ b/plugins/jvm-abi-gen/testData/content/class/signatures.txt
@@ -1,13 +1,12 @@
 @kotlin.Metadata
 public final class test/BaseClass$Companion {
-    inner class test/BaseClass$Companion
     public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final inner class test/BaseClass$Companion
 }
 @kotlin.Metadata
 public class test/BaseClass {
     public final static @org.jetbrains.annotations.NotNull field Companion: test.BaseClass$Companion
     public final static field basePublicConst: int
-    inner class test/BaseClass$Companion
     public method <init>(): void
     public final method baseClassInternalFun$main(): int
     protected final method baseClassProtectedFun(): int
@@ -15,24 +14,25 @@ public class test/BaseClass {
     public final method getBaseClassInternalVal$main(): int
     protected final method getBaseClassProtectedVal(): int
     public method getBaseClassPublicVal(): int
+    public final inner class test/BaseClass$Companion
 }
 @kotlin.Metadata
 public final class test/Class$NestedInnerClass$NestedNestedInnerClass {
-    inner class test/Class$NestedInnerClass
-    inner class test/Class$NestedInnerClass$NestedNestedInnerClass
     public method <init>(): void
+    private final inner class test/Class$NestedInnerClass
+    public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
 }
 @kotlin.Metadata
 final class test/Class$NestedInnerClass {
-    inner class test/Class$NestedInnerClass
-    inner class test/Class$NestedInnerClass$NestedNestedInnerClass
     public method <init>(): void
+    private final inner class test/Class$NestedInnerClass
+    public final inner class test/Class$NestedInnerClass$NestedNestedInnerClass
 }
 @kotlin.Metadata
 public final class test/Class {
-    inner class test/Class$NestedInnerClass
     public method <init>(): void
     public final method classPublicMethod(): void
+    private final inner class test/Class$NestedInnerClass
 }
 @kotlin.Metadata
 public interface test/Interface