diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 8737e370ce9..72d8940bc62 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -240,8 +240,7 @@ public interface Errors {
 
     DiagnosticFactory0<JetObjectDeclaration> MANY_COMPANION_OBJECTS = DiagnosticFactory0.create(ERROR, COMPANION_OBJECT);
 
-    DiagnosticFactory1<PsiElement, DeclarationDescriptor> DEPRECATED_SYMBOL = DiagnosticFactory1.create(WARNING);
-    DiagnosticFactory2<PsiElement, DeclarationDescriptor, String> DEPRECATED_SYMBOL_WITH_MESSAGE = DiagnosticFactory2.create(WARNING);
+    DiagnosticFactory2<PsiElement, DeclarationDescriptor, String> DEPRECATION = DiagnosticFactory2.create(WARNING);
 
     // Objects
 
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 e82cc79fa45..84483c4ff80 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -292,8 +292,7 @@ public class DefaultErrorMessages {
 
         MAP.put(MANY_COMPANION_OBJECTS, "Only one companion object is allowed per class");
 
-        MAP.put(DEPRECATED_SYMBOL, "''{0}'' is deprecated.", DEPRECATION_RENDERER);
-        MAP.put(DEPRECATED_SYMBOL_WITH_MESSAGE, "''{0}'' is deprecated. {1}", DEPRECATION_RENDERER, STRING);
+        MAP.put(DEPRECATION, "''{0}'' is deprecated. {1}", DEPRECATION_RENDERER, STRING);
 
         MAP.put(LOCAL_OBJECT_NOT_ALLOWED, "Named object ''{0}'' is a singleton and cannot be local. Try to use anonymous object instead", NAME);
         MAP.put(LOCAL_INTERFACE_NOT_ALLOWED, "''{0}'' is an interface so it cannot be local. Try to use anonymous object or abstract class instead", NAME);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt
index 930829a1f08..de7ba45bd20 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt
@@ -23,6 +23,9 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.PROPERTY_GETTER
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.PROPERTY_SETTER
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.lexer.JetTokens
@@ -30,9 +33,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.annotations.argumentValue
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.PROPERTY_GETTER
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.PROPERTY_SETTER
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 
 public class DeprecatedSymbolValidator : SymbolUsageValidator {
@@ -116,11 +116,8 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator {
     }
 
     private fun createDeprecationDiagnostic(element: PsiElement, descriptor: DeclarationDescriptor, deprecated: AnnotationDescriptor): Diagnostic {
-        val message = deprecated.argumentValue("message") as? String
-        return if (message == null)
-            Errors.DEPRECATED_SYMBOL.on(element, descriptor.original)
-        else
-            Errors.DEPRECATED_SYMBOL_WITH_MESSAGE.on(element, descriptor.original, message)
+        val message = deprecated.argumentValue("message") as? String ?: ""
+        return Errors.DEPRECATION.on(element, descriptor.original, message)
     }
 
     private val PROPERTY_SET_OPERATIONS = TokenSet.create(JetTokens.EQ, JetTokens.PLUSEQ, JetTokens.MINUSEQ, JetTokens.MULTEQ,
diff --git a/compiler/testData/diagnostics/tests/Underscore.kt b/compiler/testData/diagnostics/tests/Underscore.kt
index 6cad835e3be..917b084b171 100644
--- a/compiler/testData/diagnostics/tests/Underscore.kt
+++ b/compiler/testData/diagnostics/tests/Underscore.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -DEPRECATED_SYMBOL_WITH_MESSAGE
+// !DIAGNOSTICS: -DEPRECATION
 
 <!UNDERSCORE_IS_DEPRECATED!>import kotlin.Deprecated as ___<!>
 
@@ -13,4 +13,4 @@ fun <!UNDERSCORE_IS_DEPRECATED!>__<!>(<!UNDERSCORE_IS_DEPRECATED!>___<!>: Int, y
     // in backquotes: allowed
     val `_` = __________
     <!UNDERSCORE_IS_DEPRECATED!>__<!>@ return if (y != null) __(____, y) else __(`_`, ______)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt
index 286e0580417..f016768d1a3 100644
--- a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt
@@ -4,6 +4,6 @@ annotation class obsolete()
 @Deprecated("text")
 annotation class obsoleteWithParam(val text: String)
 
-@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>obsolete<!> class Obsolete
+@<!DEPRECATION!>obsolete<!> class Obsolete
 
-@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>obsoleteWithParam<!>("text") class Obsolete2
\ No newline at end of file
+@<!DEPRECATION!>obsoleteWithParam<!>("text") class Obsolete2
diff --git a/compiler/testData/diagnostics/tests/deprecated/componentUsage.kt b/compiler/testData/diagnostics/tests/deprecated/componentUsage.kt
index fcc545c6be8..8e2ae53b4c5 100644
--- a/compiler/testData/diagnostics/tests/deprecated/componentUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/componentUsage.kt
@@ -7,5 +7,5 @@ class Data {
 }
 
 fun use() {
-    val (<!DEPRECATED_SYMBOL_WITH_MESSAGE!>x<!>, y) = Data()
-}
\ No newline at end of file
+    val (<!DEPRECATION!>x<!>, y) = Data()
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/functionUsage.kt b/compiler/testData/diagnostics/tests/deprecated/functionUsage.kt
index b233b286a9c..4c327ea7f50 100644
--- a/compiler/testData/diagnostics/tests/deprecated/functionUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/functionUsage.kt
@@ -22,28 +22,28 @@ object InvocableHolder {
 
 fun invoker() {
     val invocable = Invocable()
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>invocable<!>()
-    InvocableHolder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>invocable<!>()
+    <!DEPRECATION!>invocable<!>()
+    InvocableHolder.<!DEPRECATION!>invocable<!>()
 }
 
 fun block() {
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>(2)
+    <!DEPRECATION!>Obsolete<!>()
+    <!DEPRECATION!>Obsolete<!>(2)
 }
 
-fun expression() = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+fun expression() = <!DEPRECATION!>Obsolete<!>()
 
-fun reflection() = ::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
-fun reflection2() = UsefulClass::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>member<!>
+fun reflection() = ::<!DEPRECATION!>Obsolete<!>
+fun reflection2() = UsefulClass::<!DEPRECATION!>member<!>
 
 class Initializer {
-    val x = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+    val x = <!DEPRECATION!>Obsolete<!>()
 }
 
 @Deprecated("does nothing good")
 fun Any.doNothing() = this.toString()  // "this" should not be marked as deprecated despite it referes to deprecated function
 
 class Delegation {
-    val x by <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
-    var y by <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
-}
\ No newline at end of file
+    val x by <!DEPRECATION!>Obsolete<!>()
+    var y by <!DEPRECATION!>Obsolete<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt b/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt
index 5c1feef730b..5c084c26a0f 100644
--- a/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt
@@ -5,4 +5,4 @@ open class C<T>() {
     constructor(p: Int) : this(){}
 }
 
-class D : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C<String><!>(1)
\ No newline at end of file
+class D : <!DEPRECATION!>C<String><!>(1)
diff --git a/compiler/testData/diagnostics/tests/deprecated/imports.kt b/compiler/testData/diagnostics/tests/deprecated/imports.kt
index f203536c3c3..3796ae10e20 100644
--- a/compiler/testData/diagnostics/tests/deprecated/imports.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/imports.kt
@@ -1,8 +1,8 @@
-import <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C<!> as C2
+import <!DEPRECATION!>C<!> as C2
 
 @Deprecated("obsolete")
 class C {
     fun use() {}
 }
 
-fun useAlias(c : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>C2<!>) { c.use() }
\ No newline at end of file
+fun useAlias(c : <!DEPRECATION!>C2<!>) { c.use() }
diff --git a/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt b/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt
index 62fbe0dda0c..26051b639e5 100644
--- a/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt
@@ -19,6 +19,6 @@ class Iter2 {
 }
 
 fun use() {
-    for (x in <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Iter()<!>) {}
-    for (x in <!DEPRECATED_SYMBOL_WITH_MESSAGE, DEPRECATED_SYMBOL_WITH_MESSAGE!>Iter2()<!>) {}
-}
\ No newline at end of file
+    for (x in <!DEPRECATION!>Iter()<!>) {}
+    for (x in <!DEPRECATION, DEPRECATION!>Iter2()<!>) {}
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt
index 7d91ccd38c3..e5f2771f5bc 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt
@@ -11,6 +11,6 @@ public class A {
 
 // FILE: B.kt
 
-class B(private @property:Deprecated val foo: String) : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>A<!>() {
-    override fun getFoo(text: String): String = super.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>getFoo<!>(text + <!DEPRECATED_SYMBOL!>foo<!>)
-}
\ No newline at end of file
+class B(private @property:Deprecated val foo: String) : <!DEPRECATION!>A<!>() {
+    override fun getFoo(text: String): String = super.<!DEPRECATION!>getFoo<!>(text + <!DEPRECATION!>foo<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt b/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt
index 4397cee13f4..166f3cdbd85 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt
@@ -15,6 +15,6 @@ public class A {
 
 // FILE: B.kt
 
-class B(private val foo: String) : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>A<!>() {
-    override fun getFoo(text: String): String = super.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>getFoo<!>(text + foo)
+class B(private val foo: String) : <!DEPRECATION!>A<!>() {
+    override fun getFoo(text: String): String = super.<!DEPRECATION!>getFoo<!>(text + foo)
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt
index acc96d7eaec..e961047cb8f 100644
--- a/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt
@@ -12,7 +12,7 @@ class TopLevel {
 }
 
 fun useNested() {
-    val <!UNUSED_VARIABLE!>d<!> = TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.use()
-    TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.Nested2()
-    TopLevel.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Nested<!>.<!UNRESOLVED_REFERENCE!>CompanionNested2<!>()
-}
\ No newline at end of file
+    val <!UNUSED_VARIABLE!>d<!> = TopLevel.<!DEPRECATION!>Nested<!>.use()
+    TopLevel.<!DEPRECATION!>Nested<!>.Nested2()
+    TopLevel.<!DEPRECATION!>Nested<!>.<!UNRESOLVED_REFERENCE!>CompanionNested2<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/objectUsage.kt b/compiler/testData/diagnostics/tests/deprecated/objectUsage.kt
index 406bd1c86b5..6f6cccb9cb5 100644
--- a/compiler/testData/diagnostics/tests/deprecated/objectUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/objectUsage.kt
@@ -11,17 +11,17 @@ class Another {
 }
 
 fun first() {
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>.use()
+    <!DEPRECATION!>Another<!>.use()
 }
 
 fun useObject() {
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.use()
-    val <!UNUSED_VARIABLE!>x<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
+    <!DEPRECATION!>Obsolete<!>.use()
+    val <!UNUSED_VARIABLE!>x<!> = <!DEPRECATION!>Obsolete<!>
 }
 
 fun useCompanion() {
-    val <!UNUSED_VARIABLE!>d<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>
-    val <!UNUSED_VARIABLE!>x<!> = Another.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Companion<!>
-    Another.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Companion<!>.use()
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Another<!>.use()
-}
\ No newline at end of file
+    val <!UNUSED_VARIABLE!>d<!> = <!DEPRECATION!>Another<!>
+    val <!UNUSED_VARIABLE!>x<!> = Another.<!DEPRECATION!>Companion<!>
+    Another.<!DEPRECATION!>Companion<!>.use()
+    <!DEPRECATION!>Another<!>.use()
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
index 9b4ae13983f..e5585d8a22b 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt
@@ -15,8 +15,8 @@ class PropertyHolder {
     @Deprecated("text")
     var name = "String"
 
-    val valDelegate <!DEPRECATED_SYMBOL_WITH_MESSAGE!>by<!> Delegate()
-    var varDelegate <!DEPRECATED_SYMBOL_WITH_MESSAGE, DEPRECATED_SYMBOL_WITH_MESSAGE!>by<!> Delegate()
+    val valDelegate <!DEPRECATION!>by<!> Delegate()
+    var varDelegate <!DEPRECATION, DEPRECATION!>by<!> Delegate()
 
     public val test1: String = ""
         @Deprecated("val-getter") get
@@ -35,24 +35,24 @@ class PropertyHolder {
 }
 
 fun PropertyHolder.extFunction() {
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!> = "ext"
-    <!DEPRECATED_SYMBOL_WITH_MESSAGE!>test1<!>
+    <!DEPRECATION!>test2<!> = "ext"
+    <!DEPRECATION!>test1<!>
 }
 
 fun fn() {
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test1<!>
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!>
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test2<!> = ""
+    PropertyHolder().<!DEPRECATION!>test1<!>
+    PropertyHolder().<!DEPRECATION!>test2<!>
+    PropertyHolder().<!DEPRECATION!>test2<!> = ""
 
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test3<!>
+    PropertyHolder().<!DEPRECATION!>test3<!>
     PropertyHolder().test3 = ""
 
     PropertyHolder().test4
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>test4<!> = ""
+    PropertyHolder().<!DEPRECATION!>test4<!> = ""
 
-    val <!UNUSED_VARIABLE!>a<!> = PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>x<!>
-    val <!UNUSED_VARIABLE!>b<!> = PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!>
-    PropertyHolder().<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!> = "value"
+    val <!UNUSED_VARIABLE!>a<!> = PropertyHolder().<!DEPRECATION!>x<!>
+    val <!UNUSED_VARIABLE!>b<!> = PropertyHolder().<!DEPRECATION!>name<!>
+    PropertyHolder().<!DEPRECATION!>name<!> = "value"
 
     val <!UNUSED_VARIABLE!>d<!> = PropertyHolder().valDelegate
     PropertyHolder().varDelegate = 1
@@ -60,5 +60,5 @@ fun fn() {
 
 fun literals() {
     PropertyHolder::test1
-    PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>name<!>
-}
\ No newline at end of file
+    PropertyHolder::<!DEPRECATION!>name<!>
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt
index b5fb8c11012..d4ddefcc765 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt
@@ -17,15 +17,15 @@ class PropertyHolder {
 fun fn() {
     val holder = PropertyHolder()
 
-    holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a1<!>
-    holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a2<!>
-    holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>withGetter<!>
-    holder.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>withSetter<!> = "A"
+    holder.<!DEPRECATION!>a1<!>
+    holder.<!DEPRECATION!>a2<!>
+    holder.<!DEPRECATION!>withGetter<!>
+    holder.<!DEPRECATION!>withSetter<!> = "A"
 }
 
 fun literals() {
-    PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a1<!>
-    PropertyHolder::<!DEPRECATED_SYMBOL_WITH_MESSAGE!>a2<!>
+    PropertyHolder::<!DEPRECATION!>a1<!>
+    PropertyHolder::<!DEPRECATION!>a2<!>
     PropertyHolder::withGetter
     PropertyHolder::withSetter
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt
index 74e16785b4d..d8bd041ade2 100644
--- a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt
@@ -10,33 +10,33 @@ open class Obsolete2 @Deprecated("Constructor") constructor() {
 
 interface Generic<T>
 
-open class Derived() : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+open class Derived() : <!DEPRECATION!>Obsolete<!>()
 
 class Derived2() : Derived()
 
-class TypeParam : Generic<<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>>
+class TypeParam : Generic<<!DEPRECATION!>Obsolete<!>>
 
-object Object : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+object Object : <!DEPRECATION!>Obsolete<!>()
 
 class Properties {
-    val x : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
-    var y : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+    val x : <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
+    var y : <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
 
-    var n : <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>
-        get() = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+    var n : <!DEPRECATION!>Obsolete<!>
+        get() = <!DEPRECATION!>Obsolete<!>()
         set(value) {}
 }
 
-fun param(param: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>) { param.use() }
+fun param(param: <!DEPRECATION!>Obsolete<!>) { param.use() }
 
-fun funcParamReceiver(param: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.()->Unit) { <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>().param() }
-fun funcParamParam(param: (<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>)->Unit) { param(<!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()) }
-fun funcParamRetVal(param: ()-><!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>) { param() }
+fun funcParamReceiver(param: <!DEPRECATION!>Obsolete<!>.()->Unit) { <!DEPRECATION!>Obsolete<!>().param() }
+fun funcParamParam(param: (<!DEPRECATION!>Obsolete<!>)->Unit) { param(<!DEPRECATION!>Obsolete<!>()) }
+fun funcParamRetVal(param: ()-><!DEPRECATION!>Obsolete<!>) { param() }
 
-fun <T: <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>> constraint() {}
+fun <T: <!DEPRECATION!>Obsolete<!>> constraint() {}
 
-fun <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>.receiver() {}
+fun <!DEPRECATION!>Obsolete<!>.receiver() {}
 
-fun retVal(): <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!> = <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>()
+fun retVal(): <!DEPRECATION!>Obsolete<!> = <!DEPRECATION!>Obsolete<!>()
 
-fun nullableRetVal(): <!DEPRECATED_SYMBOL_WITH_MESSAGE!>Obsolete<!>? = null
\ No newline at end of file
+fun nullableRetVal(): <!DEPRECATION!>Obsolete<!>? = null
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt
index 57fc070a77f..3028af31e6f 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt
@@ -1,6 +1,6 @@
 // No supertype at all
 class A1 {
     fun test() {
-        <!SUPER_CANT_BE_EXTENSION_RECEIVER!>super<!>.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>identityEquals<!>(null) // Call to an extension function
+        <!SUPER_CANT_BE_EXTENSION_RECEIVER!>super<!>.<!DEPRECATION!>identityEquals<!>(null) // Call to an extension function
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
index 7f5ebd1addb..ed8a83014f2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldNotOnProperty.kt
@@ -1,16 +1,16 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class C {
 
-    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> constructor(s: String) {
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> constructor(s: String) {
 
     }
 
-    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> private fun foo(s: String = "OK") {
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> private fun foo(s: String = "OK") {
 
     }
 }
 
-<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!>
+<!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!>
 fun foo() {
-    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>kotlin.jvm.publicField<!><!> val <!UNUSED_VARIABLE!>x<!> = "A"
-}
\ No newline at end of file
+    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>kotlin.jvm.publicField<!><!> val <!UNUSED_VARIABLE!>x<!> = "A"
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
index 68d0c9c0080..a12181abb9f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/publicField/publicFieldOnDelegatedProperty.kt
@@ -1,3 +1,3 @@
 class C {
-    private <!INAPPLICABLE_PUBLIC_FIELD!>@<!DEPRECATED_SYMBOL_WITH_MESSAGE!>publicField<!><!> val a: String by lazy { "A" }
-}
\ No newline at end of file
+    private <!INAPPLICABLE_PUBLIC_FIELD!>@<!DEPRECATION!>publicField<!><!> val a: String by lazy { "A" }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
index 089f72a5f03..f409857d53d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATED_SYMBOL_WITH_MESSAGE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATION
 
 inline fun<reified T> foo(block: () -> T): String = block().toString()
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
index 266fbe4aa98..2777162c0d7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
 private fun PsiElement.getJavaDescriptorResolver(): JavaDescriptorResolver? {
     if (!ProjectRootsUtil.isInProjectOrLibraryClassFile(this)) return null
 
-    @Suppress("DEPRECATED_SYMBOL_WITH_MESSAGE")
+    @Suppress("DEPRECATION")
     return KotlinCacheService.getInstance(project).getProjectService(JvmPlatform, this.getModuleInfo(), javaClass<JavaDescriptorResolver>())
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
index 4d0f6d8f266..fe003530865 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
@@ -149,9 +149,8 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension {
                     for (textRange in textRanges) {
                         val annotation = holder.createWarningAnnotation(textRange, getDefaultMessage(diagnostic))
 
-                        when (factory) {
-                            Errors.DEPRECATED_SYMBOL,
-                            Errors.DEPRECATED_SYMBOL_WITH_MESSAGE -> annotation.setTextAttributes(CodeInsightColors.DEPRECATED_ATTRIBUTES)
+                        if (factory == Errors.DEPRECATION) {
+                            annotation.textAttributes = CodeInsightColors.DEPRECATED_ATTRIBUTES
                         }
 
                         setUpAnnotation(diagnostic, annotation, if (factory in Errors.UNUSED_ELEMENT_DIAGNOSTICS)
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
index f8d34970f13..7dc08117b3d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
@@ -88,7 +88,7 @@ public class KotlinCleanupInspection(): LocalInspectionTool(), CleanupLocalInspe
             Errors.USELESS_CAST,
             Errors.USELESS_ELVIS,
             ErrorsJvm.POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION,
-            Errors.DEPRECATED_SYMBOL_WITH_MESSAGE,
+            Errors.DEPRECATION,
             Errors.NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION,
             Errors.BACKING_FIELD_OLD_SYNTAX,
             Errors.OPERATOR_MODIFIER_REQUIRED,
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index c3c3abd67d6..4546271ec90 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -312,8 +312,7 @@ public class QuickFixRegistrar : QuickFixContributor {
         UNRESOLVED_REFERENCE.registerFactory(ReplaceObsoleteLabelSyntaxFix,
                                         ReplaceObsoleteLabelSyntaxFix.createWholeProjectFixFactory())
 
-        DEPRECATED_SYMBOL_WITH_MESSAGE.registerFactory(DeprecatedSymbolUsageFix,
-                                                       DeprecatedSymbolUsageInWholeProjectFix)
+        DEPRECATION.registerFactory(DeprecatedSymbolUsageFix, DeprecatedSymbolUsageInWholeProjectFix)
 
         POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION.registerFactory(ReplaceJavaAnnotationPositionedArgumentsFix)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
index 9a78679594f..6af293e3ddd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
@@ -100,7 +100,7 @@ public abstract class DeprecatedSymbolUsageFixBase(
             else
                 null) ?: return null
 
-            val descriptor = Errors.DEPRECATED_SYMBOL_WITH_MESSAGE.cast(deprecatedDiagnostic).a
+            val descriptor = Errors.DEPRECATION.cast(deprecatedDiagnostic).a
             val replacement = DeprecatedSymbolUsageFixBase.fetchReplaceWithPattern(descriptor, nameExpression.project) ?: return null
             return Data(nameExpression, replacement, descriptor)
         }
diff --git a/idea/testData/highlighter/deprecated/Class.kt b/idea/testData/highlighter/deprecated/Class.kt
index 95f0a217fda..4463629e476 100644
--- a/idea/testData/highlighter/deprecated/Class.kt
+++ b/idea/testData/highlighter/deprecated/Class.kt
@@ -5,16 +5,16 @@ import java.util.ArrayList
 @Deprecated("Use A instead") open class MyClass {}
 
 fun test() {
-    val a : <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>? = null
-    val b = <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>()
-    val c = ArrayList<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>>()
+    val a : <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>? = null
+    val b = <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>()
+    val c = ArrayList<<warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>>()
 
     a == b && a == c
 }
 
-class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>() {}
+class Test(): <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>() {}
 
-class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyClass' is deprecated. Use A instead">MyClass</warning>) {}
+class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyClass' is deprecated. Use A instead">MyClass</warning>) {}
 
 // NO_CHECK_INFOS
 // NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/ClassObject.kt b/idea/testData/highlighter/deprecated/ClassObject.kt
index 86efefe728d..dc745a8ec4e 100644
--- a/idea/testData/highlighter/deprecated/ClassObject.kt
+++ b/idea/testData/highlighter/deprecated/ClassObject.kt
@@ -1,13 +1,13 @@
 fun test() {
-   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
+   <warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
    MyClass()
    val a: MyClass? = null
    val b: MyTrait? = null
-   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">test</warning>
-   MyTrait.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
-   <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
-   MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
-   MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
+   <warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">test</warning>
+   MyTrait.<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
+   <warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
+   MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
+   MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">test</warning>
 
    a == b
 }
@@ -25,4 +25,4 @@ interface MyTrait {
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Function.kt b/idea/testData/highlighter/deprecated/Function.kt
index 5048d727558..95ae3e4a158 100644
--- a/idea/testData/highlighter/deprecated/Function.kt
+++ b/idea/testData/highlighter/deprecated/Function.kt
@@ -1,9 +1,9 @@
 fun test() {
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1(): Unit' is deprecated. Use A instead">test1</warning>()
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2(): Unit' is deprecated. Use A instead">test2</warning>()
-    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3(): Unit' is deprecated. Use A instead">test3</warning>()
+    <warning descr="[DEPRECATION] 'test1(): Unit' is deprecated. Use A instead">test1</warning>()
+    MyClass().<warning descr="[DEPRECATION] 'test2(): Unit' is deprecated. Use A instead">test2</warning>()
+    MyClass.<warning descr="[DEPRECATION] 'test3(): Unit' is deprecated. Use A instead">test3</warning>()
 
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4(Int, Int): Unit' is deprecated. Use A instead">test4</warning>(1, 2)
+    <warning descr="[DEPRECATION] 'test4(Int, Int): Unit' is deprecated. Use A instead">test4</warning>(1, 2)
 }
 
 @Deprecated("Use A instead") fun test1() { }
@@ -18,4 +18,4 @@ class MyClass() {
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Get.kt b/idea/testData/highlighter/deprecated/Get.kt
index 0a4c6ab9c3a..5f23a34c634 100644
--- a/idea/testData/highlighter/deprecated/Get.kt
+++ b/idea/testData/highlighter/deprecated/Get.kt
@@ -6,8 +6,8 @@ fun test() {
   val x1 = MyClass()
   val x2 = MyClass()
 
-  <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'get(MyClass): MyClass' is deprecated. Use A instead">x1[x2]</warning>
+  <warning descr="[DEPRECATION] 'get(MyClass): MyClass' is deprecated. Use A instead">x1[x2]</warning>
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Getter.kt b/idea/testData/highlighter/deprecated/Getter.kt
index 574604ca3be..43296d71aed 100644
--- a/idea/testData/highlighter/deprecated/Getter.kt
+++ b/idea/testData/highlighter/deprecated/Getter.kt
@@ -1,10 +1,10 @@
 fun test() {
     val c = MyClass()
-    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test1: String' is deprecated. Use A instead">test1</warning>
-    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'getter for test2: String' is deprecated. Use A instead">test2</warning>
+    c.<warning descr="[DEPRECATION] 'getter for test1: String' is deprecated. Use A instead">test1</warning>
+    c.<warning descr="[DEPRECATION] 'getter for test2: String' is deprecated. Use A instead">test2</warning>
     c.test2 = ""
 
-    c.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
+    c.<warning descr="[DEPRECATION] 'test3: String' is deprecated. Use A instead">test3</warning>
 }
 
 class MyClass() {
@@ -19,4 +19,4 @@ class MyClass() {
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Inc.kt b/idea/testData/highlighter/deprecated/Inc.kt
index 2bfdc67aba8..668f83ab398 100644
--- a/idea/testData/highlighter/deprecated/Inc.kt
+++ b/idea/testData/highlighter/deprecated/Inc.kt
@@ -6,9 +6,9 @@ class MyClass {
 
 fun test() {
     var x3 = MyClass()
-    x3<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'inc(): MyClass' is deprecated. Use A instead">++</warning>
+    x3<warning descr="[DEPRECATION] 'inc(): MyClass' is deprecated. Use A instead">++</warning>
     x3.i
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Invalid.kt b/idea/testData/highlighter/deprecated/Invalid.kt
index 6b6d16de6f6..b1d714035c2 100644
--- a/idea/testData/highlighter/deprecated/Invalid.kt
+++ b/idea/testData/highlighter/deprecated/Invalid.kt
@@ -3,9 +3,9 @@ fun foo() {}
 @Deprecated(<error>false</error>)
 fun boo() {}
 
-fun far() = <warning descr="[DEPRECATED_SYMBOL] 'foo(): Unit' is deprecated.">foo</warning>()
+fun far() = <warning descr="[DEPRECATION] 'foo(): Unit' is deprecated. ">foo</warning>()
 
-fun bar() = <warning descr="[DEPRECATED_SYMBOL] 'boo(): Unit' is deprecated.">boo</warning>()
+fun bar() = <warning descr="[DEPRECATION] 'boo(): Unit' is deprecated. ">boo</warning>()
 
 // NO_CHECK_INFOS
 // NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Invoke.kt b/idea/testData/highlighter/deprecated/Invoke.kt
index 3b51ab494db..3ba3a74f493 100644
--- a/idea/testData/highlighter/deprecated/Invoke.kt
+++ b/idea/testData/highlighter/deprecated/Invoke.kt
@@ -5,8 +5,8 @@ class MyRunnable() {}
 
 fun test() {
   val m = MyRunnable()
-  <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'invoke(): Unit' is deprecated. Use A instead">m</warning>()
+  <warning descr="[DEPRECATION] 'invoke(): Unit' is deprecated. Use A instead">m</warning>()
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Operation.kt b/idea/testData/highlighter/deprecated/Operation.kt
index b1ed6a6a215..cf2dd29971c 100644
--- a/idea/testData/highlighter/deprecated/Operation.kt
+++ b/idea/testData/highlighter/deprecated/Operation.kt
@@ -19,20 +19,20 @@ fun test() {
     val x1 = MyClass()
     val x2 = MyClass()
 
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'minus(MyClass): Unit' is deprecated. Use A instead">-</warning> x2
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'div(MyClass): Unit' is deprecated. Use A instead">/</warning> x2
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'times(MyClass): Unit' is deprecated. Use A instead">*</warning> x2
+    x1 <warning descr="[DEPRECATION] 'minus(MyClass): Unit' is deprecated. Use A instead">-</warning> x2
+    x1 <warning descr="[DEPRECATION] 'div(MyClass): Unit' is deprecated. Use A instead">/</warning> x2
+    x1 <warning descr="[DEPRECATION] 'times(MyClass): Unit' is deprecated. Use A instead">*</warning> x2
 
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'not(): Unit' is deprecated. Use A instead">!</warning>x1
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plus(): Unit' is deprecated. Use A instead">+</warning>x1
+    <warning descr="[DEPRECATION] 'not(): Unit' is deprecated. Use A instead">!</warning>x1
+    <warning descr="[DEPRECATION] 'plus(): Unit' is deprecated. Use A instead">+</warning>x1
 
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">in</warning> x2
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'contains(MyClass): Boolean' is deprecated. Use A instead">!in</warning> x2
+    x1 <warning descr="[DEPRECATION] 'contains(MyClass): Boolean' is deprecated. Use A instead">in</warning> x2
+    x1 <warning descr="[DEPRECATION] 'contains(MyClass): Boolean' is deprecated. Use A instead">!in</warning> x2
 
-    x1 <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'plusAssign(MyClass): Unit' is deprecated. Use A instead">+=</warning> x2
+    x1 <warning descr="[DEPRECATION] 'plusAssign(MyClass): Unit' is deprecated. Use A instead">+=</warning> x2
 
-    x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): IntRange' is deprecated. Use A instead">..</warning>x2
+    x1<warning descr="[DEPRECATION] 'rangeTo(MyClass): IntRange' is deprecated. Use A instead">..</warning>x2
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Property.kt b/idea/testData/highlighter/deprecated/Property.kt
index 144887263ea..d51467599be 100644
--- a/idea/testData/highlighter/deprecated/Property.kt
+++ b/idea/testData/highlighter/deprecated/Property.kt
@@ -1,11 +1,11 @@
 fun test() {
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test1: String' is deprecated. Use A instead">test1</warning> == ""
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test2: String' is deprecated. Use A instead">test2</warning>
-    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test3: String' is deprecated. Use A instead">test3</warning>
+    <warning descr="[DEPRECATION] 'test1: String' is deprecated. Use A instead">test1</warning> == ""
+    MyClass().<warning descr="[DEPRECATION] 'test2: String' is deprecated. Use A instead">test2</warning>
+    MyClass.<warning descr="[DEPRECATION] 'test3: String' is deprecated. Use A instead">test3</warning>
 
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test4: String' is deprecated. Use A instead">test4</warning> == ""
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test5: String' is deprecated. Use A instead">test5</warning>
-    MyClass.<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'test6: String' is deprecated. Use A instead">test6</warning>
+    <warning descr="[DEPRECATION] 'test4: String' is deprecated. Use A instead">test4</warning> == ""
+    MyClass().<warning descr="[DEPRECATION] 'test5: String' is deprecated. Use A instead">test5</warning>
+    MyClass.<warning descr="[DEPRECATION] 'test6: String' is deprecated. Use A instead">test6</warning>
 }
 
 @Deprecated("Use A instead") val test1: String = ""
@@ -22,4 +22,4 @@ class MyClass() {
 }
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/RangeTo.kt b/idea/testData/highlighter/deprecated/RangeTo.kt
index e9a5544e1d0..500917c9e41 100644
--- a/idea/testData/highlighter/deprecated/RangeTo.kt
+++ b/idea/testData/highlighter/deprecated/RangeTo.kt
@@ -11,7 +11,7 @@ fun test() {
     val x1 = MyClass()
     val x2 = MyClass()
 
-    for (i in x1<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'rangeTo(MyClass): Iterable<Int>' is deprecated. Use A instead">..</warning>x2) {
+    for (i in x1<warning descr="[DEPRECATION] 'rangeTo(MyClass): Iterable<Int>' is deprecated. Use A instead">..</warning>x2) {
 
     }
 }
diff --git a/idea/testData/highlighter/deprecated/Setter.kt b/idea/testData/highlighter/deprecated/Setter.kt
index 75f78cb3286..8050d22314d 100644
--- a/idea/testData/highlighter/deprecated/Setter.kt
+++ b/idea/testData/highlighter/deprecated/Setter.kt
@@ -1,20 +1,20 @@
 fun test() {
     MyClass().test1
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> = 0
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> = 0
 
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>++
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>--
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>++
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>--
 
-    ++MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
-    --MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
+    ++MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
+    --MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning>
 
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> += 1
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> -= 1
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> /= 1
-    MyClass().<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> *= 1
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> += 1
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> -= 1
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> /= 1
+    MyClass().<warning descr="[DEPRECATION] 'setter for test1: Int' is deprecated. Use A instead">test1</warning> *= 1
 
     test2 + 1
-    <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'setter for test2: Int' is deprecated. Use A instead">test2</warning> = 10
+    <warning descr="[DEPRECATION] 'setter for test2: Int' is deprecated. Use A instead">test2</warning> = 10
 }
 
 class MyClass() {
@@ -26,4 +26,4 @@ public var test2: Int = 0
       @Deprecated("Use A instead") set
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS
diff --git a/idea/testData/highlighter/deprecated/Trait.kt b/idea/testData/highlighter/deprecated/Trait.kt
index e22d769027b..30175ebf3f9 100644
--- a/idea/testData/highlighter/deprecated/Trait.kt
+++ b/idea/testData/highlighter/deprecated/Trait.kt
@@ -1,14 +1,14 @@
 @Deprecated("Use A instead") interface MyTrait { }
 
 fun test() {
-   val a: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
-   val b: List<<warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
+   val a: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
+   val b: List<<warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
    a == b
 }
 
-class Test(): <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
+class Test(): <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
 
-class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATED_SYMBOL_WITH_MESSAGE] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
+class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
 
 // NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
\ No newline at end of file
+// NO_CHECK_WEAK_WARNINGS