diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
index c916a251e4a..0d478ee8048 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
@@ -108,7 +108,7 @@ abstract public class JetClassOrObject :
 
     public fun getSecondaryConstructors(): List<JetSecondaryConstructor> = getBody()?.getSecondaryConstructors().orEmpty()
 
-    @Deprecated(value = "It's no more possible to determine it exactly using AST. Use ClassDescriptor.getKind() instead")
+    @Deprecated("It's no more possible to determine it exactly using AST. Use ClassDescriptor.getKind() instead")
     public fun isAnnotation(): Boolean =
             getAnnotation(KotlinBuiltIns.FQ_NAMES.annotation.shortName().asString()) != null || hasModifier(JetTokens.ANNOTATION_KEYWORD)
 
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 953634021b9..930829a1f08 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt
@@ -116,7 +116,7 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator {
     }
 
     private fun createDeprecationDiagnostic(element: PsiElement, descriptor: DeclarationDescriptor, deprecated: AnnotationDescriptor): Diagnostic {
-        val message = deprecated.argumentValue("value") as? String
+        val message = deprecated.argumentValue("message") as? String
         return if (message == null)
             Errors.DEPRECATED_SYMBOL.on(element, descriptor.original)
         else
diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index 4c5416311ac..ccdf558b75a 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -1,7 +1,7 @@
 package-fragment kotlin
 
 public fun </*0*/ reified T> arrayOfNulls(/*0*/ size: kotlin.Int): kotlin.Array<T?>
-@kotlin.Deprecated(replaceWith = kotlin.ReplaceWith(expression = "this === other", imports = {}), value = "This function is deprecated, use === instead") public fun kotlin.Any?.identityEquals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+@kotlin.Deprecated(message = "This function is deprecated, use === instead", replaceWith = kotlin.ReplaceWith(expression = "this === other", imports = {})) public fun kotlin.Any?.identityEquals(/*0*/ other: kotlin.Any?): kotlin.Boolean
 public operator fun kotlin.String?.plus(/*0*/ other: kotlin.Any?): kotlin.String
 public fun kotlin.Any?.toString(): kotlin.String
 
@@ -285,11 +285,31 @@ public interface Comparable</*0*/ in T> {
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER}) @kotlin.annotation.MustBeDocumented() @kotlin.annotation.annotation() public final class Deprecated : kotlin.Annotation {
-    /*primary*/ public constructor Deprecated(/*0*/ value: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ...)
+    /*primary*/ public constructor Deprecated(/*0*/ message: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ..., /*2*/ level: kotlin.DeprecationLevel = ...)
+    public final val level: kotlin.DeprecationLevel
+        public final fun <get-level>(): kotlin.DeprecationLevel
+    public final val message: kotlin.String
+        public final fun <get-message>(): kotlin.String
     public final val replaceWith: kotlin.ReplaceWith
         public final fun <get-replaceWith>(): kotlin.ReplaceWith
-    public final val value: kotlin.String
-        public final fun <get-value>(): kotlin.String
+}
+
+public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel> {
+    enum entry WARNING
+
+    enum entry ERROR
+
+    enum entry HIDDEN
+
+    /*primary*/ private constructor DeprecationLevel()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
+    public final /*synthesized*/ fun values(): kotlin.Array<kotlin.DeprecationLevel>
 }
 
 public final class Double : kotlin.Number, kotlin.Comparable<kotlin.Double> {
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
index e8bd2169416..04ecd53bb1b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
@@ -8,7 +8,7 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     enum entry ENTRY
 
     private constructor MyEnum(/*0*/ @test.AAA() kotlin.Int)
-    @kotlin.Deprecated(value = "") public final val ord: kotlin.Int
+    @kotlin.Deprecated(message = "") public final val ord: kotlin.Int
     protected final /*fake_override*/ fun clone(): kotlin.Any
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
     public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/Underscore.txt b/compiler/testData/diagnostics/tests/Underscore.txt
index 09bff4d99c5..a7e038f844e 100644
--- a/compiler/testData/diagnostics/tests/Underscore.txt
+++ b/compiler/testData/diagnostics/tests/Underscore.txt
@@ -3,7 +3,7 @@ package
 public val ______: _<kotlin.Int>
 public fun __(/*0*/ ___: kotlin.Int, /*1*/ y: _<kotlin.Int>?): kotlin.Int
 
-@kotlin.Deprecated(value = "") @kotlin.data() public final class Pair {
+@kotlin.Deprecated(message = "") @kotlin.data() public final class Pair {
     public constructor Pair(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     public final val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
index 2e80dca8d07..e31d253421d 100644
--- a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
@@ -14,14 +14,14 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.Deprecated(value = "text") @kotlin.annotation.annotation() public final class obsolete : kotlin.Annotation {
+@kotlin.Deprecated(message = "text") @kotlin.annotation.annotation() public final class obsolete : kotlin.Annotation {
     public constructor obsolete()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.Deprecated(value = "text") @kotlin.annotation.annotation() public final class obsoleteWithParam : kotlin.Annotation {
+@kotlin.Deprecated(message = "text") @kotlin.annotation.annotation() public final class obsoleteWithParam : kotlin.Annotation {
     public constructor obsoleteWithParam(/*0*/ text: kotlin.String)
     public final val text: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/deprecated/componentUsage.txt b/compiler/testData/diagnostics/tests/deprecated/componentUsage.txt
index cb4a6bf8507..9cd0b29b627 100644
--- a/compiler/testData/diagnostics/tests/deprecated/componentUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/componentUsage.txt
@@ -4,7 +4,7 @@ public fun use(): kotlin.Unit
 
 public final class Data {
     public constructor Data()
-    @kotlin.Deprecated(value = "text") public final operator fun component1(): kotlin.String
+    @kotlin.Deprecated(message = "text") public final operator fun component1(): kotlin.String
     public final operator fun component2(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/functionUsage.txt b/compiler/testData/diagnostics/tests/deprecated/functionUsage.txt
index dd677e4e3fd..ec207129a7b 100644
--- a/compiler/testData/diagnostics/tests/deprecated/functionUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/functionUsage.txt
@@ -1,12 +1,12 @@
 package
 
-@kotlin.Deprecated(value = "message") public fun Obsolete(/*0*/ param: kotlin.Int = ...): UsefulClass
+@kotlin.Deprecated(message = "message") public fun Obsolete(/*0*/ param: kotlin.Int = ...): UsefulClass
 public fun block(): kotlin.Unit
 public fun expression(): UsefulClass
 public fun invoker(): kotlin.Unit
 public fun reflection(): kotlin.reflect.KFunction1<kotlin.Int, UsefulClass>
 public fun reflection2(): kotlin.reflect.KFunction1<UsefulClass, kotlin.Unit>
-@kotlin.Deprecated(value = "does nothing good") public fun kotlin.Any.doNothing(): kotlin.String
+@kotlin.Deprecated(message = "does nothing good") public fun kotlin.Any.doNothing(): kotlin.String
 
 public final class Delegation {
     public constructor Delegation()
@@ -29,7 +29,7 @@ public final class Invocable {
     public constructor Invocable()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.Deprecated(value = "message") public final operator fun invoke(): kotlin.Unit
+    @kotlin.Deprecated(message = "message") public final operator fun invoke(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -47,7 +47,7 @@ public final class UsefulClass {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun get(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.Deprecated(value = "message") public final fun member(): kotlin.Unit
+    @kotlin.Deprecated(message = "message") public final fun member(): kotlin.Unit
     public final fun set(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.txt b/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.txt
index 4056841b8b1..02440aa9a0a 100644
--- a/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.txt
@@ -2,7 +2,7 @@ package
 
 public open class C</*0*/ T> {
     public constructor C</*0*/ T>()
-    @kotlin.Deprecated(value = "") public constructor C</*0*/ T>(/*0*/ p: kotlin.Int)
+    @kotlin.Deprecated(message = "") public constructor C</*0*/ T>(/*0*/ p: kotlin.Int)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/deprecated/imports.txt b/compiler/testData/diagnostics/tests/deprecated/imports.txt
index 98d0249df7a..d395da761f5 100644
--- a/compiler/testData/diagnostics/tests/deprecated/imports.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/imports.txt
@@ -2,7 +2,7 @@ package
 
 public fun useAlias(/*0*/ c: C): kotlin.Unit
 
-@kotlin.Deprecated(value = "obsolete") public final class C {
+@kotlin.Deprecated(message = "obsolete") public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.txt b/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.txt
index 406665e9e56..226e9e943d4 100644
--- a/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/iteratorUsage.txt
@@ -6,7 +6,7 @@ public final class Iter {
     public constructor Iter()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.Deprecated(value = "text") public final operator fun iterator(): Iter.IterIterator
+    @kotlin.Deprecated(message = "text") public final operator fun iterator(): Iter.IterIterator
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public final class IterIterator {
@@ -29,9 +29,9 @@ public final class Iter2 {
     public final class Iter2Iterator {
         public constructor Iter2Iterator()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        @kotlin.Deprecated(value = "text") public final operator fun hasNext(): kotlin.Boolean
+        @kotlin.Deprecated(message = "text") public final operator fun hasNext(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.Deprecated(value = "text") public final operator fun next(): kotlin.String
+        @kotlin.Deprecated(message = "text") public final operator fun next(): kotlin.String
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
index c0c8cf1762b..88e83ef9adf 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDeprecated.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.Deprecated(value = "Deprecated in Java") public open class A {
+@kotlin.Deprecated(message = "Deprecated in Java") public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.Deprecated(value = "Deprecated in Java") public open fun getFoo(/*0*/ text: kotlin.String!): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open fun getFoo(/*0*/ text: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.txt b/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.txt
index 14fff11a538..e4907482b74 100644
--- a/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.txt
@@ -1,9 +1,9 @@
 package
 
-@kotlin.Deprecated(value = "Deprecated in Java") public open class A {
+@kotlin.Deprecated(message = "Deprecated in Java") public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.Deprecated(value = "Deprecated in Java") public open fun getFoo(/*0*/ text: kotlin.String!): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open fun getFoo(/*0*/ text: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt
index 9c6968e0220..6b06129667e 100644
--- a/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt
@@ -8,7 +8,7 @@ public final class TopLevel {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.Deprecated(value = "Nested") public final class Nested {
+    @kotlin.Deprecated(message = "Nested") public final class Nested {
         public constructor Nested()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt b/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt
index 9431e68f361..b3686849fc4 100644
--- a/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt
@@ -10,7 +10,7 @@ public final class Another {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.Deprecated(value = "Object") public companion object Companion {
+    @kotlin.Deprecated(message = "Object") public companion object Companion {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -19,7 +19,7 @@ public final class Another {
     }
 }
 
-@kotlin.Deprecated(value = "Object") public object Obsolete {
+@kotlin.Deprecated(message = "Object") public object Obsolete {
     private constructor Obsolete()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
index dc99b5b5578..9ccc5879a82 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
@@ -7,22 +7,22 @@ public fun PropertyHolder.extFunction(): kotlin.Unit
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.Deprecated(value = "text") public final fun get(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata): kotlin.Int
+    @kotlin.Deprecated(message = "text") public final fun get(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.Deprecated(value = "text") public final fun set(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "text") public final fun set(/*0*/ instance: kotlin.Any, /*1*/ property: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class PropertyHolder {
     public constructor PropertyHolder()
-    @kotlin.Deprecated(value = "text") public final var name: kotlin.String
+    @kotlin.Deprecated(message = "text") public final var name: kotlin.String
     public final val test1: kotlin.String = ""
     public final var test2: kotlin.String
     public final var test3: kotlin.String
     public final var test4: kotlin.String
     public final val valDelegate: kotlin.Int
     public final var varDelegate: kotlin.Int
-    @kotlin.Deprecated(value = "text") public final val x: kotlin.Int = 1
+    @kotlin.Deprecated(message = "text") public final val x: kotlin.Int = 1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
index c8f12955545..9d5e1f4dba8 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
@@ -5,8 +5,8 @@ public fun literals(): kotlin.Unit
 
 public final class PropertyHolder {
     public constructor PropertyHolder()
-    @kotlin.Deprecated(value = "") public final val a1: kotlin.Int = 1
-    @property:kotlin.Deprecated(value = "") public final var a2: kotlin.String
+    @kotlin.Deprecated(message = "") public final val a1: kotlin.Int = 1
+    @property:kotlin.Deprecated(message = "") public final var a2: kotlin.String
     public final val withGetter: kotlin.String = ""
     public final var withSetter: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/deprecated/typeUsage.txt b/compiler/testData/diagnostics/tests/deprecated/typeUsage.txt
index 72cf464aec7..98e054f65fe 100644
--- a/compiler/testData/diagnostics/tests/deprecated/typeUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/typeUsage.txt
@@ -39,7 +39,7 @@ public object Object : Obsolete {
     public final override /*1*/ /*fake_override*/ fun use(): kotlin.Unit
 }
 
-@kotlin.Deprecated(value = "Class") public open class Obsolete {
+@kotlin.Deprecated(message = "Class") public open class Obsolete {
     public constructor Obsolete()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -47,8 +47,8 @@ public object Object : Obsolete {
     public final fun use(): kotlin.Unit
 }
 
-@kotlin.Deprecated(value = "Class") public open class Obsolete2 {
-    @kotlin.Deprecated(value = "Constructor") public constructor Obsolete2()
+@kotlin.Deprecated(message = "Class") public open class Obsolete2 {
+    @kotlin.Deprecated(message = "Constructor") public constructor Obsolete2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
index 9ddd710fdc3..4ee57f809a1 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
@@ -129,7 +129,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ var windowStateListener: [ERROR : Unresolved java classifier: WindowStateListener]!
         invisible_fake final override /*1*/ /*fake_override*/ var x: kotlin.Int
         invisible_fake final override /*1*/ /*fake_override*/ var y: kotlin.Int
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun action(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun action(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: [ERROR : Unresolved java classifier: PopupMenu]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: java.awt.Component!): java.awt.Component!
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: java.awt.Component!, /*1*/ p1: kotlin.Any!): kotlin.Unit
@@ -164,13 +164,13 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ fun applyCompoundShape(/*0*/ p0: [ERROR : Unresolved java classifier: Region]!): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun applyCurrentShape(): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun applyCurrentShapeBelowMe(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun applyResourceBundle(/*0*/ p0: [ERROR : Unresolved java classifier: ResourceBundle]!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun applyResourceBundle(/*0*/ p0: kotlin.String!): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun applyResourceBundle(/*0*/ p0: [ERROR : Unresolved java classifier: ResourceBundle]!): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun applyResourceBundle(/*0*/ p0: kotlin.String!): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun areBoundsValid(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun areFocusTraversalKeysSet(/*0*/ p0: kotlin.Int): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun areInputMethodsEnabled(): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun autoProcessMouseWheel(/*0*/ p0: [ERROR : Unresolved java classifier: MouseWheelEvent]!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun bounds(): [ERROR : Unresolved java classifier: Rectangle]!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun bounds(): [ERROR : Unresolved java classifier: Rectangle]!
         invisible_fake open override /*1*/ /*fake_override*/ fun calculateCurrentShape(): [ERROR : Unresolved java classifier: Region]!
         invisible_fake open override /*1*/ /*fake_override*/ fun calculateSecurityWarningPosition(/*0*/ p0: kotlin.Double, /*1*/ p1: kotlin.Double, /*2*/ p2: kotlin.Double, /*3*/ p3: kotlin.Double): [ERROR : Unresolved java classifier: Point2D]!
         invisible_fake final override /*1*/ /*fake_override*/ fun canBeFocusOwner(): kotlin.Boolean
@@ -194,7 +194,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: [ERROR : Unresolved java classifier: Point]!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun containsFocus(): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun countComponents(): kotlin.Int
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun countComponents(): kotlin.Int
         invisible_fake open override /*1*/ /*fake_override*/ fun countHierarchyMembers(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun createBufferStrategy(/*0*/ p0: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun createBufferStrategy(/*0*/ p0: kotlin.Int, /*1*/ p1: [ERROR : Unresolved java classifier: BufferCapabilities]!): kotlin.Unit
@@ -206,10 +206,10 @@ package test {
         public open override /*1*/ /*fake_override*/ fun createVolatileImage(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): [ERROR : Unresolved java classifier: VolatileImage]!
         public open override /*1*/ /*fake_override*/ fun createVolatileImage(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: [ERROR : Unresolved java classifier: ImageCapabilities]!): [ERROR : Unresolved java classifier: VolatileImage]!
         invisible_fake final override /*1*/ /*fake_override*/ fun decreaseComponentCount(/*0*/ p0: java.awt.Component!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun deliverEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun deliverEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun deliverMouseWheelToAncestor(/*0*/ p0: [ERROR : Unresolved java classifier: MouseWheelEvent]!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun deserializeResources(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun disable(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun disable(): kotlin.Unit
         protected/*protected and package*/ final override /*1*/ /*fake_override*/ fun disableEvents(/*0*/ p0: kotlin.Long): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun dispatchEvent(/*0*/ p0: [ERROR : Unresolved java classifier: AWTEvent]!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun dispatchEventImpl(/*0*/ p0: [ERROR : Unresolved java classifier: AWTEvent]!): kotlin.Unit
@@ -220,8 +220,8 @@ package test {
         invisible_fake open override /*1*/ /*fake_override*/ fun doDispose(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun doLayout(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun doSwingSerialization(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun enable(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun enable(/*0*/ p0: kotlin.Boolean): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun enable(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun enable(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         protected/*protected and package*/ final override /*1*/ /*fake_override*/ fun enableEvents(/*0*/ p0: kotlin.Long): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun enableInputMethods(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -278,7 +278,7 @@ package test {
         invisible_fake open override /*1*/ /*fake_override*/ fun getContainingWindow(): java.awt.Window!
         public open override /*1*/ /*fake_override*/ fun getContentPane(): java.awt.Container!
         public open override /*1*/ /*fake_override*/ fun getCursor(): [ERROR : Unresolved java classifier: Cursor]!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getCursorType(): kotlin.Int
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getCursorType(): kotlin.Int
         invisible_fake final override /*1*/ /*fake_override*/ fun getCursor_NoClientCode(): [ERROR : Unresolved java classifier: Cursor]!
         public open override /*1*/ /*fake_override*/ fun getDefaultCloseOperation(): kotlin.Int
         invisible_fake open override /*1*/ /*fake_override*/ fun getDocumentRoot(): java.awt.Window!
@@ -355,7 +355,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ fun getOwner_NoClientCode(): java.awt.Window!
         public open override /*1*/ /*fake_override*/ fun getParent(): java.awt.Container!
         invisible_fake final override /*1*/ /*fake_override*/ fun getParent_NoClientCode(): java.awt.Container!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getPeer(): [ERROR : Unresolved java classifier: ComponentPeer]!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getPeer(): [ERROR : Unresolved java classifier: ComponentPeer]!
         public open override /*1*/ /*fake_override*/ fun getPreferredSize(): java.awt.Dimension!
         public open override /*1*/ /*fake_override*/ fun getPropertyChangeListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: PropertyChangeListener]!>!
         public open override /*1*/ /*fake_override*/ fun getPropertyChangeListeners(/*0*/ p0: kotlin.String!): kotlin.Array<(out) [ERROR : Unresolved java classifier: PropertyChangeListener]!>!
@@ -382,13 +382,13 @@ package test {
         public open override /*1*/ /*fake_override*/ fun getWindowStateListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: WindowStateListener]!>!
         public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun getY(): kotlin.Int
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun gotFocus(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun handleEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun gotFocus(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun handleEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hasFocus(): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun hasHeavyweightDescendants(): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun hasLightweightDescendants(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun hide(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun hide(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun imageUpdate(/*0*/ p0: [ERROR : Unresolved java classifier: Image]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int, /*4*/ p4: kotlin.Int, /*5*/ p5: kotlin.Int): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun increaseComponentCount(/*0*/ p0: java.awt.Component!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun init(/*0*/ p0: [ERROR : Unresolved java classifier: GraphicsConfiguration]!): kotlin.Unit
@@ -396,8 +396,8 @@ package test {
         invisible_fake open override /*1*/ /*fake_override*/ fun initDeserializedWindow(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun initGC(/*0*/ p0: [ERROR : Unresolved java classifier: GraphicsConfiguration]!): [ERROR : Unresolved java classifier: GraphicsConfiguration]!
         invisible_fake open override /*1*/ /*fake_override*/ fun initializeFocusTraversalKeys(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun insets(): [ERROR : Unresolved java classifier: Insets]!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun inside(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun insets(): [ERROR : Unresolved java classifier: Insets]!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun inside(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun invalidate(): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun invalidateIfValid(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun invalidateParent(): kotlin.Unit
@@ -419,7 +419,7 @@ package test {
         public final override /*1*/ /*fake_override*/ fun isFocusCycleRoot(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun isFocusCycleRoot(/*0*/ p0: java.awt.Container!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun isFocusOwner(): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun isFocusTraversable(): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun isFocusTraversable(): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun isFocusTraversableOverridden(): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun isFocusTraversalPolicyProvider(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun isFocusTraversalPolicySet(): kotlin.Boolean
@@ -452,9 +452,9 @@ package test {
         public open override /*1*/ /*fake_override*/ fun isValidateRoot(): kotlin.Boolean
         @[ERROR : java.beans.Transient]() public open override /*1*/ /*fake_override*/ fun isVisible(): kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ fun isVisible_NoClientCode(): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyDown(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyUp(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun layout(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyDown(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyUp(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun layout(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun lightweightPaint(/*0*/ p0: [ERROR : Unresolved java classifier: Graphics]!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun lightweightPrint(/*0*/ p0: [ERROR : Unresolved java classifier: Graphics]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun list(): kotlin.Unit
@@ -462,24 +462,24 @@ package test {
         public open override /*1*/ /*fake_override*/ fun list(/*0*/ p0: [ERROR : Unresolved java classifier: PrintWriter]!, /*1*/ p1: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun list(/*0*/ p0: java.io.PrintStream!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun list(/*0*/ p0: java.io.PrintStream!, /*1*/ p1: kotlin.Int): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun locate(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): java.awt.Component!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun location(): [ERROR : Unresolved java classifier: Point]!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun locate(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): java.awt.Component!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun location(): [ERROR : Unresolved java classifier: Point]!
         invisible_fake open override /*1*/ /*fake_override*/ fun location_NoClientCode(): [ERROR : Unresolved java classifier: Point]!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun lostFocus(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun minimumSize(): java.awt.Dimension!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun lostFocus(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Any!): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun minimumSize(): java.awt.Dimension!
         invisible_fake open override /*1*/ /*fake_override*/ fun mixOnHiding(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun mixOnReshaping(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun mixOnShowing(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun mixOnValidating(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun mixOnZOrderChanging(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseDown(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseDrag(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseEnter(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseExit(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseMove(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseUp(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun move(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun nextFocus(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseDown(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseDrag(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseEnter(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseExit(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseMove(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun mouseUp(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun move(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun nextFocus(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun notifyNewBounds(/*0*/ p0: kotlin.Boolean, /*1*/ p1: kotlin.Boolean): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun numListening(/*0*/ p0: kotlin.Long): kotlin.Int
         invisible_fake open override /*1*/ /*fake_override*/ fun ownedInit(/*0*/ p0: java.awt.Window!): kotlin.Unit
@@ -490,12 +490,12 @@ package test {
         invisible_fake open override /*1*/ /*fake_override*/ fun paintHeavyweightComponents(/*0*/ p0: [ERROR : Unresolved java classifier: Graphics]!): kotlin.Unit
         protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun paramString(): kotlin.String!
         invisible_fake open override /*1*/ /*fake_override*/ fun pointRelativeToComponent(/*0*/ p0: [ERROR : Unresolved java classifier: Point]!): [ERROR : Unresolved java classifier: Point]!
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun postEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Boolean
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun postEvent(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun postProcessKeyEvent(/*0*/ p0: [ERROR : Unresolved java classifier: KeyEvent]!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun postWindowEvent(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun postsOldMouseEvents(): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun preProcessKeyEvent(/*0*/ p0: [ERROR : Unresolved java classifier: KeyEvent]!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun preferredSize(): java.awt.Dimension!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun preferredSize(): java.awt.Dimension!
         public open override /*1*/ /*fake_override*/ fun prepareImage(/*0*/ p0: [ERROR : Unresolved java classifier: Image]!, /*1*/ p1: [ERROR : Unresolved java classifier: ImageObserver]!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun prepareImage(/*0*/ p0: [ERROR : Unresolved java classifier: Image]!, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: [ERROR : Unresolved java classifier: ImageObserver]!): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun print(/*0*/ p0: [ERROR : Unresolved java classifier: Graphics]!): kotlin.Unit
@@ -565,10 +565,10 @@ package test {
         public open override /*1*/ /*fake_override*/ fun requestFocusInWindow(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun requestFocusInWindow(/*0*/ p0: [ERROR : Unresolved java classifier: Cause]!): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun requestFocusInWindow(/*0*/ p0: kotlin.Boolean, /*1*/ p1: [ERROR : Unresolved java classifier: Cause]!): kotlin.Boolean
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun reshape(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun reshape(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun reshapeNativePeer(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int, /*4*/ p4: kotlin.Int): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun resize(/*0*/ p0: java.awt.Dimension!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun resize(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun resize(/*0*/ p0: java.awt.Dimension!): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun resize(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun revalidate(): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun setAlwaysOnTop(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun setAutoFocusTransferOnDisposal(/*0*/ p0: kotlin.Boolean): kotlin.Unit
@@ -581,7 +581,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun setComponentOrientation(/*0*/ p0: [ERROR : Unresolved java classifier: ComponentOrientation]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setComponentZOrder(/*0*/ p0: java.awt.Component!, /*1*/ p1: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setContentPane(/*0*/ p0: java.awt.Container!): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setCursor(/*0*/ p0: kotlin.Int): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setCursor(/*0*/ p0: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setDefaultCloseOperation(/*0*/ p0: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setDropTarget(/*0*/ p0: [ERROR : Unresolved java classifier: DropTarget]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setEnabled(/*0*/ p0: kotlin.Boolean): kotlin.Unit
@@ -632,9 +632,9 @@ package test {
         public open override /*1*/ /*fake_override*/ fun setUndecorated(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setVisible(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun setWarningString(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun show(): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun show(/*0*/ p0: kotlin.Boolean): kotlin.Unit
-        @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun size(): java.awt.Dimension!
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun show(): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun show(/*0*/ p0: kotlin.Boolean): kotlin.Unit
+        @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun size(): java.awt.Dimension!
         invisible_fake open override /*1*/ /*fake_override*/ fun startLWModal(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun stopLWModal(): kotlin.Unit
         invisible_fake final override /*1*/ /*fake_override*/ fun subtractAndApplyShape(/*0*/ p0: [ERROR : Unresolved java classifier: Region]!): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.txt b/compiler/testData/diagnostics/tests/regressions/kt588.txt
index cd032362828..d1aad150adc 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt588.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt588.txt
@@ -26,8 +26,8 @@ public final class Test : java.lang.Thread {
     invisible_fake open override /*1*/ /*fake_override*/ fun blockedOn(/*0*/ p0: [ERROR : Unresolved java classifier: Interruptible]!): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun checkAccess(): kotlin.Unit
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun countStackFrames(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun destroy(): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun countStackFrames(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun destroy(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun dispatchUncaughtException(/*0*/ p0: kotlin.Throwable!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun exit(): kotlin.Unit
@@ -50,7 +50,7 @@ public final class Test : java.lang.Thread {
     public final override /*1*/ /*fake_override*/ fun join(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun join(/*0*/ p0: kotlin.Long): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun join(/*0*/ p0: kotlin.Long, /*1*/ p1: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun resume(): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun resume(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun resume0(): kotlin.Unit
     public open override /*1*/ fun run(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun setContextClassLoader(/*0*/ p0: java.lang.ClassLoader!): kotlin.Unit
@@ -62,10 +62,10 @@ public final class Test : java.lang.Thread {
     public open override /*1*/ /*fake_override*/ fun setUncaughtExceptionHandler(/*0*/ p0: java.lang.Thread.UncaughtExceptionHandler!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun start(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun start0(): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun stop(): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun stop(/*0*/ p0: kotlin.Throwable!): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun stop(): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun stop(/*0*/ p0: kotlin.Throwable!): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun stop0(/*0*/ p0: kotlin.Any!): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun suspend(): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public final override /*1*/ /*fake_override*/ fun suspend(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun suspend0(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
index e3806da8e24..39210b0b5a3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
@@ -5,7 +5,7 @@ package a {
     package a.b {
 
         package a.b.c {
-            @kotlin.Deprecated(value = "aaa") @a.b.c.ann1(p = kotlin.Deprecated(value = "aaa")) @a.b.c.ann1() @a.b.c.ann2(p = a.b.c.ann1()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.annArray(p = {"a"}) public fun test(): kotlin.Int
+            @kotlin.Deprecated(message = "aaa") @a.b.c.ann1(p = kotlin.Deprecated(message = "aaa")) @a.b.c.ann1() @a.b.c.ann2(p = a.b.c.ann1()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.A.IAnn() @a.b.c.ann3(p = a.b.c.A.IAnn()) @a.b.c.annArray(p = {"a"}) public fun test(): kotlin.Int
 
             public final class A {
                 public constructor A()
diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
index 880ee632efb..f2e20b8d15f 100644
--- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
@@ -9,27 +9,27 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date!
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun getTime(): kotlin.Long
     invisible_fake final override /*1*/ /*fake_override*/ fun getTimeImpl(): kotlin.Long
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date!
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date!
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.txt
index e8eaf410b24..e32b882e626 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.Deprecated(value = "Deprecated in Java") public open class JavaDocDeprecated {
+@kotlin.Deprecated(message = "Deprecated in Java") public open class JavaDocDeprecated {
     public constructor JavaDocDeprecated()
-    @kotlin.Deprecated(value = "Deprecated in Java") public open fun getFoo(/*0*/ p0: kotlin.String!): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open fun getFoo(/*0*/ p0: kotlin.String!): kotlin.String!
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.txt
index b2a01e5ef10..90df176b0c3 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.txt
@@ -2,5 +2,5 @@ package test
 
 public open class AnnotatedMethod {
     /*primary*/ public constructor AnnotatedMethod()
-    @kotlin.Deprecated(value = "Deprecated in Java") public open fun f(): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open fun f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt
index 9af7e7ce4ef..531f8bc19eb 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt
@@ -1,17 +1,17 @@
 package test
 
-@kotlin.Deprecated(value = "Class") public final class Class {
+@kotlin.Deprecated(message = "Class") public final class Class {
     /*primary*/ public constructor Class()
 
-    @kotlin.Deprecated(value = "companion object") public companion object Companion {
+    @kotlin.Deprecated(message = "companion object") public companion object Companion {
         /*primary*/ private constructor Companion()
     }
 
-    @kotlin.Deprecated(value = "Inner") public final inner class Inner {
+    @kotlin.Deprecated(message = "Inner") public final inner class Inner {
         /*primary*/ public constructor Inner()
     }
 
-    @kotlin.Deprecated(value = "Nested") public final class Nested {
+    @kotlin.Deprecated(message = "Nested") public final class Nested {
         /*primary*/ public constructor Nested()
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
index b2309cf1df8..90f7564924d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
@@ -9,27 +9,27 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date!
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun getTime(): kotlin.Long
     invisible_fake final override /*1*/ /*fake_override*/ fun getTimeImpl(): kotlin.Long
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date!
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date!
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
-    @kotlin.Deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
+    @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
 }
diff --git a/core/builtins/src/kotlin/Annotations.kt b/core/builtins/src/kotlin/Annotations.kt
index 8fc97147de8..f2a0af18271 100644
--- a/core/builtins/src/kotlin/Annotations.kt
+++ b/core/builtins/src/kotlin/Annotations.kt
@@ -32,13 +32,17 @@ private annotation class data
 
 /**
  * Marks the annotated class, function, property, variable or parameter as deprecated.
- * @property value the message explaining the deprecation and recommending an alternative API to use.
+ * @property message the message explaining the deprecation and recommending an alternative API to use.
  * @property replaceWith if present, specifies a code fragment which should be used as a replacement for
  *     the deprecated API usage.
  */
 @Target(CLASS, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER)
 @MustBeDocumented
-public annotation class Deprecated(val value: String, val replaceWith: ReplaceWith = ReplaceWith(""))
+public annotation class Deprecated(
+        val message: String,
+        val replaceWith: ReplaceWith = ReplaceWith(""),
+        val level: DeprecationLevel = DeprecationLevel.WARNING
+)
 
 /**
  * Specifies a code fragment that can be used to replace a deprecated function, property or class. Tools such
@@ -58,6 +62,18 @@ public annotation class Deprecated(val value: String, val replaceWith: ReplaceWi
 @MustBeDocumented
 public annotation class ReplaceWith(val expression: String, vararg val imports: String)
 
+/**
+ * Contains levels for deprecation levels.
+ */
+public enum class DeprecationLevel {
+    /** Usage of the deprecated element will be marked as a warning. */
+    WARNING,
+    /** Usage of the deprecated element will be marked as an error. */
+    ERROR,
+    /** Deprecated element will not be accessible from code. */
+    HIDDEN
+}
+
 /**
  * Signifies that the annotated functional type represents an extension function.
  */
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
index 69ebb896a64..9c49c336897 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
@@ -52,6 +52,7 @@ public final class JvmAnnotationNames {
     public static final String DATA_FIELD_NAME = "data";
     public static final String STRINGS_FIELD_NAME = "strings";
     public static final Name DEFAULT_ANNOTATION_MEMBER_NAME = Name.identifier("value");
+    public static final Name DEPRECATED_ANNOTATION_MESSAGE = Name.identifier("message");
     public static final Name TARGET_ANNOTATION_MEMBER_NAME = Name.identifier("allowedTargets");
 
     public static final FqName TARGET_ANNOTATION = new FqName("java.lang.annotation.Target");
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt
index 4952a94fc92..8581ba52921 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt
@@ -113,7 +113,7 @@ class JavaDeprecatedAnnotationDescriptor(
 
     private val valueArguments = c.storageManager.createLazyValue {
         val parameterDescriptor = valueParameters.firstOrNull {
-            it.name == JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME
+            it.name == JvmAnnotationNames.DEPRECATED_ANNOTATION_MESSAGE
         }
         parameterDescriptor?.let { mapOf(it to ConstantValueFactory(c.module.builtIns).createConstantValue("Deprecated in Java")) } ?: emptyMap()
     }
diff --git a/idea/testData/resolve/references/AnnotationOnFile.kt b/idea/testData/resolve/references/AnnotationOnFile.kt
index 1c4b258668c..ad8ff9b21b8 100644
--- a/idea/testData/resolve/references/AnnotationOnFile.kt
+++ b/idea/testData/resolve/references/AnnotationOnFile.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith)
+// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith,kotlin.DeprecationLevel)
diff --git a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt
index 3c7272d73d0..a9c0117d3ed 100644
--- a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt
+++ b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt
@@ -4,4 +4,4 @@ package foo
 
 import kotlin.Deprecated as D
 
-// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith)
+// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith,kotlin.DeprecationLevel)