diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
index 16909f08763..de432978151 100644
--- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
+++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
@@ -1,10 +1,10 @@
 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
+'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
+'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15
 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 '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
-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
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
index 6da24d6c7e8..9627524678f 100644
--- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
@@ -1,8 +1,8 @@
 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
+'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
 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
-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
+Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
index cedab0eaa5d..51b1fa9217c 100644
--- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
@@ -52,22 +52,22 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Cannot access 'A': it is 'private' in file
-Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private'
-Generic effective visibility 'public' should be the same or less permissive than its type parameter bound effective visibility 'private'
+'public' subclass exposes its 'private' supertype A
+'public' generic exposes its 'private' parameter bound type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
-Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'private'
+'public' function exposes its 'private' parameter type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
-Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private'
+'public' function exposes its 'private' return type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
-Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private'
+'public' function exposes its 'private' return type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
-Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private'
+'public' function exposes its 'private' return type A
 
 ================ Step #2 =================
 
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
index a8ac9c69ed3..2856771b984 100644
--- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
@@ -33,8 +33,8 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Cannot access 'A': it is 'private' in file
-Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private'
-Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private'
+'public' subclass exposes its 'private' supertype A
+'public' function exposes its 'private' return type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
 Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
index 172203c7fdc..23d3560344a 100644
--- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
@@ -25,7 +25,7 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Cannot access 'A': it is 'private' in file
-Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private'
+'public' subclass exposes its 'private' supertype A
 
 ================ Step #2 =================
 
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
index 8e64961e1d0..fe2e77d7cc9 100644
--- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
@@ -25,7 +25,7 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Cannot access 'A': it is 'private' in file
-Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private'
+'public' subclass exposes its 'private' supertype A
 Cannot access 'A': it is 'private' in file
 
 ================ Step #2 =================
diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
index efea0e1b9ce..97d0b6d11e8 100644
--- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
+++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
@@ -28,6 +28,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'
+'public' function exposes its 'internal' parameter type A
 Cannot access 'A': it is 'internal' in 'a'
 Cannot access 'a': it is 'internal' in 'a'
diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
index c105d8ab425..b4c4f0f17d3 100644
--- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
+++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
@@ -32,6 +32,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'
+'public' function exposes its 'internal' parameter type A
 Cannot access 'A': it is 'internal' in 'a'
 Cannot access 'a': it is 'internal' in 'a'