diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 4ba5be461fe..6afacbe36ba 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -376,7 +376,7 @@ public interface Errors {
     DiagnosticFactory1<KtModifierListOwner, CallableMemberDescriptor> NOTHING_TO_OVERRIDE = DiagnosticFactory1.create(ERROR, OVERRIDE_MODIFIER);
 
     DiagnosticFactory3<KtNamedDeclaration, CallableMemberDescriptor, CallableMemberDescriptor, DeclarationDescriptor> VIRTUAL_MEMBER_HIDDEN =
-            DiagnosticFactory3.create(ERROR, DECLARATION_SIGNATURE);
+            DiagnosticFactory3.create(ERROR, DECLARATION_NAME);
 
     DiagnosticFactory2<KtModifierListOwner, CallableMemberDescriptor, CallableDescriptor> CANNOT_OVERRIDE_INVISIBLE_MEMBER =
             DiagnosticFactory2.create(ERROR, OVERRIDE_MODIFIER);
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
index f93232d44ce..d333d24e91d 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
@@ -1,6 +1,6 @@
 enum class E {
     ENTRY;
 
-    <!VIRTUAL_MEMBER_HIDDEN!>fun getDeclaringClass()<!> {}
-    <!VIRTUAL_MEMBER_HIDDEN!>fun finalize()<!> {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>getDeclaringClass<!>() {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>finalize<!>() {}
 }
diff --git a/compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt b/compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt
index b472b0df38b..0704b2693f3 100644
--- a/compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt
+++ b/compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt
@@ -1,5 +1,5 @@
 interface IA {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun toString(): String<!> = "IB"
+    fun <!VIRTUAL_MEMBER_HIDDEN!>toString<!>(): String = "IB"
 
     override fun equals(other: Any?): Boolean
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/override/Generics.kt b/compiler/testData/diagnostics/tests/override/Generics.kt
index 66436675fa8..7275172c0fc 100644
--- a/compiler/testData/diagnostics/tests/override/Generics.kt
+++ b/compiler/testData/diagnostics/tests/override/Generics.kt
@@ -23,8 +23,8 @@ open class MyGenericClass<T>(t : T) : MyTrait<T>, MyAbstractClass<T>(), MyProps<
 class MyChildClass() : MyGenericClass<Int>(1) {}
 class MyChildClass1<T>(t : T) : MyGenericClass<T>(t) {}
 class MyChildClass2<T>(t : T) : MyGenericClass<T>(t) {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo(t: T)<!> = t
-    <!VIRTUAL_MEMBER_HIDDEN!>val pr : T<!> = t
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>(t: T) = t
+    val <!VIRTUAL_MEMBER_HIDDEN!>pr<!> : T = t
     override fun bar(t: T) = t
     override val p : T = t
 }
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt b/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt
index 71f542a7d31..f7160d06304 100644
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt
+++ b/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt
@@ -7,9 +7,9 @@ interface Y {
 }
 
 class Z : X, Y {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo(a : Int)<!> {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>(a : Int) {}
 }
 
 object ZO : X, Y {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo(a : Int)<!> {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>(a : Int) {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/override/NonGenerics.kt b/compiler/testData/diagnostics/tests/override/NonGenerics.kt
index aabfb8b26f4..a222e84992c 100644
--- a/compiler/testData/diagnostics/tests/override/NonGenerics.kt
+++ b/compiler/testData/diagnostics/tests/override/NonGenerics.kt
@@ -36,15 +36,15 @@ class MyChildClass() : MyClass() {}
 }
 
 <!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass4<!>() : MyTrait, MyAbstractClass() {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo()<!> {}
-    <!VIRTUAL_MEMBER_HIDDEN, MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val pr : Unit<!>
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>() {}
+    <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val <!VIRTUAL_MEMBER_HIDDEN!>pr<!> : Unit<!>
     <!NOTHING_TO_OVERRIDE!>override<!> fun other() {}
     <!NOTHING_TO_OVERRIDE!>override<!> val otherPr : Int = 1
 }
 
 class MyChildClass1() : MyClass() {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo()<!> {}
-    <!VIRTUAL_MEMBER_HIDDEN!>val pr : Unit<!> = Unit
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>() {}
+    val <!VIRTUAL_MEMBER_HIDDEN!>pr<!> : Unit = Unit
     override fun bar() {}
     override val prr : Unit = Unit
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
index e0e5ba34eeb..e5638ff3996 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
@@ -25,7 +25,7 @@ fun test() {
 }
 
 class E: A() {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun foo()<!> = A()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>foo<!>() = A()
 
     init {
         val a: A = foo() // todo: discuss
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt
index 8775d553f70..9dab6a362b5 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/basic.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN
 
 abstract class Test1 : Map<String, String> {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun containsKey(key: String): Boolean<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>containsKey<!>(key: String): Boolean = TODO()
 
     fun getOrDefault(key: String, defaultValue: String): String = TODO()
 }
@@ -11,7 +11,7 @@ abstract class Test2 : MutableMap<String, String> {
 }
 
 abstract class Test3 : java.util.AbstractMap<String, String>() {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun containsKey(key: String): Boolean<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>containsKey<!>(key: String): Boolean = TODO()
 
     fun replace(key: String, value: String): String? = TODO()
 }
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt
index a4d4ee29353..83381fd92e4 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/delegation.kt
@@ -7,7 +7,7 @@
 open class WithDelegation(val m: Map<String, String>) : Map<String, String> by m
 
 class TestNoDelegationToDefaultMethods(m: Map<String, String>): WithDelegation(m) {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun containsKey(key: String): Boolean<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>containsKey<!>(key: String): Boolean = TODO()
 
     fun getOrDefault(key: String, defaultValue: String): String = TODO()
 
@@ -23,10 +23,10 @@ interface IBaseWithKotlinDeclaration : Map<String, String> {
 abstract class WithDelegation2(val m: Map<String, String>) : Map<String, String> by m, IBaseWithKotlinDeclaration
 
 abstract class TestNoDelegationToDefaultMethods2(m: Map<String, String>): WithDelegation2(m) {
-    <!VIRTUAL_MEMBER_HIDDEN!>fun containsKey(key: String): Boolean<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>containsKey<!>(key: String): Boolean = TODO()
 
     fun getOrDefault(key: String, defaultValue: String): String = TODO()
 
     // VIRTUAL_MEMBER_HIDDEN: hides member declaration inherited from a Kotlin interface
-    <!VIRTUAL_MEMBER_HIDDEN!>fun replace(key: String, value: String): String?<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>replace<!>(key: String, value: String): String? = TODO()
 }
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt
index ea245fa01a3..7da1c1f8486 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/derivedInterfacesWithKotlinFun.kt
@@ -6,10 +6,10 @@ interface IBaseWithKotlinDeclaration : Map<String, String> {
 
 interface TestDerivedInterfaceHidingWithKotlinDeclaration : IBaseWithKotlinDeclaration {
     // VIRTUAL_MEMBER_HIDDEN: hides member declaration inherited from a Kotlin interface
-    <!VIRTUAL_MEMBER_HIDDEN!>fun replace(key: String, value: String): String?<!>
+    fun <!VIRTUAL_MEMBER_HIDDEN!>replace<!>(key: String, value: String): String?
 }
 
 interface TestDerivedInterfaceDefaultWithKotlinDeclaration : IBaseWithKotlinDeclaration {
     // VIRTUAL_MEMBER_HIDDEN: hides member declaration inherited from a Kotlin interface
-    <!VIRTUAL_MEMBER_HIDDEN!>fun replace(key: String, value: String): String?<!> = TODO()
+    fun <!VIRTUAL_MEMBER_HIDDEN!>replace<!>(key: String, value: String): String? = TODO()
 }
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt
index 4023f404640..c9992a275ce 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/backwardCompatibility/finalize.kt
@@ -1,8 +1,8 @@
 enum class TestEnum {
     ENTRY;
 
-    <!VIRTUAL_MEMBER_HIDDEN!>fun getDeclaringClass()<!> {}
-    <!VIRTUAL_MEMBER_HIDDEN!>fun finalize()<!> {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>getDeclaringClass<!>() {}
+    fun <!VIRTUAL_MEMBER_HIDDEN!>finalize<!>() {}
 }
 
 class TestFinalize {
diff --git a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt
index 0d26c85c85c..be3268b47e4 100644
--- a/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt
+++ b/compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt
@@ -17,7 +17,7 @@ class A1 : java.util.ArrayList<String>() {
     fun stream(): java.util.stream.Stream<String> = super.<!UNRESOLVED_REFERENCE!>stream<!>()
 
     // `sort` is defined in ArrayList, so it was impossible to declare it in 1.0 without an 'override' keyword
-    <!VIRTUAL_MEMBER_HIDDEN!>fun sort(c: Comparator<in String>?)<!> {
+    fun <!VIRTUAL_MEMBER_HIDDEN!>sort<!>(c: Comparator<in String>?) {
         super.sort(c)
     }
 }