diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt
index 2eae517cffd..ed7c12716bf 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt
@@ -1,9 +1,9 @@
 // FILE: JavaSuperClass.java
 
 class JavaSuperClass {
-    void foo(int javaName) {}
+    public void foo(int javaName) {}
 
-    void multipleParameters(int first, long second, String third) {}
+    public void multipleParameters(int first, long second, String third) {}
 }
 
 // FILE: 1.kt
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.txt b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.txt
index e696f1ffca7..9c1fa2bb422 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.txt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.txt
@@ -9,26 +9,26 @@ public fun viaRealOverride(): kotlin.Unit
 public/*package*/ open class JavaSuperClass {
     public/*package*/ constructor JavaSuperClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
+    public open fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public/*package*/ open fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
+    public open fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public open class KotlinSubClass : JavaSuperClass {
     public constructor KotlinSubClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public/*package*/ open override /*1*/ /*fake_override*/ fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class KotlinSubSubClass : KotlinSubClass {
     public constructor KotlinSubSubClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal open override /*1*/ fun foo(/*0*/ kotlinName: kotlin.Int): kotlin.Unit
+    public open override /*1*/ fun foo(/*0*/ kotlinName: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public/*package*/ open override /*1*/ /*fake_override*/ fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun multipleParameters(/*0*/ first: kotlin.Int, /*1*/ second: kotlin.Long, /*2*/ third: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
index cb3e8d2c380..91daba71ae6 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
@@ -11,18 +11,18 @@ public/*package*/ open class A</*0*/ T : kotlin.CharSequence!> {
 
 public final class B1 : RawADerived {
     public constructor B1()
-    internal open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.List<*>>>): kotlin.Unit
+    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.List<*>>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    internal open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.Map<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
+    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.Map<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public final class B2 : RawADerived {
     public constructor B2()
-    internal open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.MutableList<*>>>): kotlin.Unit
+    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.MutableList<*>>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    internal open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.MutableMap<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any?, kotlin.Any?>): A<kotlin.String>
+    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.MutableMap<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any?, kotlin.Any?>): A<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt
index 1cff51ea18f..de20c235879 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt
@@ -35,9 +35,9 @@ import org.jetbrains.annotations.*;
 // Just inherit enhanced types (annotations without conflicts)
 class B1 extends A {
     @Override
-    int foo(@NotNull String x, String y);
+    public int foo(@NotNull String x, String y);
     @Override
-    int bar(@Nullable String x, String y);
+    public int bar(@Nullable String x, String y);
 }
 
 // FILE: C.java
diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
index e70dba086d0..4dcfa73f55d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.txt
@@ -23,8 +23,8 @@ public/*package*/ open class B1 : A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
-    @java.lang.Override() public/*package*/ open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
+    @java.lang.Override() public open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
+    @java.lang.Override() public open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
 }
 
 public/*package*/ open class C : A {
@@ -51,6 +51,6 @@ public final class E : B1 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    internal open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
-    internal open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
+    public open override /*1*/ fun kotlin.String?.bar(/*0*/ y: kotlin.String): kotlin.Int
+    public open override /*1*/ fun kotlin.String.foo(/*0*/ y: kotlin.String?): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.txt
index 6d9d27578cc..63c9b7c8be6 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.txt
@@ -14,7 +14,7 @@ public open class A {
 public final class B : A {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal open override /*1*/ fun foo(): Base<kotlin.String>
+    protected open override /*1*/ fun foo(): Base<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -28,7 +28,7 @@ public interface Base</*0*/ T> {
 public final class C1 : A {
     public constructor C1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal open override /*1*/ fun foo(): Derived<kotlin.String>
+    protected open override /*1*/ fun foo(): Derived<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -36,7 +36,7 @@ public final class C1 : A {
 public final class C2 : A {
     public constructor C2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal open override /*1*/ fun foo(): Derived<kotlin.String>?
+    protected open override /*1*/ fun foo(): Derived<kotlin.String>?
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -44,7 +44,7 @@ public final class C2 : A {
 public final class C3 : A {
     public constructor C3()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal open override /*1*/ fun foo(): Derived<kotlin.String?>
+    protected open override /*1*/ fun foo(): Derived<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
index abdfabda537..54e38d00487 100644
--- a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
+++ b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
@@ -7,5 +7,5 @@ public open class Base {
 
 public final class Derived : test.Base {
     public constructor Derived()
-    internal open override /*1*/ fun foo(): kotlin.Unit
+    protected open override /*1*/ fun foo(): kotlin.Unit
 }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java
index 61485c90cef..c0e6dcb91d9 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java
@@ -52,7 +52,7 @@ public class JavaVisibilities {
         @NotNull
         @Override
         public Visibility normalize() {
-            return Visibilities.INTERNAL;
+            return Visibilities.PROTECTED;
         }
     };