diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
index 2388cc9b8c2..bd8a97452fd 100644
--- a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
@@ -1,27 +1,27 @@
 namespace test
 
-abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
-    final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
-    open override /*1*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
-    open override /*1*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
-    open override /*1*/ fun compareTo(/*0*/ p0: java.util.Date?): jet.Int
-    open override /*1*/ fun compareTo(/*0*/ p0: jet.Any?): jet.Int
-    open override /*1*/ fun getDate(): jet.Int
-    open override /*1*/ fun getDay(): jet.Int
-    open override /*1*/ fun getHours(): jet.Int
-    open override /*1*/ fun getMinutes(): jet.Int
-    open override /*1*/ fun getMonth(): jet.Int
-    open override /*1*/ fun getSeconds(): jet.Int
-    open override /*1*/ fun getTime(): jet.Long
-    open override /*1*/ fun getTimezoneOffset(): jet.Int
-    open override /*1*/ fun getYear(): jet.Int
-    open override /*1*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
-    open override /*1*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
-    open override /*1*/ fun toGMTString(): jet.String?
-    open override /*1*/ fun toLocaleString(): jet.String?
+public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
+    public final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
+    public open override /*1*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
+    public open override /*1*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
+    public open override /*1*/ fun compareTo(/*0*/ p0: java.util.Date?): jet.Int
+    public open override /*1*/ fun compareTo(/*0*/ p0: jet.Any?): jet.Int
+    public open override /*1*/ fun getDate(): jet.Int
+    public open override /*1*/ fun getDay(): jet.Int
+    public open override /*1*/ fun getHours(): jet.Int
+    public open override /*1*/ fun getMinutes(): jet.Int
+    public open override /*1*/ fun getMonth(): jet.Int
+    public open override /*1*/ fun getSeconds(): jet.Int
+    public open override /*1*/ fun getTime(): jet.Long
+    public open override /*1*/ fun getTimezoneOffset(): jet.Int
+    public open override /*1*/ fun getYear(): jet.Int
+    public open override /*1*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
+    public open override /*1*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun toGMTString(): jet.String?
+    public open override /*1*/ fun toLocaleString(): jet.String?
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
index 01261cbf19a..aa310c17113 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithTypeParameter</*0*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeParameter<P>
+public final class test.ClassWithTypeP</*0*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeP<P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
index 0fde4b88b3c..f9cfcc96df5 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypeParameter<P, Q>
+public final class test.ClassWithTypePP</*0*/ P : jet.Any?, /*1*/ Q : P> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypePP<P, Q>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
index 2a9bc6f3e72..27467c8002b 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
@@ -1,7 +1,5 @@
 namespace test
 
-open class test.ClassWithTypePRefNext</*0*/ R : test.Foo<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ R : test.Foo<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
-}
-abstract trait test.Foo</*0*/ Q : jet.Any?> : java.lang.Object {
+public open class test.ClassWithTypePRefNext</*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
index 0b585a21baf..68098ef75ec 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
+public final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf<P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.txt b/compiler/testData/readJavaBinaryClass/FieldAsVar.txt
index 035a7880522..16dc92beaa1 100644
--- a/compiler/testData/readJavaBinaryClass/FieldAsVar.txt
+++ b/compiler/testData/readJavaBinaryClass/FieldAsVar.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.FieldAsVar : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.FieldAsVar
-    final var f: jet.Int
+public final class test.FieldAsVar : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.FieldAsVar
+    public final var f: jet.Int
 }
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
index 9dc72b5e98a..f654bb68067 100644
--- a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
+++ b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.FieldOfArrayType : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.FieldOfArrayType
-    final var files: jet.Array<java.io.File?>?
+public open class test.FieldOfArrayType : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.FieldOfArrayType
+    public final var files: jet.Array<java.io.File?>?
 }
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
index 1cc69e01fa0..eb77d5ad74d 100644
--- a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
+++ b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.FinalFieldAsVal : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.FinalFieldAsVal
-    final val f: jet.Int
+public final class test.FinalFieldAsVal : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.FinalFieldAsVal
+    public final val f: jet.Int
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.txt b/compiler/testData/readJavaBinaryClass/InnerClass.txt
index 5069969bb33..d58b0e44d39 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClass.txt
+++ b/compiler/testData/readJavaBinaryClass/InnerClass.txt
@@ -1,8 +1,8 @@
 namespace test
 
-open class test.Outer : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.Outer
-    open class test.Outer.Inner : java.lang.Object {
-        final /*constructor*/ fun <init>(): test.Outer.Inner
+public open class test.InnerClass : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.InnerClass
+    public open class test.InnerClass.Inner : java.lang.Object {
+        public final /*constructor*/ fun <init>(): test.InnerClass.Inner
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
index 3ab4218b5c0..7a237894e8d 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
@@ -1,8 +1,8 @@
 namespace test
 
-open class test.Outer</*0*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
-    open class test.Outer.Inner</*0*/ Q : P> : java.lang.Object {
-        final /*constructor*/ fun </*0*/ Q : P><init>(): test.Outer.Inner<Q>
+public open class test.InnerClassReferencesOuterTP</*0*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.InnerClassReferencesOuterTP<P>
+    public open class test.InnerClassReferencesOuterTP.Inner</*0*/ Q : P> : java.lang.Object {
+        public final /*constructor*/ fun </*0*/ Q : P><init>(): test.InnerClassReferencesOuterTP.Inner<Q>
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
index 569d57f2285..6b6742c89e9 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
@@ -1,13 +1,12 @@
 namespace test
 
-open class test.Outer</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.Outer<P, Q>
-    open class test.Outer.Inner : java.lang.Object {
-        final /*constructor*/ fun <init>(): test.Outer.Inner
+public open class test.InnerClassesInGeneric</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.InnerClassesInGeneric<P, Q>
+    public open class test.InnerClassesInGeneric.Inner : java.lang.Object {
+        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner
     }
-    open class test.Outer.Inner2 : test.Outer.Inner, test.Trait<P> {
-        final /*constructor*/ fun <init>(): test.Outer.Inner2
+    public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner, java.lang.Iterable<P> {
+        public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner2
+        public open override /*1*/ fun iterator(): java.util.Iterator<P>?
     }
 }
-abstract trait test.Trait</*0*/ P : jet.Any?> : java.lang.Object {
-}
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
index 25b12b9314c..71b7d70a5da 100644
--- a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
@@ -1,9 +1,9 @@
 namespace test
 
-final class test.Outer</*0*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer<P>
-    final class test.Outer.Inner : java.lang.Object {
-        final /*constructor*/ fun <init>(): test.Outer.Inner
-        final fun </*0*/ Q : P>f(): jet.Tuple0
+public final class test.MethodReferencesOuterClassTP</*0*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodReferencesOuterClassTP<P>
+    public final class test.MethodReferencesOuterClassTP.Inner : java.lang.Object {
+        public final /*constructor*/ fun <init>(): test.MethodReferencesOuterClassTP.Inner
+        public final fun </*0*/ Q : P>f(): jet.Tuple0
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt
index 9c83aa73f65..fcbca59b948 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt
@@ -1,8 +1,6 @@
 namespace test
 
-abstract trait test.Foo : java.lang.Object {
-}
-open class test.MethodTypePOneUpperBound : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodTypePOneUpperBound
-    open fun </*0*/ T : test.Foo?>bar(): jet.Tuple0
+public open class test.MethodTypePOneUpperBound : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodTypePOneUpperBound
+    public open fun </*0*/ T : java.lang.Cloneable?>bar(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt
index 2f4ccda8ad5..fd4f17472f4 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt
@@ -1,10 +1,6 @@
 namespace test
 
-abstract trait test.Bar : java.lang.Object {
-}
-abstract trait test.Foo : java.lang.Object {
-}
-open class test.MethodTypePTwoUpperBounds : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodTypePTwoUpperBounds
-    open fun </*0*/ T : test.Bar? & test.Foo?>foo(): jet.Tuple0
+public open class test.MethodTypePTwoUpperBounds : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodTypePTwoUpperBounds
+    public open fun </*0*/ T : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
index 48f22b40c19..dab635cc5d8 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.MethodWithTypeP : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithTypeP
-    final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
+public final class test.MethodWithTypeP : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithTypeP
+    public final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
index f751d4acd7e..a90e8166c56 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.MethodWithTypePP : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithTypePP
-    final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
+public final class test.MethodWithTypePP : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithTypePP
+    public final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
index 1a2941d1c4f..01f34dc8a98 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
-    final fun </*0*/ Q : P>f(): jet.Tuple0
+public open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP<P>
+    public final fun </*0*/ Q : P>f(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
index 8538e5765a4..c356cd01a95 100644
--- a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
+++ b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.MethosWithPRefTP : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethosWithPRefTP
-    final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P?): jet.Tuple0
+public final class test.MethosWithPRefTP : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethosWithPRefTP
+    public final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P?): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/MyException.txt b/compiler/testData/readJavaBinaryClass/MyException.txt
index 47001bd7ec2..f7d6a6a6c5d 100644
--- a/compiler/testData/readJavaBinaryClass/MyException.txt
+++ b/compiler/testData/readJavaBinaryClass/MyException.txt
@@ -1,5 +1,5 @@
 namespace test
 
-open class test.MyException : java.lang.Object {
-    final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException
+public open class test.MyException : java.lang.Object {
+    public final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException
 }
diff --git a/compiler/testData/readJavaBinaryClass/Simple.txt b/compiler/testData/readJavaBinaryClass/Simple.txt
index c61743bdbf0..eb3968ca248 100644
--- a/compiler/testData/readJavaBinaryClass/Simple.txt
+++ b/compiler/testData/readJavaBinaryClass/Simple.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Simple : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.Simple
+public final class test.Simple : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.Simple
 }
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.txt b/compiler/testData/readJavaBinaryClass/TwoFields.txt
index b94d56baa31..68c6f20e16d 100644
--- a/compiler/testData/readJavaBinaryClass/TwoFields.txt
+++ b/compiler/testData/readJavaBinaryClass/TwoFields.txt
@@ -1,7 +1,7 @@
 namespace test
 
-final class test.TwoFields : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.TwoFields
-    final var a: jet.Int
-    final var b: jet.Short
+public final class test.TwoFields : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.TwoFields
+    public final var a: jet.Int
+    public final var b: jet.Short
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt
index 4d95c1d5fd0..168b051262e 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 namespace test
 
-test.AnnotatedAnnotation() final annotation class test.AnnotatedAnnotation : jet.Any {
-    final /*constructor*/ fun <init>(): test.AnnotatedAnnotation
+test.AnnotatedAnnotation() public final annotation class test.AnnotatedAnnotation : jet.Any {
+    public final /*constructor*/ fun <init>(): test.AnnotatedAnnotation
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
index f35f76f1855..a3a02577822 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
+++ b/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
@@ -1,9 +1,6 @@
 namespace test
 
-final annotation class test.Aaa : jet.Any {
-    final /*constructor*/ fun <init>(): test.Aaa
-}
-open class test.HasAnnotatedMethod : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.HasAnnotatedMethod
-    open test.Aaa() fun f(): jet.Tuple0
+public open class test.AnnotatedMethod : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.AnnotatedMethod
+    public open java.lang.Deprecated() fun f(): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt
index 923d4f9ce03..9a863c3a96e 100644
--- a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt
+++ b/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final annotation class test.SimpleAnnotation : jet.Any {
-    final /*constructor*/ fun <init>(): test.SimpleAnnotation
+public final annotation class test.SimpleAnnotation : jet.Any {
+    public final /*constructor*/ fun <init>(): test.SimpleAnnotation
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
index e6cc796b4b3..926ee2a6345 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
@@ -1,5 +1,5 @@
 namespace test
 
-open class test.ConstructorGenericDeep : java.lang.Object {
-    final /*constructor*/ fun <init>(/*0*/ p0: java.lang.Class<jet.Any?>?): test.ConstructorGenericDeep
+public open class test.ConstructorGenericDeep : java.lang.Object {
+    public final /*constructor*/ fun <init>(/*0*/ p0: java.lang.Class<jet.Any?>?): test.ConstructorGenericDeep
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
index fba82a89b0e..98808de5f83 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
@@ -1,5 +1,5 @@
 namespace test
 
-open class test.ConstructorGenericSimple : java.lang.Object {
-    final /*constructor*/ fun <init>(/*0*/ p0: jet.Any?): test.ConstructorGenericSimple
+public open class test.ConstructorGenericSimple : java.lang.Object {
+    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Any?): test.ConstructorGenericSimple
 }
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
index 52489e9a4d8..3f9d824e170 100644
--- a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-open class test.ConstructorGenericUpperBound : java.lang.Object {
-    final /*constructor*/ fun <init>(/*0*/ p0: java.util.RandomAccess?): test.ConstructorGenericUpperBound
+public open class test.ConstructorGenericUpperBound : java.lang.Object {
+    public final /*constructor*/ fun <init>(/*0*/ p0: java.util.RandomAccess?): test.ConstructorGenericUpperBound
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
index b98d7b845cd..5334268899f 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
@@ -1,7 +1,7 @@
 namespace test
 
-open class test.DifferentGetterAndSetter : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.DifferentGetterAndSetter
-    open fun getSomething(): jet.Int
-    open fun setSomething(/*0*/ p0: jet.String?): jet.Tuple0
+public open class test.DifferentGetterAndSetter : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.DifferentGetterAndSetter
+    public open fun getSomething(): jet.Int
+    public open fun setSomething(/*0*/ p0: jet.String?): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
index 733e4057d2f..5617dfd6b66 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-abstract trait test.JavaBeanAbstractGetter : java.lang.Object {
-    abstract fun getRed(): jet.Int
+public abstract trait test.JavaBeanAbstractGetter : java.lang.Object {
+    public abstract fun getRed(): jet.Int
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
index 4adfde59e8f..40482144161 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.JavaBeanVal : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.JavaBeanVal
-    open fun getColor(): jet.String?
+public open class test.JavaBeanVal : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.JavaBeanVal
+    public open fun getColor(): jet.String?
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
index 18e00ff38d8..89e8e0837df 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
@@ -1,7 +1,7 @@
 namespace test
 
-open class test.JavaBeanVal : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.JavaBeanVal
-    open fun getColor(): jet.String?
-    open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
+public open class test.JavaBeanVar : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.JavaBeanVar
+    public open fun getColor(): jet.String?
+    public open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
index 1e3dbc0333d..2db1fd8edab 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,7 +1,7 @@
 namespace test
 
-open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : java.lang.Object {
-    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
-    open fun getCharacters(): java.util.ArrayList<P>?
-    open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
+public open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType<P>
+    public open fun getCharacters(): java.util.ArrayList<P>?
+    public open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
index 2727d7d7b1b..760c3f2fb6c 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
@@ -1,7 +1,7 @@
 namespace test
 
-open class test.TwoSetters : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.TwoSetters
-    open fun setSize(/*0*/ p0: jet.Int): jet.Tuple0
-    open fun setSize(/*0*/ p0: jet.String?): jet.Tuple0
+public open class test.TwoSetters : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.TwoSetters
+    public open fun setSize(/*0*/ p0: jet.Int): jet.Tuple0
+    public open fun setSize(/*0*/ p0: jet.String?): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt
index a35db7276fa..3d207f175a3 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithFunctionTypes : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithFunctionTypes
-    open fun foo(/*0*/ p0: jet.Function1<jet.String?, jet.String>): jet.ExtensionFunction0<jet.String, jet.String?>?
+public open class test.MethodWithFunctionTypes : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithFunctionTypes
+    public open fun foo(/*0*/ p0: jet.Function1<jet.String?, jet.String>): jet.ExtensionFunction0<jet.String, jet.String?>?
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt
index 90be40040ba..04c4465f25f 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithGenerics : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithGenerics
-    open fun foo(/*0*/ p0: jet.String, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String>?>): jet.String
+public open class test.MethodWithGenerics : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithGenerics
+    public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String>?>): jet.String
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt
index 359e9feee9f..1e7024552a3 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithTupleType : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithTupleType
-    open fun foo(/*0*/ p0: jet.Tuple2<jet.String, jet.String?>): jet.Tuple0
+public open class test.MethodWithTupleType : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithTupleType
+    public open fun foo(/*0*/ p0: jet.Tuple2<jet.String, jet.String?>): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt
index 7cea7924ea1..6ef83364775 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithTypeParameters : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
-    open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & java.util.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: java.util.List<out B>, /*2*/ p2: java.util.List<in jet.String?>): jet.Tuple0
+public open class test.MethodWithTypeParameters : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
+    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & java.util.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: java.util.List<out B>, /*2*/ p2: java.util.List<in jet.String?>): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt
index a3007ed3d77..7fb649e10f2 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.MethodWithVararg : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.MethodWithVararg
-    open fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+public open class test.MethodWithVararg : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MethodWithVararg
+    public open fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt
index 8223a42b275..87e04f849e0 100644
--- a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.SyntaxError : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.SyntaxError
-    open fun foo(): jet.Int?
+public open class test.SyntaxError : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.SyntaxError
+    public open fun foo(): jet.Int?
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
index 1625151d14a..12e94178356 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.NotNullField : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.NotNullField
-    final var hi: jet.String
+public open class test.NotNullField : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.NotNullField
+    public final var hi: jet.String
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
index e7ae10a9cb1..555f39ece36 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.NotNullMethod : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.NotNullMethod
-    open fun hi(): jet.String
+public open class test.NotNullMethod : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.NotNullMethod
+    public open fun hi(): jet.String
 }
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
index b810025bb16..bf6a486b2f5 100644
--- a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
+++ b/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.NotNullParameter : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.NotNullParameter
-    open fun hi(/*0*/ p0: jet.String): jet.Tuple0
+public open class test.NotNullParameter : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.NotNullParameter
+    public open fun hi(/*0*/ p0: jet.String): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt
index 5525c0e14eb..d5018a9da38 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.VarargInt : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.VarargInt
-    open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+public open class test.VarargInt : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.VarargInt
+    public open fun vararg(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
 }
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt b/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt
index aba7afbd75c..c0a6cd568c7 100644
--- a/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt
+++ b/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt
@@ -1,6 +1,6 @@
 namespace test
 
-open class test.VarargString : java.lang.Object {
-    final /*constructor*/ fun <init>(): test.VarargString
-    open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public open class test.VarargString : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.VarargString
+    public open fun vararg(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
 }