diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 7ca229a7a54..f4718f57695 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -73,13 +73,13 @@ public interface Errors {
     DiagnosticFactory3<PsiElement, DeclarationDescriptor, Visibility, DeclarationDescriptor> INVISIBLE_MEMBER = DiagnosticFactory3.create(ERROR, CALL_ELEMENT);
 
     // Exposed visibility group
-    DiagnosticFactory2<KtProperty, EffectiveVisibility, EffectiveVisibility> EXPOSED_PROPERTY_TYPE = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<PsiElement, EffectiveVisibility, EffectiveVisibility> EXPOSED_FUNCTION_RETURN_TYPE = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<KtParameter, EffectiveVisibility, EffectiveVisibility> EXPOSED_PARAMETER_TYPE = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<KtTypeReference, EffectiveVisibility, EffectiveVisibility> EXPOSED_RECEIVER_TYPE = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<KtTypeParameter, EffectiveVisibility, EffectiveVisibility> EXPOSED_TYPE_PARAMETER_BOUND = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<KtDelegationSpecifier, EffectiveVisibility, EffectiveVisibility> EXPOSED_SUPER_CLASS = DiagnosticFactory2.create(WARNING);
-    DiagnosticFactory2<KtDelegationSpecifier, EffectiveVisibility, EffectiveVisibility> EXPOSED_SUPER_INTERFACE = DiagnosticFactory2.create(WARNING);
+    DiagnosticFactory2<KtProperty, EffectiveVisibility, EffectiveVisibility> EXPOSED_PROPERTY_TYPE = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<PsiElement, EffectiveVisibility, EffectiveVisibility> EXPOSED_FUNCTION_RETURN_TYPE = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtParameter, EffectiveVisibility, EffectiveVisibility> EXPOSED_PARAMETER_TYPE = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtTypeReference, EffectiveVisibility, EffectiveVisibility> EXPOSED_RECEIVER_TYPE = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtTypeParameter, EffectiveVisibility, EffectiveVisibility> EXPOSED_TYPE_PARAMETER_BOUND = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtDelegationSpecifier, EffectiveVisibility, EffectiveVisibility> EXPOSED_SUPER_CLASS = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtDelegationSpecifier, EffectiveVisibility, EffectiveVisibility> EXPOSED_SUPER_INTERFACE = DiagnosticFactory2.create(ERROR);
 
     DiagnosticFactory1<KtElement, Collection<ClassDescriptor>> PLATFORM_CLASS_MAPPED_TO_KOTLIN = DiagnosticFactory1.create(WARNING);
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
index 25246fa5566..3aeead55bc3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -112,13 +112,13 @@ public class DefaultErrorMessages {
         MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, TO_STRING, NAME_OF_PARENT_OR_FILE);
         MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, TO_STRING, NAME_OF_PARENT_OR_FILE);
 
-        MAP.put(EXPOSED_PROPERTY_TYPE, "Deprecated: property effective visibility ''{0}'' should be the same or less permissive than its type effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_FUNCTION_RETURN_TYPE, "Deprecated: function effective visibility ''{0}'' should be the same or less permissive than its return type effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_PARAMETER_TYPE, "Deprecated: function effective visibility ''{0}'' should be the same or less permissive than its parameter type effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_RECEIVER_TYPE, "Deprecated: member effective visibility ''{0}'' should be the same or less permissive than its receiver type effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_TYPE_PARAMETER_BOUND, "Deprecated: generic effective visibility ''{0}'' should be the same or less permissive than its type parameter bound effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_SUPER_CLASS, "Deprecated: subclass effective visibility ''{0}'' should be the same or less permissive than its superclass effective visibility ''{1}''", TO_STRING, TO_STRING);
-        MAP.put(EXPOSED_SUPER_INTERFACE, "Deprecated: sub-interface effective visibility ''{0}'' should be the same or less permissive than its super-interface effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_PROPERTY_TYPE, "Property effective visibility ''{0}'' should be the same or less permissive than its type effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_FUNCTION_RETURN_TYPE, "Function effective visibility ''{0}'' should be the same or less permissive than its return type effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_PARAMETER_TYPE, "Function effective visibility ''{0}'' should be the same or less permissive than its parameter type effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_RECEIVER_TYPE, "Member effective visibility ''{0}'' should be the same or less permissive than its receiver type effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_TYPE_PARAMETER_BOUND, "Generic effective visibility ''{0}'' should be the same or less permissive than its type parameter bound effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_SUPER_CLASS, "Subclass effective visibility ''{0}'' should be the same or less permissive than its superclass effective visibility ''{1}''", TO_STRING, TO_STRING);
+        MAP.put(EXPOSED_SUPER_INTERFACE, "Sub-interface effective visibility ''{0}'' should be the same or less permissive than its super-interface effective visibility ''{1}''", TO_STRING, TO_STRING);
 
         MAP.put(REDECLARATION, "Redeclaration: {0}", STRING);
         MAP.put(NAME_SHADOWING, "Name shadowed: {0}", STRING);
diff --git a/compiler/testData/codegen/box/closures/kt4106.kt b/compiler/testData/codegen/box/closures/kt4106.kt
index 2a05e203aee..f190819f8d5 100644
--- a/compiler/testData/codegen/box/closures/kt4106.kt
+++ b/compiler/testData/codegen/box/closures/kt4106.kt
@@ -1,5 +1,5 @@
 class Foo(private val s: String) {
-    private inner class Inner {
+    inner class Inner {
         private val x = {
             this@Foo.s
         }()
diff --git a/compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt b/compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt
index 7e14b4f02d5..42690e92b97 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt
@@ -6,7 +6,7 @@ internal class B : A {
     override fun foo() = "OK"
 }
 
-val global = B()
+internal val global = B()
 
 internal class C(x: Int) : A by global {
     constructor(): this(1)
diff --git a/compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt b/compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt
index 8761a03c611..cb5bd7c53bf 100644
--- a/compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt
+++ b/compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt
@@ -1,10 +1,10 @@
-interface B : A {
+internal interface B : A {
     fun bar() = 1
 }
 
-interface C : B
+internal interface C : B
 
-class D : C {
+internal class D : C {
     override fun foo() {}
 }
 
diff --git a/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java
index a887bb919ef..9000607dc76 100644
--- a/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java
+++ b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java
@@ -1,4 +1,4 @@
-class fieldAccessViaSubclass {
+public class fieldAccessViaSubclass {
     public String fieldO;
 
     public static String fieldK;
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt
index 2f350b4dbad..e7ba3cf1107 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt
@@ -1,4 +1,4 @@
-fun getInterface(): GenericInterface<String> {
+internal fun getInterface(): GenericInterface<String> {
     return GenericInterface { d, i, j, s ->
         "OK"
     }
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt
index ece8d46c26f..28cac5f89e0 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt
@@ -1,4 +1,4 @@
-class KotlinSubclass: JavaClass() {
+internal class KotlinSubclass: JavaClass() {
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt
index 9a2b91ca11e..c99e87020ce 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt
@@ -1,4 +1,4 @@
-class KotlinClass : JavaClass<String>() {
+internal class KotlinClass : JavaClass<String>() {
     fun doIt(): String {
         var result = ""
         execute("") {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt
index e9ff40f394e..4e339c15303 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt
@@ -1,4 +1,4 @@
-class KotlinClass(): JavaClass(null) {
+internal class KotlinClass(): JavaClass(null) {
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt
index 1f54e9e8ba8..853a4b842e8 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt
@@ -1,6 +1,6 @@
 var status: String = "fail"  // global property to avoid issues with accessing closure from local class (KT-4174)
 
-class KotlinClass(): JavaClass({status="OK"}) {
+internal class KotlinClass(): JavaClass({status="OK"}) {
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt
index ca57a4e6155..ae25638a948 100644
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt
@@ -2,4 +2,4 @@ fun box(): String {
     return f(JavaClass())
 }
 
-fun f(c: C) = c.ok
+internal fun f(c: C) = c.ok
diff --git a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt
index b815079a31d..ecdc093eab1 100644
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt
@@ -2,7 +2,7 @@ fun box(): String {
     return JavaClass().doIt()
 }
 
-fun JavaClass.doIt(): String {
+internal fun JavaClass.doIt(): String {
     x = "OK"
     return x
 }
diff --git a/compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/Test.java b/compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/Test.java
index 000dc4e1080..2bc5113a515 100644
--- a/compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/Test.java
+++ b/compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/Test.java
@@ -1,3 +1,3 @@
-abstract class Test<F> {
+public abstract class Test<F> {
     protected final F value = null;
 }
diff --git a/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/Simple.java b/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/Simple.java
index 9e37ab67659..22216ab77a5 100644
--- a/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/Simple.java
+++ b/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/Simple.java
@@ -1,4 +1,4 @@
-interface Simple {
+public interface Simple {
     default String test(String s) {
         return s + "K";
     }
diff --git a/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/Simple.java b/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/Simple.java
index 9e37ab67659..22216ab77a5 100644
--- a/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/Simple.java
+++ b/compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/Simple.java
@@ -1,4 +1,4 @@
-interface Simple {
+public interface Simple {
     default String test(String s) {
         return s + "K";
     }
diff --git a/compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/Simple.java b/compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/Simple.java
index 552a157fcb7..0307abe7474 100644
--- a/compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/Simple.java
+++ b/compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/Simple.java
@@ -1,4 +1,4 @@
-interface Simple {
+public interface Simple {
     default String test(String s) {
         return s + "Fail";
     }
diff --git a/compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.kt b/compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.kt
index 4a4db6a194f..a6bfa7acdaa 100644
--- a/compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.kt
+++ b/compiler/testData/codegen/notNullAssertions/javaMultipleSubstitutions.kt
@@ -1,4 +1,4 @@
-fun bar(a: A<String, Int>, b: B<String>, c: C) {
+internal fun bar(a: A<String, Int>, b: B<String>, c: C) {
     val sa: String = a.foo()
     val sb: String = b.foo()
     val sc: String = c.foo()
diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.kt b/idea/testData/decompiler/stubBuilder/Objects/Objects.kt
index e394c177618..a7f36afe203 100644
--- a/idea/testData/decompiler/stubBuilder/Objects/Objects.kt
+++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.kt
@@ -20,7 +20,7 @@ public object Objects {
         }
     }
 
-    internal open class NestedClass
+    public open class NestedClass
 
 
 }
diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
index 1d301c2e0cb..004bcf5ac81 100644
--- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
+++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt
@@ -43,7 +43,7 @@ PsiJetFileStubImpl[package=]
                   REFERENCE_EXPRESSION:[referencedName=kotlin]
                 REFERENCE_EXPRESSION:[referencedName=Unit]
       CLASS:[fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]]
-        MODIFIER_LIST:[open internal]
+        MODIFIER_LIST:[open public]
         PRIMARY_CONSTRUCTOR:
           MODIFIER_LIST:[public]
           VALUE_PARAMETER_LIST:
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt
index 6b93389e9e1..59cdd8c6342 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt
@@ -3,4 +3,4 @@
 // ACTION: Convert to block body
 // ERROR: Unresolved reference: Foo
 
-fun test(): A = <caret>Foo(2, "2")
\ No newline at end of file
+internal fun test(): A = <caret>Foo(2, "2")
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
index bf7e8450e47..f62407f96f9 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = B.Foo<Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = B.Foo<Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
index e0d4166dcf4..194b187a194 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = B.<caret>Foo<Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = B.<caret>Foo<Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
index 7b943cf1b8f..6d9af98f681 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.Foo<Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.Foo<Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
index 6861ee7148d..ee27a78a071 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.<caret>Foo<Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.<caret>Foo<Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
index 0e52c1210f0..2bb5082fb6b 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.Foo<String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.Foo<String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
index f5ae1c21f53..a372a98d192 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.<caret>Foo<String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.<caret>Foo<String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
index 2890fa4f9e3..4e8ad450668 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.Foo<T, Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.Foo<T, Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
index 53e840bc9c9..759291470a7 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = b.<caret>Foo<T, Int, String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = b.<caret>Foo<T, Int, String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
index d56d3fce959..5aa81397ff8 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = B.Foo<String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = B.Foo<String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
index b18b19c081e..b7f2e9895df 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-class A<T>(val b: B<T>) {
-    fun test() = B.<caret>Foo<String>(2, "2")
+class A<T> internal constructor(val b: B<T>) {
+    internal fun test() = B.<caret>Foo<String>(2, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt
index 23d78195efc..cfe1b263765 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt
@@ -2,4 +2,4 @@
 // ACTION: Convert to block body
 // ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
-fun foo(): J = J.<caret>A
+internal fun foo(): J = J.<caret>A
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt
index b1bc78832fb..1e0443eb5ee 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt
@@ -2,4 +2,4 @@
 // ACTION: Convert to block body
 // ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
-fun foo(): X = E.<caret>A
+internal fun foo(): X = E.<caret>A
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt
index c4a96bc53a0..96e5aa36287 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt
@@ -1,6 +1,6 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-fun test(a: A): Int? {
+internal fun test(a: A): Int? {
     return a.foo<String, Int>(1, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt
index e8a8c6f62b4..d1a7f2dab2c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-fun test(a: A): Int? {
+internal fun test(a: A): Int? {
     return a.<caret>foo<String, Int>(1, "2")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
index b4ae6016077..665c40a423e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.foo<Int, String>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
index 682cde507fb..45d3c9ccd90 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.<caret>foo<Int, String>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
index 3918c1fc692..c6ea6830a52 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.foo<Int>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
index 5bd82347ddc..7ad795d23c6 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.<caret>foo<Int>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
index b4ae6016077..665c40a423e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.foo<Int, String>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
index e32f9abca9a..1b6fb73f1db 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
@@ -1,7 +1,7 @@
 // "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-class A<T>(val b: B<T>) {
+class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
         return b.<caret>foo<T, Int, String>(2, "2")
     }
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.kt
index 3b2f74c7868..78ed33dc065 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.kt
@@ -1,6 +1,6 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-class B: J(1) {
+internal class B: J(1) {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt
index f2c42eae46a..f2f662aad09 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-class B: J(<caret>1) {
+internal class B: J(<caret>1) {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.kt
index 5d70f9f80c1..8ac136c2b63 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.kt
@@ -1,4 +1,4 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-fun test() = J(1)
\ No newline at end of file
+internal fun test() = J(1)
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt
index 33cbd48a75d..64e3b48daf6 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt
@@ -1,4 +1,4 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-fun test() = J(<caret>1)
\ No newline at end of file
+internal fun test() = J(<caret>1)
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.kt
index d74910b850e..e06d44ec81d 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.kt
@@ -1,7 +1,7 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-class B: J {
+internal class B: J {
     constructor(): super(1) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt
index de67d8f11b1..d5627765a5c 100644
--- a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt
@@ -1,7 +1,7 @@
 // "Create secondary constructor" "true"
 // ERROR: Too many arguments for public/*package*/ constructor J() defined in J
 
-class B: J {
+internal class B: J {
     constructor(): super(<caret>1) {
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.after.kt
index 538930d3b05..fffec167e1a 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.after.kt
@@ -1,4 +1,4 @@
 // "Create parameter 's'" "true"
 // ERROR: Unresolved reference: s
 
-fun foo(s: String?) = C(s)
\ No newline at end of file
+internal fun foo(s: String?) = C(s)
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt
index e85a44b5eae..bb7a7be0ee6 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt
@@ -1,4 +1,4 @@
 // "Create parameter 's'" "true"
 // ERROR: Unresolved reference: s
 
-fun foo() = C(<caret>s)
\ No newline at end of file
+internal fun foo() = C(<caret>s)
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
index 7df1347e1a8..cb8c48d5b0d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
@@ -3,6 +3,6 @@
 // ACTION: Create extension property 'foo'
 // ERROR: Unresolved reference: foo
 
-fun test(a: A): String? {
+internal fun test(a: A): String? {
     return a.<caret>foo
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/objectLiteral/MyFrame.java b/j2k/testData/fileOrElement/objectLiteral/MyFrame.java
index 7751fe98baf..363b0a7d06c 100644
--- a/j2k/testData/fileOrElement/objectLiteral/MyFrame.java
+++ b/j2k/testData/fileOrElement/objectLiteral/MyFrame.java
@@ -19,7 +19,7 @@ class Frame {
   public void addWindowListener(WindowListener listener){}
 }
 
-public final class Client extends Frame {
+final class Client extends Frame {
   Client() {
     WindowAdapter a = new WindowAdapter() {
       @Override
diff --git a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
index 61381665d40..f67e01524d2 100644
--- a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
+++ b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
@@ -17,7 +17,7 @@ internal open class Frame {
     }
 }
 
-class Client internal constructor() : Frame() {
+internal class Client : Frame() {
     init {
         val a = object : WindowAdapter() {
             override fun windowClosing() {
diff --git a/j2k/testData/multiFile/FieldToProperty/JavaClass.java b/j2k/testData/multiFile/FieldToProperty/JavaClass.java
index 5ad68dbf6a1..fda94197cbb 100644
--- a/j2k/testData/multiFile/FieldToProperty/JavaClass.java
+++ b/j2k/testData/multiFile/FieldToProperty/JavaClass.java
@@ -1,6 +1,6 @@
 package test;
 
-class JavaClass {
+public class JavaClass {
     public int field = 0;
 
     protected int myProperty = 0;
diff --git a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt
index efc61ba1f4a..7e200738f83 100644
--- a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt
+++ b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt
@@ -1,6 +1,6 @@
 package test
 
-internal open class JavaClass {
+open class JavaClass {
     var field = 0
 
     var property = 0
diff --git a/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java b/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java
index 1c4a80ea94e..acea054e9f7 100644
--- a/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java
+++ b/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java
@@ -1,6 +1,6 @@
 package test;
 
-class C extends JavaClass {
+public class C extends JavaClass {
     public void foo(JavaClass javaClass) {
         javaClass.field++;
         --javaClass.field;
diff --git a/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java.expected b/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java.expected
index 759d56efb18..525ee76ca4f 100644
--- a/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java.expected
+++ b/j2k/testData/multiFile/FieldToProperty/external/JavaFile.java.expected
@@ -1,6 +1,6 @@
 package test;
 
-class C extends JavaClass {
+public class C extends JavaClass {
     public void foo(JavaClass javaClass) {
         javaClass.setField(javaClass.getField() + 1);
         javaClass.setField(javaClass.getField() - 1);
diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/2.java b/j2k/testData/multiFile/GetterAndSetterUsages/2.java
index 8af80787c14..c9879b56c5e 100644
--- a/j2k/testData/multiFile/GetterAndSetterUsages/2.java
+++ b/j2k/testData/multiFile/GetterAndSetterUsages/2.java
@@ -1,4 +1,4 @@
-class B {
+public class B {
     void foo(AAA a) {
         a.setX(a.getX() + 1);
         y += "a";
diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
index 6c49aeed79d..734eae686e5 100644
--- a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
+++ b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
@@ -1,5 +1,5 @@
-internal class B {
-    fun foo(a: AAA) {
+class B {
+    internal fun foo(a: AAA) {
         a.x = a.x + 1
         yy += "a"
     }
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
index 331aaf1316d..16909f08763 100644
--- a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
@@ -4,4 +4,7 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
 Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15
 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2
 Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7
-Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
+Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36
+Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 19, column 15
+Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36
\ No newline at end of file
diff --git a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
index 2fae260968a..6da24d6c7e8 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
@@ -3,4 +3,6 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13
 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36
 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2
 Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7
-Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
+Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36
+Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
index df01db10bfd..f7e53b09f20 100644
--- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
@@ -22,5 +22,6 @@ Cannot access 'A': it is 'internal' in 'a'
 Cannot access 'FileAnnotation': it is 'internal' in 'a'
 Cannot access 'ClassAnnotation': it is 'internal' in 'a'
 Cannot access 'ClassAnnotation': it is 'internal' in 'a'
+Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal'
 Cannot access 'A': it is 'internal' in 'a'
 Cannot access 'a': it is 'internal' in 'a'
\ No newline at end of file
diff --git a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
index 8631936db76..16751ad055b 100644
--- a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
+++ b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
@@ -24,7 +24,7 @@ public class M {
     public fun applyM<T>(arg: T, func: (T)->T): T = func(arg)
 }
 
-private class N {
+internal class N {
     inline
     public fun applyN<T>(arg: T, func: (T)->T): T = func(arg)
 }
diff --git a/libraries/stdlib/test/collections/ListBinarySearchTest.kt b/libraries/stdlib/test/collections/ListBinarySearchTest.kt
index 6b73bc937e7..fb159f73098 100644
--- a/libraries/stdlib/test/collections/ListBinarySearchTest.kt
+++ b/libraries/stdlib/test/collections/ListBinarySearchTest.kt
@@ -9,7 +9,7 @@ class ListBinarySearchTest {
 
     fun notFound(index: Int) = -(index + 1)
 
-    val comparator = compareBy<IncomparableDataItem<Int>?> { it?.value }
+    private val comparator = compareBy<IncomparableDataItem<Int>?> { it?.value }
 
     @Test
     fun binarySearchByElement() {