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 934bad0b827..109a0371f95 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -94,8 +94,8 @@ public class DefaultErrorMessages {
     static {
         MAP.put(UNRESOLVED_REFERENCE, "Unresolved reference: {0}", ELEMENT_TEXT);
 
-        MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
-        MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is ''{1}'' in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
+        MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is {1} in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
+        MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is {1} in {2}", NAME, VISIBILITY, NAME_OF_PARENT_OR_FILE);
 
         MAP.put(PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL, "Protected constructor ''{0}'' from other classes can only be used in super-call", Renderers.SHORT_NAMES_IN_TYPES);
 
diff --git a/idea/testData/copyPaste/imports/NoImportForBuiltIns.expected.kt b/idea/testData/copyPaste/imports/NoImportForBuiltIns.expected.kt
index 7d17bb44b5e..c9d71ce3187 100644
--- a/idea/testData/copyPaste/imports/NoImportForBuiltIns.expected.kt
+++ b/idea/testData/copyPaste/imports/NoImportForBuiltIns.expected.kt
@@ -1,7 +1,7 @@
-// ERROR: Cannot access 'd': it is 'private' in file
-// ERROR: Cannot access 'd': it is 'private' in file
-// ERROR: Cannot access 'b': it is 'private' in file
-// ERROR: Cannot access 'b': it is 'private' in file
+// ERROR: Cannot access 'd': it is private in file
+// ERROR: Cannot access 'd': it is private in file
+// ERROR: Cannot access 'b': it is private in file
+// ERROR: Cannot access 'b': it is private in file
 package to
 
 import a.b
diff --git a/idea/testData/diagnosticMessage/invisibleMember.kt b/idea/testData/diagnosticMessage/invisibleMember.kt
index d180bc6431e..9ee1d927cf0 100644
--- a/idea/testData/diagnosticMessage/invisibleMember.kt
+++ b/idea/testData/diagnosticMessage/invisibleMember.kt
@@ -11,8 +11,8 @@ class A {
 }
 
 fun foo() {
-    A.B()     // ERROR 1: Cannot access 'B': it is 'private' in 'A'
-    A.C()     // ERROR 2: Cannot access '' : it is 'private' in 'C'
+    A.B()     // ERROR 1: Cannot access 'B': it is private in 'A'
+    A.C()     // ERROR 2: Cannot access '' : it is private in 'C'
 
-    A().bar() // ERROR 3: Cannot access 'bar' : it is 'private' in 'A'
+    A().bar() // ERROR 3: Cannot access 'bar' : it is private in 'A'
 }
diff --git a/idea/testData/diagnosticMessage/invisibleMember1.txt b/idea/testData/diagnosticMessage/invisibleMember1.txt
index a75f0462beb..42f75e81da6 100644
--- a/idea/testData/diagnosticMessage/invisibleMember1.txt
+++ b/idea/testData/diagnosticMessage/invisibleMember1.txt
@@ -1,2 +1,2 @@
 <!-- invisibleMember1 -->
-Cannot access 'B': it is 'private' in 'A'
\ No newline at end of file
+Cannot access 'B': it is private in 'A'
diff --git a/idea/testData/diagnosticMessage/invisibleMember2.txt b/idea/testData/diagnosticMessage/invisibleMember2.txt
index 2b57c2382f8..7a603bd7ebf 100644
--- a/idea/testData/diagnosticMessage/invisibleMember2.txt
+++ b/idea/testData/diagnosticMessage/invisibleMember2.txt
@@ -1,2 +1,2 @@
 <!-- invisibleMember2 -->
-Cannot access '<init>': it is 'private' in 'C'
\ No newline at end of file
+Cannot access '<init>': it is private in 'C'
diff --git a/idea/testData/diagnosticMessage/invisibleMember3.txt b/idea/testData/diagnosticMessage/invisibleMember3.txt
index 47bf80a5bad..87b87109813 100644
--- a/idea/testData/diagnosticMessage/invisibleMember3.txt
+++ b/idea/testData/diagnosticMessage/invisibleMember3.txt
@@ -1,2 +1,2 @@
 <!-- invisibleMember3 -->
-Cannot access 'bar': it is 'private' in 'A'
\ No newline at end of file
+Cannot access 'bar': it is private in 'A'
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m1Test/m1Test.kt b/idea/testData/multiModuleHighlighting/testRoot/m1Test/m1Test.kt
index 31ac18f2829..a7dc137b712 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m1Test/m1Test.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m1Test/m1Test.kt
@@ -10,7 +10,7 @@ public fun publicInM1Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
     internalInM1()
     publicInM1()
 
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt b/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
index 1a7fedf71cc..f77be7003ef 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
@@ -10,8 +10,8 @@ public fun publicInM2() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
     <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: privateInM1Test">privateInM1Test</error>()
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt b/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
index 75ea2cb7615..3e92a829a4e 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
@@ -10,15 +10,15 @@ public fun publicInM2Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is private in file">privateInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is internal in 'test'">internalInM1Test</error>()
     publicInM1Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
     internalInM2()
     publicInM2()
 
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt b/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
index 535d5d4733c..2465887c082 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
@@ -10,23 +10,23 @@ public fun publicInM3Test() {
 }
 
 fun access() {
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is 'private' in file">privateInM1</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is 'internal' in 'shared'">internalInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1': it is private in file">privateInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1': it is internal in 'shared'">internalInM1</error>()
     publicInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is 'private' in file">privateInM1Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is 'internal' in 'test'">internalInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM1Test': it is private in file">privateInM1Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM1Test': it is internal in 'test'">internalInM1Test</error>()
     publicInM1Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is 'private' in file">privateInM2</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2': it is 'internal' in 'shared'">internalInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2': it is private in file">privateInM2</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2': it is internal in 'shared'">internalInM2</error>()
     publicInM2()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is 'private' in file">privateInM2Test</error>()
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2Test': it is 'internal' in 'test'">internalInM2Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM2Test': it is private in file">privateInM2Test</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalInM2Test': it is internal in 'test'">internalInM2Test</error>()
     publicInM2Test()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is 'private' in file">privateInM3</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateInM3': it is private in file">privateInM3</error>()
     internalInM3()
     publicInM3()
 
diff --git a/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt b/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
index 25952830f50..accdce20219 100644
--- a/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
@@ -5,30 +5,30 @@ import m1.*
 fun testVisibility() {
     PublicClassInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'InternalClassInM1': it is 'internal' in 'm1'">InternalClassInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'InternalClassInM1': it is internal in 'm1'">InternalClassInM1</error>()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is 'private' in file">PrivateClassInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'PrivateClassInM1': it is private in file">PrivateClassInM1</error>()
 
     publicFunInM1()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalFunInM1': it is 'internal' in 'm1'">internalFunInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'internalFunInM1': it is internal in 'm1'">internalFunInM1</error>()
 
-    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is 'private' in file">privateFunInM1</error>()
+    <error descr="[INVISIBLE_MEMBER] Cannot access 'privateFunInM1': it is private in file">privateFunInM1</error>()
 }
 
 public class ClassInM2
 
-public class B: <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is 'internal' in 'A'">A</error>() {
+public class B: <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is internal in 'A'">A</error>() {
 
     fun accessA(<warning descr="[UNUSED_PARAMETER] Parameter 'a' is never used">a</warning>: A) {}
 
     fun f() {
-        <error descr="[INVISIBLE_MEMBER] Cannot access 'pri': it is 'invisible (private in a supertype)' in 'B'">pri</error>()
+        <error descr="[INVISIBLE_MEMBER] Cannot access 'pri': it is invisible (private in a supertype) in 'B'">pri</error>()
 
         pro()
 
         pub()
 
-        <error descr="[INVISIBLE_MEMBER] Cannot access 'int': it is 'invisible (private in a supertype)' in 'B'">int</error>()
+        <error descr="[INVISIBLE_MEMBER] Cannot access 'int': it is invisible (private in a supertype) in 'B'">int</error>()
     }
 }
diff --git a/idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt b/idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt
index 2ac5615ec46..97cc116023c 100644
--- a/idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt
+++ b/idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt
@@ -4,7 +4,7 @@
 // ACTION: Make 'Nested' public
 // ACTION: Remove parameter 'arg'
 // ERROR: 'internal' function exposes its 'private' parameter type argument Nested
-// ERROR: Cannot access 'Nested': it is 'private' in 'Outer'
+// ERROR: Cannot access 'Nested': it is private in 'Outer'
 
 class Outer {
     private class Nested
@@ -12,4 +12,4 @@ class Outer {
 
 class Generic<T>
 
-internal fun foo(<caret>arg: Generic<Outer.Nested>) {}
\ No newline at end of file
+internal fun foo(<caret>arg: Generic<Outer.Nested>) {}
diff --git a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.after.kt b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.after.kt
index 6db5b7fdcda..c577ed72d4a 100644
--- a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.after.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.after.kt
@@ -1,6 +1,6 @@
 // "Make 'foo' internal" "true"
 // ACTION: Make 'foo' public
-// ERROR: Cannot access 'foo': it is 'private' in 'First'
+// ERROR: Cannot access 'foo': it is private in 'First'
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.before.Main.kt b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.before.Main.kt
index 6db5b7fdcda..c577ed72d4a 100644
--- a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.before.Main.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalMultiFile.before.Main.kt
@@ -1,6 +1,6 @@
 // "Make 'foo' internal" "true"
 // ACTION: Make 'foo' public
-// ERROR: Cannot access 'foo': it is 'private' in 'First'
+// ERROR: Cannot access 'foo': it is private in 'First'
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt
index 4d14464c1fe..2147a0a9a75 100644
--- a/idea/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt
@@ -1,6 +1,6 @@
 // "Make bar internal" "false"
 // ACTION: Convert property initializer to getter
-// ERROR: Cannot access 'bar': it is 'private' in 'First'
+// ERROR: Cannot access 'bar': it is private in 'First'
 
 private data class Data(val x: Int)
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.after.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.after.kt
index 842481d49ce..d3490fcd4dc 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.after.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.after.kt
@@ -1,6 +1,6 @@
 // "Make 'f' internal" "true"
 // ACTION: Make 'f' public
-// ERROR: Cannot access 'f': it is 'private' in file
+// ERROR: Cannot access 'f': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.before.Main.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.before.Main.kt
index 39b35ebc30b..4d2f0f5b41d 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.before.Main.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelFunInFile.before.Main.kt
@@ -1,6 +1,6 @@
 // "Make 'f' internal" "true"
 // ACTION: Make 'f' public
-// ERROR: Cannot access 'f': it is 'private' in file
+// ERROR: Cannot access 'f': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.after.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.after.kt
index 23135067326..ef137bc3bc8 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.after.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.after.kt
@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.before.Main.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.before.Main.kt
index 5024a3fb8fe..d12f2fdddbf 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.before.Main.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelValInFile.before.Main.kt
@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.after.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.after.kt
index 09918104248..0efa1008c68 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.after.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.after.kt
@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.before.Main.kt b/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.before.Main.kt
index 31b3644a764..fd8db552978 100644
--- a/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.before.Main.kt
+++ b/idea/testData/quickfix/increaseVisibility/privateTopLevelVarInFile.before.Main.kt
@@ -1,6 +1,6 @@
 // "Make 'prop' internal" "true"
 // ACTION: Make 'prop' public
-// ERROR: Cannot access 'prop': it is 'private' in file
+// ERROR: Cannot access 'prop': it is private in file
 
 package test
 
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt
index cf91ce3b4fc..fbe284e6800 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddModifierFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
-// ERROR: Cannot access '<init>': it is 'private' in 'E'
+// ERROR: Cannot access '<init>': it is private in 'E'
 enum class E {}
 class A : E<caret>() {}
diff --git a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
index 5462e4ed2da..75172425389 100644
--- a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
+++ b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
@@ -1,4 +1,4 @@
-// ERROR: Cannot access 'p': it is 'invisible (private in a supertype)' in 'A'
+// ERROR: Cannot access 'p': it is invisible (private in a supertype) in 'A'
 enum class E private constructor(private val p: Int) {
     A(1) {
         override fun bar() {
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
index b97a187c913..109a31fe488 100644
--- a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
@@ -2,9 +2,9 @@
 '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 (private in a supertype)' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
+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 (private in a supertype) in 'ClassAA1' at line 27, column 25
diff --git a/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
index f6a8fb3be27..24037a41f50 100644
--- a/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
+++ b/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
@@ -1,4 +1,4 @@
-Cannot access 'funA': it is 'internal' in 'test' at line 4, column 5
-Cannot access 'funB': it is 'internal' in 'test' at line 4, column 5
-Cannot access 'testFunA': it is 'internal' in 'test' at line 5, column 5
-Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5
\ No newline at end of file
+Cannot access 'funA': it is internal in 'test' at line 4, column 5
+Cannot access 'funB': it is internal in 'test' at line 4, column 5
+Cannot access 'testFunA': it is internal in 'test' at line 5, column 5
+Cannot access 'testFunB': it is internal in 'test' at line 5, column 5
\ 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 e1be8b69b99..a0692a54537 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
@@ -1,8 +1,8 @@
 'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: 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 (private in a supertype)' in 'ClassAA1' at line 27, column 25
\ No newline at end of file
+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 (private in a supertype) in 'ClassAA1' at line 27, column 25
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
index 51b1fa9217c..43fa0a23936 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
@@ -51,22 +51,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'A': it is 'private' in file
+Cannot access 'A': it is private in file
 '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
+Cannot access 'A': it is private in file
+Cannot access 'A': it is private in file
 'public' function exposes its 'private' parameter 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
 '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
+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
 '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
 'public' function exposes its 'private' return type A
 
 ================ Step #2 =================
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
index d485c85a260..9c37cd50b36 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
@@ -23,8 +23,8 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access '<init>': it is 'private' in 'A'
-Cannot access '<init>': it is 'private' in 'A'
+Cannot access '<init>': it is private in 'A'
+Cannot access '<init>': it is private in 'A'
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
index edca3b9801d..ac9509d8ef2 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
@@ -32,13 +32,13 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'A': it is 'private' in file
+Cannot access 'A': it is private in file
 '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
+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 Any?
-Cannot access 'x': it is 'invisible (private in a supertype)' in 'B'
+Cannot access 'x': it is invisible (private in a supertype) in 'B'
 Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
 
 ================ Step #2 =================
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
index c29b8374d1b..eadd060bf39 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log
@@ -26,7 +26,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'A': it is 'private' in file
+Cannot access 'A': it is private in file
 'public' subclass exposes its 'private' supertype A
 
 ================ Step #2 =================
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
index e1585d4ab76..5422b612067 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log
@@ -26,9 +26,9 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'A': it is 'private' in file
+Cannot access 'A': it is private in file
 'public' subclass exposes its 'private' supertype A
-Cannot access 'A': it is 'private' in file
+Cannot access 'A': it is private in file
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
index 6a53134aea2..e8d2aee5cc8 100644
--- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log
@@ -25,11 +25,11 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
-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'
+Cannot access 'FileAnnotation': it is internal in 'a'
+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'
 'public' function exposes its 'internal' parameter type A
-Cannot access 'A': it is 'internal' in 'a'
-Cannot access 'a': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
+Cannot access 'a': it is internal in 'a'
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
index 3c7f30277f0..21e1a572541 100644
--- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log
@@ -29,11 +29,11 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
-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'
+Cannot access 'FileAnnotation': it is internal in 'a'
+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'
 'public' function exposes its 'internal' parameter type A
-Cannot access 'A': it is 'internal' in 'a'
-Cannot access 'a': it is 'internal' in 'a'
+Cannot access 'A': it is internal in 'a'
+Cannot access 'a': it is internal in 'a'
diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
index eae1394f4a3..5b42ada687d 100644
--- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
+++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
@@ -26,9 +26,9 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'InternalFileAnnotation': it is 'internal' in 'a'
-Cannot access 'InternalFileAnnotation': it is 'internal' in 'a'
-Cannot access 'InternalClassAnnotation': it is 'internal' in 'a'
-Cannot access 'InternalClassAnnotation': it is 'internal' in 'a'
+Cannot access 'InternalFileAnnotation': it is internal in 'a'
+Cannot access 'InternalFileAnnotation': it is internal in 'a'
+Cannot access 'InternalClassAnnotation': it is internal in 'a'
+Cannot access 'InternalClassAnnotation': it is internal in 'a'
 Unresolved reference: InternalA
 Unresolved reference: internalA
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
index ff9f8b0eba6..30638dfb226 100644
--- a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
@@ -10,7 +10,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'foo': it is 'private' in file
+Cannot access 'foo': it is private in file
 
 ================ Step #2 =================
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/build.log b/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/build.log
index c105d8ab425..b622c7a883a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/build.log
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/build.log
@@ -27,11 +27,11 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
-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'
+Cannot access 'FileAnnotation': it is internal in 'a'
+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'
+Cannot access 'A': it is internal in 'a'
+Cannot access 'a': it is internal in 'a'
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/expected.txt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/expected.txt
index 777ac581c92..f1745b9b41d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/expected.txt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/buildLogsParserData/withError/expected.txt
@@ -6,11 +6,11 @@ module2/src/module2_b.kt
 End of files
 ------------------------------------------
 COMPILATION FAILED
-Cannot access 'FileAnnotation': it is 'internal' in 'a'
-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'
+Cannot access 'FileAnnotation': it is internal in 'a'
+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'
+Cannot access 'A': it is internal in 'a'
+Cannot access 'a': it is internal in 'a'