diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 0ad94a702f5..ffe3b583f01 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -75,7 +75,7 @@ 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(ERROR);
+    DiagnosticFactory2<PsiElement, 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);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
index e075067da32..96f0d0c31e5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
@@ -639,7 +639,7 @@ class DeclarationsChecker(
         val propertyVisibility = propertyDescriptor.effectiveVisibility()
         val typeVisibility = propertyDescriptor.type.effectiveVisibility()
         if (!typeVisibility.sameOrMorePermissive(propertyVisibility)) {
-            trace.report(EXPOSED_PROPERTY_TYPE.on(property, propertyVisibility, typeVisibility))
+            trace.report(EXPOSED_PROPERTY_TYPE.on(property.nameIdentifier ?: property, propertyVisibility, typeVisibility))
         }
         checkMemberReceiverExposedType(property.receiverTypeReference, propertyDescriptor)
     }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
index 0853172d660..5cd229e471a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
@@ -16,13 +16,13 @@ class Foo {
       privateProperty.f2()
     }
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val <!EXPOSED_PROPERTY_TYPE!>protectedProperty<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val <!EXPOSED_PROPERTY_TYPE!>internalProperty<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val <!EXPOSED_PROPERTY_TYPE!>internal2Property<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val <!EXPOSED_PROPERTY_TYPE!>publicProperty<!><!> = object : MyClass(), MyTrait {}
 
 
     private fun privateFunction() = object : MyClass(), MyTrait {}
@@ -50,13 +50,13 @@ class Foo {
         privatePropertyInner.f2()
     }
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val <!EXPOSED_PROPERTY_TYPE!>protectedProperty<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val <!EXPOSED_PROPERTY_TYPE!>internalProperty<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val <!EXPOSED_PROPERTY_TYPE!>internal2Property<!><!> = object : MyClass(), MyTrait {}
 
-    <!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}<!>
+    <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val <!EXPOSED_PROPERTY_TYPE!>publicProperty<!><!> = object : MyClass(), MyTrait {}
 
 
     private fun privateFunctionInner() = object : MyClass(), MyTrait {}
@@ -90,13 +90,13 @@ class Foo {
 
 <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>private val packagePrivateProperty<!> = object : MyClass(), MyTrait {}
 
-<!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> val packageProtectedProperty<!> = object : MyClass(), MyTrait {}<!>
+<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> val <!EXPOSED_PROPERTY_TYPE!>packageProtectedProperty<!><!> = object : MyClass(), MyTrait {}
 
-<!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val packageInternalProperty<!> = object : MyClass(), MyTrait {}<!>
+<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val <!EXPOSED_PROPERTY_TYPE!>packageInternalProperty<!><!> = object : MyClass(), MyTrait {}
 
-<!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val packageInternal2Property<!> = object : MyClass(), MyTrait {}<!>
+<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val <!EXPOSED_PROPERTY_TYPE!>packageInternal2Property<!><!> = object : MyClass(), MyTrait {}
 
-<!EXPOSED_PROPERTY_TYPE!><!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val packagePublicProperty<!> = object : MyClass(), MyTrait {}<!>
+<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val <!EXPOSED_PROPERTY_TYPE!>packagePublicProperty<!><!> = object : MyClass(), MyTrait {}
 
 <!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> fun <!EXPOSED_FUNCTION_RETURN_TYPE!>packageProtectedFunction<!>()<!> = object : MyClass(), MyTrait {}
 
diff --git a/compiler/testData/diagnostics/tests/exposed/internal.kt b/compiler/testData/diagnostics/tests/exposed/internal.kt
index 255a3ad355d..4a66f825eca 100644
--- a/compiler/testData/diagnostics/tests/exposed/internal.kt
+++ b/compiler/testData/diagnostics/tests/exposed/internal.kt
@@ -10,7 +10,7 @@ internal open class Your: My() {
 open class His: <!EXPOSED_SUPER_CLASS!>Your()<!> {
     protected open class Nested
     // error, public from internal
-    <!EXPOSED_PROPERTY_TYPE!>val x = My()<!>
+    val <!EXPOSED_PROPERTY_TYPE!>x<!> = My()
     // valid, private from internal
     private fun bar() = My()
     // valid, internal from internal
diff --git a/compiler/testData/diagnostics/tests/exposed/localInMemberType.kt b/compiler/testData/diagnostics/tests/exposed/localInMemberType.kt
index da900209967..8d7af475f85 100644
--- a/compiler/testData/diagnostics/tests/exposed/localInMemberType.kt
+++ b/compiler/testData/diagnostics/tests/exposed/localInMemberType.kt
@@ -4,9 +4,9 @@ class Something {
     internal val internalVal1 = object { override fun toString() = "!" }
     private val privateVal1 = object { override fun toString() = "!" }
 
-    <!EXPOSED_PROPERTY_TYPE!>public val publicVal2 = run { class A; A() }<!>
-    <!EXPOSED_PROPERTY_TYPE!>protected val protectedVal2 = run { class A; A() }<!>
-    <!EXPOSED_PROPERTY_TYPE!>internal val internalVal2 = run { class A; A() }<!>
+    public val <!EXPOSED_PROPERTY_TYPE!>publicVal2<!> = run { class A; A() }
+    protected val <!EXPOSED_PROPERTY_TYPE!>protectedVal2<!> = run { class A; A() }
+    internal val <!EXPOSED_PROPERTY_TYPE!>internalVal2<!> = run { class A; A() }
     private val privateVal2 = run { class A; A() }
 
     public fun publicFun1() = object { override fun toString() = "!" }
diff --git a/compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt b/compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt
index 0cbe05741a8..38f8b7cbd01 100644
--- a/compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt
+++ b/compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt
@@ -2,27 +2,27 @@ class My<T>(val value: T)
 
 open class Base
 
-<!EXPOSED_PROPERTY_TYPE!>val invalid1 = run {
+val <!EXPOSED_PROPERTY_TYPE!>invalid1<!> = run {
     class Local
     My(Local())
-}<!>
+}
 
-<!EXPOSED_PROPERTY_TYPE!>val invalid2 = My(object {})<!>
+val <!EXPOSED_PROPERTY_TYPE!>invalid2<!> = My(object {})
 
-<!EXPOSED_PROPERTY_TYPE!>val invalid3 = My(object : Base() {})<!>
+val <!EXPOSED_PROPERTY_TYPE!>invalid3<!> = My(object : Base() {})
 
-<!EXPOSED_PROPERTY_TYPE!>val invalid4 = run {
+val <!EXPOSED_PROPERTY_TYPE!>invalid4<!> = run {
     class Local
     My(My(Local()))
-}<!>
+}
 
-<!EXPOSED_PROPERTY_TYPE!>val invalid5 = run {
+val <!EXPOSED_PROPERTY_TYPE!>invalid5<!> = run {
     fun invalid5a() = run {
         class Local
         Local()
     }
     My(invalid5a())
-}<!>
+}
 
 // Valid: effectively Any
 val valid1 = object {}
diff --git a/compiler/testData/diagnostics/tests/exposed/object.kt b/compiler/testData/diagnostics/tests/exposed/object.kt
index 109fc25d91e..fd7d8bbbda9 100644
--- a/compiler/testData/diagnostics/tests/exposed/object.kt
+++ b/compiler/testData/diagnostics/tests/exposed/object.kt
@@ -1,7 +1,7 @@
 // From KT-10753
 object My : <!EXPOSED_SUPER_CLASS!>Inter()<!> {
     fun <!EXPOSED_FUNCTION_RETURN_TYPE!>foo<!>(<!EXPOSED_PARAMETER_TYPE!>arg: Inter<!>): Inter = arg
-    <!EXPOSED_PROPERTY_TYPE!>val x: Inter? = null<!>
+    val <!EXPOSED_PROPERTY_TYPE!>x<!>: Inter? = null
 }
 
 internal open class Inter
diff --git a/compiler/testData/diagnostics/tests/exposed/simple.kt b/compiler/testData/diagnostics/tests/exposed/simple.kt
index 6c21a890bcf..c5348c66589 100644
--- a/compiler/testData/diagnostics/tests/exposed/simple.kt
+++ b/compiler/testData/diagnostics/tests/exposed/simple.kt
@@ -10,7 +10,7 @@ public class Derived<<!EXPOSED_TYPE_PARAMETER_BOUND!>T: My<!>>(<!EXPOSED_PARAMET
 
     constructor(<!EXPOSED_PARAMETER_TYPE!>xx: My?<!>, <!EXPOSED_PARAMETER_TYPE!>x: My<!>): this(xx ?: x)
 
-    <!EXPOSED_PROPERTY_TYPE!>val y: Base? = null<!>
+    val <!EXPOSED_PROPERTY_TYPE!>y<!>: Base? = null
 
     val <!EXPOSED_RECEIVER_TYPE!>My<!>.z: Int
         get() = 42
diff --git a/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.kt b/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.kt
index f8ac999bb3a..358ed929e8b 100644
--- a/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.kt
+++ b/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.kt
@@ -15,4 +15,4 @@ package p1
 import p2.*
 
 val x: X = X()
-<!EXPOSED_PROPERTY_TYPE!>val y: <!INVISIBLE_REFERENCE!>Y<!> = <!INVISIBLE_MEMBER!>Y<!>()<!>
+val <!EXPOSED_PROPERTY_TYPE!>y<!>: <!INVISIBLE_REFERENCE!>Y<!> = <!INVISIBLE_MEMBER!>Y<!>()
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
index 06b89d9879c..3f614cbca9e 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
@@ -16,29 +16,29 @@ class MyJavaClass {
 //FILE:a.kt
 package a
 
-<!EXPOSED_PROPERTY_TYPE!>val mc = MyJavaClass()<!>
+val <!EXPOSED_PROPERTY_TYPE!>mc<!> = MyJavaClass()
 val x = MyJavaClass.staticMethod()
 val y = MyJavaClass.NestedClass.staticMethodOfNested()
-<!EXPOSED_PROPERTY_TYPE!>val z = MyJavaClass.NestedClass()<!>
+val <!EXPOSED_PROPERTY_TYPE!>z<!> = MyJavaClass.NestedClass()
 
 //FILE: b.kt
 package b
 
 import a.<!INVISIBLE_REFERENCE!>MyJavaClass<!>
 
-<!EXPOSED_PROPERTY_TYPE!>val mc1 = <!INVISIBLE_MEMBER!>MyJavaClass<!>()<!>
+val <!EXPOSED_PROPERTY_TYPE!>mc1<!> = <!INVISIBLE_MEMBER!>MyJavaClass<!>()
 
 val x = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>staticMethod<!>()
 val y = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_REFERENCE!>NestedClass<!>.<!INVISIBLE_MEMBER!>staticMethodOfNested<!>()
-<!EXPOSED_PROPERTY_TYPE!>val z = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()<!>
+val <!EXPOSED_PROPERTY_TYPE!>z<!> = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()
 
 //FILE: c.kt
 package a.c
 
 import a.<!INVISIBLE_REFERENCE!>MyJavaClass<!>
 
-<!EXPOSED_PROPERTY_TYPE!>val mc1 = <!INVISIBLE_MEMBER!>MyJavaClass<!>()<!>
+val <!EXPOSED_PROPERTY_TYPE!>mc1<!> = <!INVISIBLE_MEMBER!>MyJavaClass<!>()
 
 val x = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>staticMethod<!>()
 val y = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_REFERENCE!>NestedClass<!>.<!INVISIBLE_MEMBER!>staticMethodOfNested<!>()
-<!EXPOSED_PROPERTY_TYPE!>val z = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()<!>
\ No newline at end of file
+val <!EXPOSED_PROPERTY_TYPE!>z<!> = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
index b3a45c91266..d371da9c931 100644
--- a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
+++ b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
@@ -17,7 +17,7 @@ class E private constructor() {
 }
 
 val a = <!NO_COMPANION_OBJECT!>A<!>
-<!EXPOSED_PROPERTY_TYPE!>val b = <!INVISIBLE_MEMBER!>B<!><!>
+val <!EXPOSED_PROPERTY_TYPE!>b<!> = <!INVISIBLE_MEMBER!>B<!>
 val c = <!NO_COMPANION_OBJECT!>C<!>
 val d = D
 val e = E(42)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt b/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt
index 1574d35641e..bb4f2196574 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt
@@ -11,5 +11,5 @@ import p.*
 
 interface I {
     val v1: FilteringSequence
-    <!EXPOSED_PROPERTY_TYPE!>val v2: <!INVISIBLE_REFERENCE!>IndexingSequence<!><String><!>
+    val <!EXPOSED_PROPERTY_TYPE!>v2<!>: <!INVISIBLE_REFERENCE!>IndexingSequence<!><String>
 }