diff --git a/compiler/testData/readKotlinBinaryClass/class/Class.txt b/compiler/testData/readKotlinBinaryClass/class/Class.txt
index 997d86eccb8..30d6176a044 100644
--- a/compiler/testData/readKotlinBinaryClass/class/Class.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/Class.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Ramification : jet.Any {
-    final /*constructor*/ fun <init>(): test.Ramification
+internal final class test.Ramification : jet.Any {
+    public final /*constructor*/ fun <init>(): test.Ramification
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
index e6b90f47024..8c4c9e067ac 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
+internal final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
index 498372ec0f8..8fe38d89d34 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
@@ -1,8 +1,8 @@
 namespace test
 
-final class test.Outer : jet.Any {
-    final /*constructor*/ fun <init>(): test.Outer
-    final class test.Outer.Inner : jet.Any {
-        final /*constructor*/ fun <init>(): test.Outer.Inner
+internal final class test.Outer : jet.Any {
+    internal final class test.Outer.Inner : jet.Any {
+        public final /*constructor*/ fun <init>(): test.Outer.Inner
     }
+    public final /*constructor*/ fun <init>(): test.Outer
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
index 33cd57d3606..1815c64bb99 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
+internal final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
index fad9d240eb7..fd440ea3475 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
+internal final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
index 5b2c5a5739d..a127406038c 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
+internal final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
index c03bf1612a8..1f6d862a276 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
+internal final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
index 0341bc2d14d..0331bb83f2a 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
@@ -1,7 +1,7 @@
 namespace test
 
-final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
+internal final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
 }
-abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
+internal abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
index 823c4625a52..41f14b40c5e 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
+internal final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
index 8f912e55096..a4589be92f7 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+internal final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
index 28b9ee31096..e2b68e98eaa 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
+internal final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
index 8f912e55096..a4589be92f7 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+internal final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    public final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
index 703352d6f10..0b54d6682ce 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+internal final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
index 768ac304ecc..3f4033402c5 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+internal final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
index ac6c373e15b..f8399b1b5a9 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
@@ -1,8 +1,8 @@
 namespace test
 
-abstract class test.Aaa : jet.Any {
-    final /*constructor*/ fun <init>(): test.Aaa
+internal abstract class test.Aaa : jet.Any {
+    public final /*constructor*/ fun <init>(): test.Aaa
 }
-final class test.Bbb : test.Aaa {
-    final /*constructor*/ fun <init>(): test.Bbb
+internal final class test.Bbb : test.Aaa {
+    public final /*constructor*/ fun <init>(): test.Bbb
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
index 49ef7be6755..6853befd00d 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
@@ -1,8 +1,8 @@
 namespace test
 
-abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
+internal abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
 }
-final class test.Bbb : test.Aaa<java.util.Random> {
-    final /*constructor*/ fun <init>(): test.Bbb
+internal final class test.Bbb : test.Aaa<java.util.Random> {
+    public final /*constructor*/ fun <init>(): test.Bbb
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
index 75482d35622..18daa661e41 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
@@ -1,7 +1,7 @@
 namespace test
 
-abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+internal abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
 }
-final class test.Bbb : test.Aaa<java.util.Random> {
-    final /*constructor*/ fun <init>(): test.Bbb
+internal final class test.Bbb : test.Aaa<java.util.Random> {
+    public final /*constructor*/ fun <init>(): test.Bbb
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt b/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
index 498372ec0f8..8fe38d89d34 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
@@ -1,8 +1,8 @@
 namespace test
 
-final class test.Outer : jet.Any {
-    final /*constructor*/ fun <init>(): test.Outer
-    final class test.Outer.Inner : jet.Any {
-        final /*constructor*/ fun <init>(): test.Outer.Inner
+internal final class test.Outer : jet.Any {
+    internal final class test.Outer.Inner : jet.Any {
+        public final /*constructor*/ fun <init>(): test.Outer.Inner
     }
+    public final /*constructor*/ fun <init>(): test.Outer
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt b/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt
index fef91cbe9b3..1bf5f55541e 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt
@@ -1,11 +1,11 @@
 namespace test
 
-final class test.Outer : jet.Any {
-    final /*constructor*/ fun <init>(): test.Outer
-    open class test.Outer.Inner1 : jet.Any {
-        final /*constructor*/ fun <init>(): test.Outer.Inner1
+internal final class test.Outer : jet.Any {
+    internal final class test.Outer.Inner2 : test.Outer.Inner1 {
+        public final /*constructor*/ fun <init>(): test.Outer.Inner2
     }
-    final class test.Outer.Inner2 : test.Outer.Inner1 {
-        final /*constructor*/ fun <init>(): test.Outer.Inner2
+    internal open class test.Outer.Inner1 : jet.Any {
+        public final /*constructor*/ fun <init>(): test.Outer.Inner1
     }
+    public final /*constructor*/ fun <init>(): test.Outer
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/Trait.txt b/compiler/testData/readKotlinBinaryClass/class/Trait.txt
index a7feba41b94..ebf51fb8b60 100644
--- a/compiler/testData/readKotlinBinaryClass/class/Trait.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/Trait.txt
@@ -1,4 +1,4 @@
 namespace test
 
-abstract trait test.Trtrtr : jet.Any {
+internal abstract trait test.Trtrtr : jet.Any {
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
index f0fb0bace37..9f40b75bee0 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
-    final fun f(/*0*/ t: T): jet.Int
+internal final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
+    internal final fun f(/*0*/ t: T): jet.Int
+    public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
index cff20f35b58..1e28d41ce42 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
-    final fun f(/*0*/ t: T): jet.Int
+internal final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
+    internal final fun f(/*0*/ t: T): jet.Int
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt b/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt
index 38249f2f6c7..9c6ec32a89a 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt
@@ -1,9 +1,9 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    open fun f(): jet.String
+internal abstract trait test.A : jet.Any {
+    internal open fun f(): jet.String
 }
-final class test.B : test.A {
-    final /*constructor*/ fun <init>(): test.B
-    open override /*1*/ fun f(): jet.String
+internal final class test.B : test.A {
+    internal open override /*1*/ fun f(): jet.String
+    public final /*constructor*/ fun <init>(): test.B
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
index 50d7dc79c8f..91c03c5a6a2 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
@@ -1,10 +1,10 @@
 namespace test
 
-open class test.Base</*0*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
-    final fun foo(): T
+internal open class test.Base</*0*/ T : jet.Any?> : jet.Any {
+    internal final fun foo(): T
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
 }
-final class test.Inh : test.Base<jet.String> {
-    final /*constructor*/ fun <init>(): test.Inh
-    final override /*1*/ fun foo(): jet.String
+internal final class test.Inh : test.Base<jet.String> {
+    internal final override /*1*/ fun foo(): jet.String
+    public final /*constructor*/ fun <init>(): test.Inh
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt
index f1bb74230bc..4800008c60b 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt
@@ -1,5 +1,5 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    final fun f(): jet.String
+internal abstract trait test.A : jet.Any {
+    internal final fun f(): jet.String
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt
index 92776e23a73..14b2643c055 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt
@@ -1,5 +1,5 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    open fun f(): jet.String
+internal abstract trait test.A : jet.Any {
+    internal open fun f(): jet.String
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
index 7021e357fde..e22e3ad7a6a 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
@@ -1,9 +1,9 @@
 namespace test
 
-final class test.ClassObjectDeclaresProperty : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
-        final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
-        final val i: jet.Int
+internal final class test.ClassObjectDeclaresProperty : jet.Any {
+    public final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
+    internal final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
+        internal final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
+        internal final val i: jet.Int
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
index 8c8fe0c66c5..c203e019383 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
@@ -1,9 +1,9 @@
 namespace test
 
-final class test.ClassObjectDeclaresProperty : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
-        final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
-        final var s: jet.String
+internal final class test.ClassObjectDeclaresProperty : jet.Any {
+    public final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
+    internal final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
+        internal final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
+        internal final var s: jet.String
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
index ead6b9d20f6..cb3d6016fee 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
@@ -1,10 +1,10 @@
 namespace test
 
-abstract trait test.Bbb : jet.Any {
+internal abstract trait test.Bbb : jet.Any {
 }
-final class test.ClassObjectextendsTrait : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait
-    final object test.ClassObjectextendsTrait.<no name provided> : test.Bbb {
-        final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait.<no name provided>
+internal final class test.ClassObjectextendsTrait : jet.Any {
+    public final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait
+    internal final object test.ClassObjectextendsTrait.<no name provided> : test.Bbb {
+        internal final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait.<no name provided>
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
index d9387b9b112..65410e62216 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -1,10 +1,10 @@
 namespace test
 
-abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
+internal abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
 }
-final class test.ClassObjectExtendsTraitWithTP : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
-    final object test.ClassObjectExtendsTraitWithTP.<no name provided> : test.Bbb<jet.String> {
-        final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP.<no name provided>
+internal final class test.ClassObjectExtendsTraitWithTP : jet.Any {
+    public final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
+    internal final object test.ClassObjectExtendsTraitWithTP.<no name provided> : test.Bbb<jet.String> {
+        internal final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP.<no name provided>
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt b/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
index 2c257b95113..5845b19fab9 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
@@ -1,8 +1,8 @@
 namespace test
 
-final class test.SimpleClassObject : jet.Any {
-    final /*constructor*/ fun <init>(): test.SimpleClassObject
-    final object test.SimpleClassObject.<no name provided> : jet.Any {
-        final /*constructor*/ fun <init>(): test.SimpleClassObject.<no name provided>
+internal final class test.SimpleClassObject : jet.Any {
+    public final /*constructor*/ fun <init>(): test.SimpleClassObject
+    internal final object test.SimpleClassObject.<no name provided> : jet.Any {
+        internal final /*constructor*/ fun <init>(): test.SimpleClassObject.<no name provided>
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
index 3b49c0dd10f..ca24e74d318 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructor0 : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassWithConstructor0
+internal final class test.ClassWithConstructor0 : jet.Any {
+    public final /*constructor*/ fun <init>(): test.ClassWithConstructor0
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
index d7ccb4a3cee..20abb958ce0 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructor1 : jet.Any {
-    final /*constructor*/ fun <init>(/*0*/ p: jet.Int): test.ClassWithConstructor1
+internal final class test.ClassWithConstructor1 : jet.Any {
+    public final /*constructor*/ fun <init>(/*0*/ p: jet.Int): test.ClassWithConstructor1
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt
index 7bda41ff97d..45b52b4f15d 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorWithValueParamWithDefaultValue : jet.Any {
-    final /*constructor*/ fun <init>(/*0*/ p: jet.Int = ?): test.ClassWithConstructorWithValueParamWithDefaultValue
+internal final class test.ClassWithConstructorWithValueParamWithDefaultValue : jet.Any {
+    public final /*constructor*/ fun <init>(/*0*/ p: jet.Int = ?): test.ClassWithConstructorWithValueParamWithDefaultValue
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt
index c00e40c8e57..830aadf3868 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.TestingKotlinCollections : jet.Any {
-    final /*constructor*/ fun <init>(/*0*/ arguments: java.util.Collection<jet.String>): test.TestingKotlinCollections
-    final val arguments: java.util.Collection<jet.String>
+internal final class test.TestingKotlinCollections : jet.Any {
+    internal final val arguments: java.util.Collection<jet.String>
+    public final /*constructor*/ fun <init>(/*0*/ arguments: java.util.Collection<jet.String>): test.TestingKotlinCollections
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
index 4fcd2c361c6..749dc66c23b 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index ee30c5099ae..6d97ad5636e 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 03715bc4e99..fc302fa09ee 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
+internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
index 25b3ae7a0b5..621411efdce 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
+internal final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index d2e41078f2d..236e7b102fb 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
+internal final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
index 28e3b2af629..dad12e4cb55 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ T : jet.Any?>f(): jet.Int
+internal final fun </*0*/ T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
index e216cd7c078..2addca2eda0 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ in T : jet.Any?>f(): jet.Int
+internal final fun </*0*/ in T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
index c9cadf02a74..a3b6c2d83d7 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ out T : jet.Any?>f(): jet.Int
+internal final fun </*0*/ out T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
index 20b314054f4..d44507d21d6 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+internal final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
index 20b314054f4..d44507d21d6 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+internal final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index 4528babe000..4ccfea750ba 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
+internal final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
index e1976eec789..67fd5d2c5a1 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ in P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
+internal final fun </*0*/ in P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index 18a25f21997..5a78716c6d8 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -1,7 +1,7 @@
 namespace test
 
-abstract trait test.Bar : jet.Any {
+internal abstract trait test.Bar : jet.Any {
 }
-abstract trait test.Foo : jet.Any {
+internal abstract trait test.Foo : jet.Any {
 }
-final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
+internal final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index 35aacfd371b..216a79087fc 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ A : java.lang.Number>uno(): jet.Int
+internal final fun </*0*/ A : java.lang.Number>uno(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index 42c040ae7bc..8c052da2065 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
+internal final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index 0048367b908..b8e98423529 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ A : java.io.Serializable>dos(): jet.Int
+internal final fun </*0*/ A : java.io.Serializable>dos(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
index 5a5346c4082..d37746bce09 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
+internal final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
index 9eec690e2fc..9aeac632a13 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
+internal final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
index 6ebac903e39..f097ec54ac1 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
+internal final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
index 464e9502aa4..4729785d7c2 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0*/ P : jet.Any?, /*1*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
+internal final fun </*0*/ P : jet.Any?, /*1*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
index 951d206f3ce..2f82b0fb738 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence>): jet.Int
+internal final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence>): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
index f7b6216a718..81bd269f6d6 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence?>): jet.Int
+internal final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence?>): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
index a9d88b33a6d..78a36cc0c20 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(/*0*/ a: java.lang.Integer?): jet.Int
+internal final fun fff(/*0*/ a: java.lang.Integer?): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
index 1174ef44a49..2d7de5ee5e9 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ffgg(): java.util.List<java.lang.CharSequence>
+internal final fun ffgg(): java.util.List<java.lang.CharSequence>
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
index 0cd4ac3d8eb..3eb062f42a6 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ffgg(): java.util.List<java.lang.CharSequence?>
+internal final fun ffgg(): java.util.List<java.lang.CharSequence?>
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
index 026f790dd7f..a705f7b60d1 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.River : jet.Any {
-    final /*constructor*/ fun <init>(): test.River
-    final fun song(): jet.Int
+internal final class test.River : jet.Any {
+    internal final fun song(): jet.Int
+    public final /*constructor*/ fun <init>(): test.River
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
index ca7cfc07bc7..3090d29cfdf 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassFunGetFoo : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
-    final fun getFoo(): jet.Int
+internal final class test.ClassFunGetFoo : jet.Any {
+    internal final fun getFoo(): jet.Int
+    public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
index 0f99c897718..9dadff1007e 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -1,7 +1,7 @@
 namespace test
 
-final class test.ClassFunGetFoo : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
-    final fun getFoo(): jet.Int
-    final fun setFoo(/*0*/ p: jet.Int): jet.Tuple0
+internal final class test.ClassFunGetFoo : jet.Any {
+    internal final fun getFoo(): jet.Int
+    internal final fun setFoo(/*0*/ p: jet.Int): jet.Tuple0
+    public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
index ef708fc5318..54da52d550c 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassFunGetFoo : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
-    final fun set(/*0*/ p: jet.Int): jet.Tuple0
+internal final class test.ClassFunGetFoo : jet.Any {
+    internal final fun set(/*0*/ p: jet.Int): jet.Tuple0
+    public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
index 38ba1ac10d5..a956472f80a 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun jet.Int.shuffle(): jet.Int
+internal final fun jet.Int.shuffle(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
index 5dcea8467a7..3b0deec0476 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtFunInClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.ExtFunInClass
-    final fun jet.Int.shuffle(): jet.Int
+internal final class test.ExtFunInClass : jet.Any {
+    internal final fun jet.Int.shuffle(): jet.Int
+    public final /*constructor*/ fun <init>(): test.ExtFunInClass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
index 6a1fc5da2ba..ba60631fd30 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun funDefaultArg(/*0*/ p: jet.Int, /*1*/ q: jet.Int = ?, /*2*/ r: jet.Int = ?): jet.Int
+internal final fun funDefaultArg(/*0*/ p: jet.Int, /*1*/ q: jet.Int = ?, /*2*/ r: jet.Int = ?): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
index 1088076267e..b77de56ace4 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(/*0*/ a: java.lang.Integer): jet.Int
+internal final fun fff(/*0*/ a: java.lang.Integer): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
index 42fe439fda6..1279803fae8 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int /*jet.IntArray*/): jet.Int
+internal final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int /*jet.IntArray*/): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
index 03d714cf260..a31d6d26b76 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer /*jet.Array<java.lang.Integer>*/): jet.Int
+internal final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer /*jet.Array<java.lang.Integer>*/): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
index 33375927f26..427439aa9f4 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
@@ -1,6 +1,6 @@
 namespace test
 
-abstract class test.ModifierAbstract : jet.Any {
-    final /*constructor*/ fun <init>(): test.ModifierAbstract
-    abstract fun abs(): jet.Int
+internal abstract class test.ModifierAbstract : jet.Any {
+    internal abstract fun abs(): jet.Int
+    public final /*constructor*/ fun <init>(): test.ModifierAbstract
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
index a131a16e2b2..fdd2deac8e7 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.ModifierOpen : jet.Any {
-    final /*constructor*/ fun <init>(): test.ModifierOpen
-    open fun abs(): jet.Int
+internal open class test.ModifierOpen : jet.Any {
+    internal open fun abs(): jet.Int
+    public final /*constructor*/ fun <init>(): test.ModifierOpen
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
index 651faaf5645..07634e288be 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun f(): jet.Int
+internal final fun f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
index b4cc8a16d87..6c240b5397c 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun getFoo(): jet.Int
+internal final fun getFoo(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
index 0c2b891746d..9eaa7a59198 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ff(): java.lang.Integer
+internal final fun ff(): java.lang.Integer
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
index a5282e19ace..e0a7bea7a15 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun ff(): java.lang.Integer?
+internal final fun ff(): java.lang.Integer?
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
index e9c0e59b80b..7dde91c6866 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassVal : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassVal
-    final val aa: jet.Int
+internal final class test.ClassVal : jet.Any {
+    internal final val aa: jet.Int
+    public final /*constructor*/ fun <init>(): test.ClassVal
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
index fbde0618de8..72fbf945f48 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
@@ -1,6 +1,6 @@
 namespace test
 
-abstract class test.ClassValAbstract : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassValAbstract
-    abstract val a: jet.Int
+internal abstract class test.ClassValAbstract : jet.Any {
+    internal abstract val a: jet.Int
+    public final /*constructor*/ fun <init>(): test.ClassValAbstract
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
index a8e3f4bba08..f7d01243bd0 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassVar : jet.Any {
-    final /*constructor*/ fun <init>(): test.ClassVar
-    final var aa: jet.Int
+internal final class test.ClassVar : jet.Any {
+    internal final var aa: jet.Int
+    public final /*constructor*/ fun <init>(): test.ClassVar
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt b/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
index 3ff66968f44..558def8cb64 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val java.util.Collection<out jet.Any?>.anotherSize: jet.Int
+internal final val java.util.Collection<out jet.Any?>.anotherSize: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
index 552ccb57732..a1ff93f1ef5 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+internal final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
index 8f3e2507bc1..db78512b8d5 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtPropInClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.ExtPropInClass
-    final val jet.Int.itIs: jet.Int
+internal final class test.ExtPropInClass : jet.Any {
+    internal final val jet.Int.itIs: jet.Int
+    public final /*constructor*/ fun <init>(): test.ExtPropInClass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
index e27cb601762..9b9c64ee579 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val jet.Int.itIs: jet.Int
+internal final val jet.Int.itIs: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
index 20ce3fee9ae..789a8c644bc 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val jet.Int.ggg: java.lang.CharSequence
+internal final val jet.Int.ggg: java.lang.CharSequence
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
index de7b37e48c0..26aa43df879 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val jet.Int.ggg: java.lang.CharSequence?
+internal final val jet.Int.ggg: java.lang.CharSequence?
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
index 3d0d304128b..8d516eba1d9 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.ExtValInClass
-    final val jet.Int.asas: java.util.List<jet.Int>?
+internal final class test.ExtValInClass : jet.Any {
+    internal final val jet.Int.asas: java.util.List<jet.Int>?
+    public final /*constructor*/ fun <init>(): test.ExtValInClass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
index 03038b2a6ab..24dbe63e999 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
-    final val jet.Int.asas: T
+internal final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
+    internal final val jet.Int.asas: T
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
index a92f1404550..ef79cfc5a40 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    final val jet.Int.asas: P?
+internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final val jet.Int.asas: P?
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
index a375126ce7b..3cc699a0776 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    final val P.asas: jet.Int
+internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final val P.asas: jet.Int
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
index a4092845e49..d0f147e9a8f 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+internal final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
index 0d7f875c338..d3b2318ceea 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtPropInClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.ExtPropInClass
-    final var jet.Int.itIs: jet.Int
+internal final class test.ExtPropInClass : jet.Any {
+    internal final var jet.Int.itIs: jet.Int
+    public final /*constructor*/ fun <init>(): test.ExtPropInClass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
index 3d8542b07fe..9c44dc4e6b4 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var jet.Int.ggg: jet.Int
+internal final var jet.Int.ggg: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
index d19ade078af..052a4d01cbb 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    final var jet.Int.asas: P
+internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final var jet.Int.asas: P
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
index c298102461b..122ba3c4ef7 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
-    final var jet.Int.asas: P?
+internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final var jet.Int.asas: P?
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
index 90403d1fa37..584a0bb69b8 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
+internal final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
index 2cf2fc92f92..4a14bb0ed03 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    final var P.asas: jet.Int
+internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final var P.asas: jet.Int
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
index 81d318a0a8e..93d9f084a13 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
-    final var P?.asas: jet.Int
+internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    internal final var P?.asas: jet.Int
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
index 64bdabda971..74a6b3ba32c 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
@@ -1,4 +1,4 @@
 namespace test
 
-final var jet.Int.junk: jet.Short
-final val jet.String.junk: jet.Int
+internal final val jet.String.junk: jet.Int
+internal final var jet.Int.junk: jet.Short
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt b/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
index c9a7d2d6dde..c5a6182c968 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val nsVal: jet.Int
+internal final val nsVal: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt b/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
index efb570b510d..cf592e9983c 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var nsVal: jet.Int
+internal final var nsVal: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt b/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
index 6d0324ab1a5..7f7b3095a72 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
@@ -1,10 +1,10 @@
 namespace test
 
-open class test.BaseClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.BaseClass
-    open val shape: jet.String
+internal open class test.BaseClass : jet.Any {
+    internal open val shape: jet.String
+    public final /*constructor*/ fun <init>(): test.BaseClass
 }
-open class test.Subclass : test.BaseClass {
-    final /*constructor*/ fun <init>(): test.Subclass
-    open val shape: jet.String
+internal open class test.Subclass : test.BaseClass {
+    internal open val shape: jet.String
+    public final /*constructor*/ fun <init>(): test.Subclass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt b/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
index e44cc22ce18..297bdb7e7e5 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
@@ -1,9 +1,9 @@
 namespace test
 
-open class test.Subclass : test.Trait {
-    final /*constructor*/ fun <init>(): test.Subclass
-    open val shape: jet.String
+internal open class test.Subclass : test.Trait {
+    internal open val shape: jet.String
+    public final /*constructor*/ fun <init>(): test.Subclass
 }
-abstract trait test.Trait : jet.Any {
-    abstract val shape: jet.String
+internal abstract trait test.Trait : jet.Any {
+    internal abstract val shape: jet.String
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
index 795e64d5724..d01bf3e5239 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
@@ -1,10 +1,10 @@
 namespace test
 
-open class test.BaseClass : jet.Any {
-    final /*constructor*/ fun <init>(): test.BaseClass
-    final val exactly: jet.Int
+internal open class test.BaseClass : jet.Any {
+    internal final val exactly: jet.Int
+    public final /*constructor*/ fun <init>(): test.BaseClass
 }
-final class test.Subclass : test.BaseClass {
-    final /*constructor*/ fun <init>(): test.Subclass
-    final val exactly: jet.Int
+internal final class test.Subclass : test.BaseClass {
+    internal final val exactly: jet.Int
+    public final /*constructor*/ fun <init>(): test.Subclass
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt b/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt
index 5c1235faa28..398e93ab14c 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt
@@ -1,5 +1,5 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    open var v: jet.String
+internal abstract trait test.A : jet.Any {
+    internal open var v: jet.String
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt b/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt
index 4d934ee7346..35e9fddd9a8 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt
@@ -1,5 +1,5 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    open val v: jet.String
+internal abstract trait test.A : jet.Any {
+    internal open val v: jet.String
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt b/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
index b342f5730d3..0128922ec34 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
@@ -1,9 +1,9 @@
 namespace test
 
-abstract trait test.A : jet.Any {
-    open var v: jet.String
+internal abstract trait test.A : jet.Any {
+    internal open var v: jet.String
 }
-final class test.B : test.A {
-    final /*constructor*/ fun <init>(): test.B
-    open var v: jet.String
+internal final class test.B : test.A {
+    internal open var v: jet.String
+    public final /*constructor*/ fun <init>(): test.B
 }
diff --git a/compiler/testData/readKotlinBinaryClass/type/Any.txt b/compiler/testData/readKotlinBinaryClass/type/Any.txt
index de4dee85d4b..a97572afcf5 100644
--- a/compiler/testData/readKotlinBinaryClass/type/Any.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/Any.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun any(): jet.Any
+internal final fun any(): jet.Any
diff --git a/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt b/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
index f2ce12403f0..245ead2f2be 100644
--- a/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun anyq(): jet.Any?
+internal final fun anyq(): jet.Any?
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
index dae1696fc49..9c26f3420ed 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.Array<jet.Int>
+internal final fun fff(): jet.Array<jet.Int>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
index 0d9ad43d29a..6263475222d 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun nothing(): jet.Array<java.lang.Integer>
+internal final fun nothing(): jet.Array<java.lang.Integer>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
index cf3e3847746..74455ff59a5 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.Array<jet.String>
+internal final fun fff(): jet.Array<jet.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt b/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
index 326dc4b7e9f..13d5255ecfb 100644
--- a/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fun1(): jet.Function1<jet.String, jet.Int>
+internal final fun fun1(): jet.Function1<jet.String, jet.Int>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Int.txt b/compiler/testData/readKotlinBinaryClass/type/Int.txt
index be7b75cbd02..2a86f9b8fa1 100644
--- a/compiler/testData/readKotlinBinaryClass/type/Int.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/Int.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.Int
+internal final fun fff(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntArray.txt b/compiler/testData/readKotlinBinaryClass/type/IntArray.txt
index a9e83b08f1d..9badf046b43 100644
--- a/compiler/testData/readKotlinBinaryClass/type/IntArray.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/IntArray.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun nothing(): jet.IntArray
+internal final fun nothing(): jet.IntArray
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntQ.txt b/compiler/testData/readKotlinBinaryClass/type/IntQ.txt
index fdee3bc8c01..ce046376ee8 100644
--- a/compiler/testData/readKotlinBinaryClass/type/IntQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/IntQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.Int?
+internal final fun fff(): jet.Int?
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
index 7197d2c4b6d..1bbd425153d 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun listOfAny(): java.util.List<jet.Any>
+internal final fun listOfAny(): java.util.List<jet.Any>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
index 54256674661..fd21244dc5e 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun listOfAnyQ(): java.util.List<jet.Any?>
+internal final fun listOfAnyQ(): java.util.List<jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
index 5301e8afa61..c175944f2f7 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun listOfStar(): java.util.List<out jet.Any?>
+internal final fun listOfStar(): java.util.List<out jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
index 74e684ab5a2..978809777c2 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): java.util.List<jet.String>
+internal final fun fff(): java.util.List<jet.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
index a9d3a359ec4..ab724d359e1 100644
--- a/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun listOfJlString(): java.util.List<java.lang.String>
+internal final fun listOfJlString(): java.util.List<java.lang.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Nothing.txt b/compiler/testData/readKotlinBinaryClass/type/Nothing.txt
index 68e4a57943e..e437e0e075d 100644
--- a/compiler/testData/readKotlinBinaryClass/type/Nothing.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/Nothing.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun nothing(): jet.Nothing
+internal final fun nothing(): jet.Nothing
diff --git a/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt b/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
index a13f80ff881..40cad307dd7 100644
--- a/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun nothingq(): jet.Nothing?
+internal final fun nothingq(): jet.Nothing?
diff --git a/compiler/testData/readKotlinBinaryClass/type/String.txt b/compiler/testData/readKotlinBinaryClass/type/String.txt
index de4ba4f553f..ee03f30909b 100644
--- a/compiler/testData/readKotlinBinaryClass/type/String.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/String.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.String
+internal final fun fff(): jet.String
diff --git a/compiler/testData/readKotlinBinaryClass/type/StringQ.txt b/compiler/testData/readKotlinBinaryClass/type/StringQ.txt
index 2c80bcf9067..e740f960b26 100644
--- a/compiler/testData/readKotlinBinaryClass/type/StringQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/StringQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): jet.String?
+internal final fun fff(): jet.String?
diff --git a/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt b/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
index f797b74576c..9cc0518dd8c 100644
--- a/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun tuple0(): jet.Tuple0
+internal final fun tuple0(): jet.Tuple0
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt b/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
index dc82cd08541..b33c15036a3 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun integer(): java.lang.Integer
+internal final fun integer(): java.lang.Integer
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
index 7e55758426a..e5432e982a4 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun integerq(): java.lang.Integer?
+internal final fun integerq(): java.lang.Integer?
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObject.txt b/compiler/testData/readKotlinBinaryClass/type/jlObject.txt
index 580d3e56183..5d9424ed1f5 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlObject.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlObject.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun obj(): java.lang.Object
+internal final fun obj(): java.lang.Object
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
index 1abdceafd6d..4577fe8a5f2 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun objq(): java.lang.Object?
+internal final fun objq(): java.lang.Object?
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlString.txt b/compiler/testData/readKotlinBinaryClass/type/jlString.txt
index 09522174694..c565dc22b44 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlString.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlString.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): java.lang.String
+internal final fun fff(): java.lang.String
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
index eb737e3ef39..8c02f0f7307 100644
--- a/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
+++ b/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun fff(): java.lang.String?
+internal final fun fff(): java.lang.String?