diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index dab113bd460..5b6774a4179 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -354,10 +354,10 @@ public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel>
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<kotlin.DeprecationLevel>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kotlin.DeprecationLevel>
         public final fun <get-values>(): kotlin.Array<kotlin.DeprecationLevel>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<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/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
index e869a007c3b..d51e1c0085a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
index 3c8cc98a973..94f96a608fc 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
index e869a007c3b..d51e1c0085a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
index 3c8cc98a973..94f96a608fc 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
index 0d7e30c63f4..5a83e8116d3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
@@ -10,9 +10,9 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
 
 public open class kt3561 {
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
index a333cbb9acd..030309dc095 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
@@ -16,9 +16,9 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
 
 public open class kt4050 {
diff --git a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
index 8c34b84b31d..277d428d75c 100644
--- a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
@@ -18,7 +18,7 @@ public final enum class K : kotlin.Enum<test.K> {
     public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.K>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.K>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.K
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.K>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.K>
 }
diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt
index 1ef85807f8e..19985815df1 100644
--- a/compiler/testData/diagnostics/tests/Serializable.txt
+++ b/compiler/testData/diagnostics/tests/Serializable.txt
@@ -24,9 +24,9 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<C>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C>
+    public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
 public final class N {
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
index ccb9f6a514e..cb96a29adcf 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
@@ -23,9 +23,9 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
 @AnnE() public final class Test {
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
index be8c3d48ba2..e472281f9ee 100644
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
@@ -197,8 +197,8 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index f462484afda..63c7f23e0f4 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index 65b0a4e103c..7c24b0dbfb3 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index 783cb1867b7..1ad783335f2 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index 85eeee02005..aaf12264b12 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @empty() public final class correct {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index 003e18ee890..7f48cef1168 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index f706a77935e..bc99e3525c9 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @incorrect() public final class correct {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index 0f4816eed3f..680da7addf9 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index b592cf3cad1..c8428770e13 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index 37c60e6842a..aebb76b24bb 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 9140f9ad6c4..510f6d84590 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
@@ -18,9 +18,9 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class base : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
index 3133c96f0b8..7b1c7ea3c84 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
@@ -33,7 +33,7 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<D>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<D>
+    public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
index f4054087a71..1d4a628116b 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
@@ -50,8 +50,8 @@ package a {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<a.C>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.C
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<a.C>
+        public final /*synthesized*/ fun values(): kotlin.Array<a.C>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
index f8afcd1d8db..86d621fd02d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
@@ -132,9 +132,9 @@ package uninitialized_reassigned_variables {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): uninitialized_reassigned_variables.ProtocolState
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
+        public final /*synthesized*/ fun values(): kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
     }
 
     public object TestObjectDeclaration {
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
index e7f1af9af0a..e11d2e8df5c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
@@ -38,9 +38,9 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt1185.Color>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1185.Color>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Color
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
     }
 
     public final enum class Direction : kotlin.Enum<kt1185.Direction> {
@@ -62,8 +62,8 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt1185.Direction>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1185.Direction>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Direction
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Direction>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Direction>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
index 6f6abe32dff..f7c63d4b9ed 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
@@ -18,9 +18,9 @@ public final data enum class First : kotlin.Enum<First> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<First>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<First>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): First
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<First>
+    public final /*synthesized*/ fun values(): kotlin.Array<First>
 }
 
 public final data annotation class Fourth : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
index 4269e6ebe63..6b83d3e9641 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
@@ -74,9 +74,9 @@ public open enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<C>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C>
+    public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
 public interface D {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
index 8d5ca5f8763..20abe4c32fe 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
@@ -26,8 +26,8 @@ package kt1193 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt1193.MyEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1193.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
index 2043dae16ca..b52392cbd44 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
@@ -27,9 +27,9 @@ public open enum class EN : kotlin.Enum<EN> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EN>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EN>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EN
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EN>
+    public final /*synthesized*/ fun values(): kotlin.Array<EN>
 }
 
 public open class Foo {
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
index 621c6f70990..40b90aeed87 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
@@ -29,9 +29,9 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
+    public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
 
 public final annotation class <no name provided> : kotlin.Annotation {
@@ -80,9 +80,9 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<Outer.<no name provided>>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Outer.<no name provided>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Outer.<no name provided>
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Outer.<no name provided>>
+        public final /*synthesized*/ fun values(): kotlin.Array<Outer.<no name provided>>
     }
 
     public final annotation class <no name provided> : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
index 6b378cda4f2..83c81967de3 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
@@ -15,7 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public final fun values(): kotlin.Array<E>
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
index 8dbe76e809c..53a820c4e51 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
@@ -19,7 +19,7 @@ public final enum class A : kotlin.Enum<A> {
     public final fun values(/*0*/ x: kotlin.String): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
index 9a0fbc64998..8625a95d3e6 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
@@ -13,8 +13,8 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<abstract.MyAbstractEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<abstract.MyAbstractEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyAbstractEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyAbstractEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyAbstractEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
index 5899212378b..c8dcebad859 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
@@ -44,8 +44,8 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<abstract.MyEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<abstract.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
index 1175180732c..a9aa27dc8fe 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
@@ -14,9 +14,9 @@ public final enum class E : kotlin.Enum<E>, T {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
 public interface T {
diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
index e34ff90ca56..ca73d98d3db 100644
--- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
+++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
index 5ed5cc9ff28..0ca8a69274b 100644
--- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
@@ -17,7 +17,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
index d1fa82c1200..5513e69f558 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
@@ -17,7 +17,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
index 6591912883b..ab5480779c2 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
@@ -22,7 +22,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
index 34574c9c31a..6db96e2fca8 100644
--- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
@@ -21,7 +21,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
index 98400bff08e..048f5e2f173 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
@@ -23,7 +23,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt
index 171e9fed212..c7c53eb48ef 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt
@@ -4,7 +4,7 @@ enum class E {
     private companion object
 }
 
-fun foo() = E.values
+fun foo() = E.values()
 fun bar() = E.valueOf("ENTRY")
 fun baz() = E.ENTRY
 fun <!EXPOSED_FUNCTION_RETURN_TYPE!>quux<!>() = <!INVISIBLE_MEMBER!>E<!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
index d5cf2c02752..869fe887792 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
@@ -25,7 +25,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
index c851e61fbd8..94e54295c9d 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
@@ -15,9 +15,9 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
 
 public final enum class B : kotlin.Enum<B> {
@@ -33,7 +33,7 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<B>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<B>
+    public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
index 662ed162b95..99106cbd0ce 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
@@ -22,7 +22,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
index 3d5f6ca27a1..469546e3b5f 100644
--- a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
+++ b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
@@ -13,7 +13,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
index 1ea4a920bd7..e347cb92c96 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
index c2167768e74..97892e2f6b9 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
index 0505937305f..dd13853b873 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
@@ -17,7 +17,7 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EnumClass>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
+    public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
index fa095d14882..42e29d884e5 100644
--- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
@@ -16,9 +16,9 @@ public final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithFun>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithFun>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithFun
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithFun>
+    public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithFun>
 }
 
 public final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplementingTraitWithVal>, T2 {
@@ -37,9 +37,9 @@ public final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithVal>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithVal>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithVal
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>
+    public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>
 }
 
 public interface T1 {
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
index bb65358660d..ba1cc0be611 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
@@ -14,9 +14,9 @@ public final enum class MyEnum : MyClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
 public final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
@@ -30,9 +30,9 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
 
 public final enum class MyEnum3 : MyEnumBase {
@@ -46,9 +46,9 @@ public final enum class MyEnum3 : MyEnumBase {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum3>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum3
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum3>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum3>
 }
 
 public final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
@@ -62,9 +62,9 @@ public final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnumBase>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnumBase>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnumBase
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnumBase>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnumBase>
 }
 
 public interface MyTrait {
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
index 2b19068bf96..762ce04446d 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
index e2c717fa06f..e995f653d19 100644
--- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
@@ -18,7 +18,7 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
+    public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
index fc384141edf..e2b59f1a3bf 100644
--- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
@@ -29,9 +29,9 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<B>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<B>
+    public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
 
 public object O {
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
index 2ee70f74257..4056d81429b 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
@@ -19,8 +19,8 @@ package enum {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<enum.HappyEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<enum.HappyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): enum.HappyEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<enum.HappyEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<enum.HappyEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
index 943a4d8eae3..078b850a26d 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
@@ -13,7 +13,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
index 217150ef401..7fb2196fc92 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
@@ -11,7 +11,7 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
+    public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
index 6d75ca16276..60c2e54a514 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
index cb938e9493f..3e65f5cd01b 100644
--- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
@@ -17,7 +17,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
index 5f27d9a20d4..10ff1ec14a2 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
@@ -24,7 +24,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
index 3fd4e801211..aaeabeda63a 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
@@ -35,9 +35,9 @@ public open enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
 public final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
@@ -51,9 +51,9 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
 
 public final enum class MyJavaEnum : kotlin.Enum<MyJavaEnum!> {
@@ -67,7 +67,7 @@ public final enum class MyJavaEnum : kotlin.Enum<MyJavaEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyJavaEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyJavaEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyJavaEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyJavaEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyJavaEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inline.txt b/compiler/testData/diagnostics/tests/enum/inline.txt
index 037400154d1..32e77da390a 100644
--- a/compiler/testData/diagnostics/tests/enum/inline.txt
+++ b/compiler/testData/diagnostics/tests/enum/inline.txt
@@ -13,7 +13,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
index 726e6921646..ac0caafdca6 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
@@ -26,9 +26,9 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
 
@@ -58,8 +58,8 @@ public final class B {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<B.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<B.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<B.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
index 4e1bdd51859..4a33f1b5c41 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
@@ -19,8 +19,8 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
index 87a1b3e80bf..057f719b4f0 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
@@ -25,9 +25,9 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
+            @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
-            @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
+            public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
index 5f0f892ddeb..985ad34ab9b 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
@@ -25,13 +25,13 @@ public final enum class E : kotlin.Enum<E> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<E.F>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.F
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E.F>
+        public final /*synthesized*/ fun values(): kotlin.Array<E.F>
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
index c6ee874266f..691051daa01 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
@@ -13,7 +13,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
index f79109fa219..f93caaffa35 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
@@ -25,9 +25,9 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            public final /*synthesized*/ val values: kotlin.Array<A.B.E>
+            @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
-            @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
+            public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
index 8809dd1cad5..7a72c2ad689 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
@@ -19,8 +19,8 @@ public object A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
index 25b8146924f..315c7077b9f 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
@@ -18,8 +18,8 @@ public interface A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
index 05e9fcd8268..cbf91449292 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
@@ -25,9 +25,9 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
+            @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
-            @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
+            public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
     }
 
@@ -44,8 +44,8 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
index 10931dbd854..2385437d4ae 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
@@ -19,9 +19,9 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 
     public final enum class F : kotlin.Enum<A.F> {
@@ -37,8 +37,8 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.F>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.F
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.F>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.F>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
index 45b20f6c8a6..3ff22c694da 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
@@ -25,9 +25,9 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            public final /*synthesized*/ val values: kotlin.Array<A.B.E>
+            @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
-            @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
+            public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
     }
 
@@ -50,9 +50,9 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
+            @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
-            @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
+            public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
index cb938e9493f..3e65f5cd01b 100644
--- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
@@ -17,7 +17,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
index 844e72c5c40..757ddc28b7f 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
@@ -15,7 +15,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt
index bcfc4e16b72..c36a3753eae 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt
@@ -7,5 +7,5 @@ public enum A {
 
 // FILE: test.kt
 fun main() {
-     checkSubtype<Array<A>>(A.values)
+     checkSubtype<Array<A>>(A.<!DEPRECATION!>values<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
index b06f8a88cc1..e0156142cae 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
@@ -17,7 +17,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
index 6cf2fb332e6..d5ebe495f89 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
@@ -16,7 +16,7 @@ public abstract enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
index 1ed21ac3ae6..8f7d783c3dd 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
index eaf7224cff2..9dc7ce432b0 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
index 302987d8a86..93217cba14a 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
@@ -18,7 +18,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt
index 30bd18766e2..dd81e19c902 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt
@@ -17,7 +17,7 @@ private final enum class MethodKind : kotlin.Enum<MethodKind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MethodKind>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MethodKind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MethodKind
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MethodKind>
+    public final /*synthesized*/ fun values(): kotlin.Array<MethodKind>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
index f05d7664e3b..06938518d7c 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
@@ -13,7 +13,7 @@ public final enum class E : kotlin.Enum<E>, kotlin.Cloneable {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
index d708275edb9..b69a357eed6 100644
--- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
@@ -43,7 +43,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
index 9cca81f2080..9d167ce206a 100644
--- a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
+++ b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
@@ -21,7 +21,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
index 8d8e98e57d2..0f0001ca6eb 100644
--- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
@@ -19,7 +19,7 @@ public final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EnumWithOpenMembers>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumWithOpenMembers>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithOpenMembers
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>
+    public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
index 5e2680b97ea..554848f9afc 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
@@ -13,7 +13,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt
index 0ddad0cdd2e..b2b9ba97aa3 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt
@@ -21,4 +21,4 @@ fun f1() = ENTRY
 fun f2() = ANOTHER
 fun f3() = Nested()
 fun f4() = Nested.foo()
-fun f5() = values
+fun f5() = values()
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
index 64cdd9e83b6..0122863fe9e 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
@@ -40,8 +40,8 @@ package foo {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<foo.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<foo.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): foo.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<foo.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<foo.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
index fb55c281f3d..a9f08db1e1a 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
@@ -15,8 +15,8 @@ package bug {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<bug.Foo<T>>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<bug.Foo<T>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): bug.Foo<T>
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<bug.Foo<T>>
+        public final /*synthesized*/ fun values(): kotlin.Array<bug.Foo<T>>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
index ef36116d167..b3580c5fac2 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt
@@ -3,16 +3,16 @@ enum class E {
 
     companion object {
         fun foo(): E = ENTRY
-        fun bar(): Array<E> = values
+        fun bar(): Array<E> = values()
         fun baz(): E = valueOf("ENTRY")
-        val valuez = values
+        val valuez = values()
     }
 
     fun oof(): E = ENTRY
-    fun rab(): Array<E> = values
+    fun rab(): Array<E> = values()
     fun zab(): E = valueOf("ENTRY")
 }
 
 fun foo() = E.ENTRY
-fun bar() = E.values
+fun bar() = E.values()
 fun baz() = E.valueOf("ENTRY")
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
index 1459ec9936a..e4988cea117 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
@@ -31,7 +31,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
index 6e52afae1a4..7cf1b5e086c 100644
--- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
@@ -101,8 +101,8 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<a.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<a.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<a.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
index 3ebff431f07..f8e914ab3f0 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
@@ -19,7 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
index 74b6b803f84..5a0c31491c1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
@@ -23,8 +23,8 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<a.SomeEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.SomeEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<a.SomeEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<a.SomeEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
index 306c47a743e..697656d1fd8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
@@ -20,8 +20,8 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<a.TestEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.TestEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.TestEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<a.TestEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<a.TestEnum>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
index 093c479c0a1..82bc915aa86 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
@@ -44,7 +44,7 @@ public final enum class Kind : kotlin.Enum<Kind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Kind>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Kind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Kind
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Kind>
+    public final /*synthesized*/ fun values(): kotlin.Array<Kind>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
index e5d6ab5e46e..2a8fe8f55ef 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
index f7f3ffe56d8..560e63685cb 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
@@ -68,9 +68,9 @@ public final class D {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<D.R>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D.R>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D.R
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<D.R>
+        public final /*synthesized*/ fun values(): kotlin.Array<D.R>
     }
 
     public final annotation class S : kotlin.Annotation {
@@ -103,9 +103,9 @@ public final enum class H : kotlin.Enum<H> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<H>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<H>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): H
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<H>
+    public final /*synthesized*/ fun values(): kotlin.Array<H>
 }
 
 public interface K {
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
index ce4b472ac75..f55220b3638 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
@@ -35,9 +35,9 @@ public object Obj {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<Obj.NestedEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Obj.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Obj.NestedEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Obj.NestedEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<Obj.NestedEnum>
     }
 
     public object NestedObj : N {
@@ -98,9 +98,9 @@ public final class WithClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<WithClassObject.NestedEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<WithClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithClassObject.NestedEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<WithClassObject.NestedEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<WithClassObject.NestedEnum>
     }
 
     public object NestedObj : N {
@@ -154,9 +154,9 @@ public final class WithoutClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<WithoutClassObject.NestedEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<WithoutClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithoutClassObject.NestedEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<WithoutClassObject.NestedEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<WithoutClassObject.NestedEnum>
     }
 
     public object NestedObj : N {
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
index f8ea1f51c71..5075067b2cc 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
@@ -37,7 +37,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
index 7a6137c8755..2213a0e7fa0 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
@@ -18,7 +18,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
index 8acf43f13cb..4fcec2a60f9 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
@@ -24,8 +24,8 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
index 1e736e33bed..c761eb6d373 100644
--- a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
+++ b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
@@ -16,7 +16,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
index 120dfcd405c..198fc7d3615 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
@@ -17,7 +17,7 @@ public final enum class Type : kotlin.Enum<Type!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Type>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Type>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Type
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Type>
+    public final /*synthesized*/ fun values(): kotlin.Array<Type>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt
index 36f1caa38bb..dc701de2a4b 100644
--- a/compiler/testData/diagnostics/tests/j+k/serializable.txt
+++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt
@@ -22,9 +22,9 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<C>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C>
+    public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
 public final class N {
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
index 9591a728e49..e25c07ffe6d 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
@@ -78,9 +78,9 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
 
 public final class Outer {
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
index e2e831e3640..b1b6cb29fbc 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
@@ -23,7 +23,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
index d62a2039e9a..f7f74cccb23 100644
--- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
@@ -89,9 +89,9 @@ public final enum class Enum : kotlin.Enum<Enum> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Enum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Enum>
+    public final /*synthesized*/ fun values(): kotlin.Array<Enum>
 }
 
 public object G {
diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt
index 6d2371af76e..b7b8443a27c 100644
--- a/compiler/testData/diagnostics/tests/modifiers/protected.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt
@@ -46,9 +46,9 @@ public final enum class Our : kotlin.Enum<Our> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Our>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Our>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Our
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Our>
+    public final /*synthesized*/ fun values(): kotlin.Array<Our>
 }
 
 public interface Their {
diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
index 3d7cc0bd89c..93c9162320b 100644
--- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
@@ -34,7 +34,7 @@ public final enum class Third : kotlin.Enum<Third> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Third>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Third>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Third
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Third>
+    public final /*synthesized*/ fun values(): kotlin.Array<Third>
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
index 399d81b694a..9e1bc8a1b82 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
@@ -20,9 +20,9 @@ public/*package*/ open class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.Empty>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Empty>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Empty
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.Empty>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.Empty>
     }
 
     // Static members
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
index cb1ee530637..8034bdc2a99 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
@@ -26,9 +26,9 @@ public final class C {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<C.<no name provided>>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C.<no name provided>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C.<no name provided>
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C.<no name provided>>
+        public final /*synthesized*/ fun values(): kotlin.Array<C.<no name provided>>
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
index 2baab918742..4bf67457316 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
@@ -27,9 +27,9 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
+    public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
 
 public final annotation class <no name provided> : kotlin.Annotation {
diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
index 9f36cdfd55c..cd4e6235f5d 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
@@ -30,7 +30,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
index b55a2bf1abb..178ae2c7c86 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
@@ -20,9 +20,9 @@ public final enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<En>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<En>
+    public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
 
 public object Foo {
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
index 04d7b8a8924..57f822f75a5 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
@@ -17,9 +17,9 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt2418.A>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.A>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.A
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt2418.A>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.A>
     }
 
     public final enum class B : kotlin.Enum<kt2418.B> {
@@ -36,9 +36,9 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt2418.B>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.B>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.B
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
     }
 
     public final enum class C : kotlin.Enum<kt2418.C> {
@@ -55,9 +55,9 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt2418.C>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.C
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
     }
 
     public final enum class D : kotlin.Enum<kt2418.D> {
@@ -80,8 +80,8 @@ package kt2418 {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<kt2418.D>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.D>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.D
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<kt2418.D>
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.D>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
index c682b6b269c..04a6439501a 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
@@ -18,7 +18,7 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
+    public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
index 88ed7e1e9a8..ff4ea639048 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
@@ -18,7 +18,7 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
+    public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
index 8881a519b33..ca1c78ff46b 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
@@ -13,7 +13,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt4693.txt b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
index d98408bc3d2..441bfabd3cb 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt4693.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
@@ -14,7 +14,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
index 8a5e40d78b4..faee5a72b90 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
@@ -16,9 +16,9 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<EnumClass>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
+    public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
 
 public final class Foo</*0*/ TInner, /*1*/ TOuter> {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
index 928a1153857..0b4cb96b717 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
@@ -18,9 +18,9 @@ public final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasse
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<DOMElementTestClasses>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<DOMElementTestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): DOMElementTestClasses
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<DOMElementTestClasses>
+    public final /*synthesized*/ fun values(): kotlin.Array<DOMElementTestClasses>
 }
 
 public interface EnumStyleClass {
@@ -44,7 +44,7 @@ public final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<TestClasses>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<TestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestClasses
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<TestClasses>
+    public final /*synthesized*/ fun values(): kotlin.Array<TestClasses>
 }
diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
index f4bc6828b61..c8275cfb51d 100644
--- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
+++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
@@ -26,7 +26,7 @@ public sealed enum class SealedEnum : kotlin.Enum<SealedEnum> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<SealedEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<SealedEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SealedEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<SealedEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<SealedEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
index 3e64ac22024..4589d86acf9 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
@@ -23,9 +23,9 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<B>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<B>
+    public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
 
 public final class C {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
index e28817b607e..e3176fcd385 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
@@ -25,9 +25,9 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A>
+    public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
 
 public final enum class B : kotlin.Enum<B> {
@@ -52,9 +52,9 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<B>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<B>
+    public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
 
 public final enum class C : kotlin.Enum<C> {
@@ -70,9 +70,9 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<C>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C>
+    public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
 public final enum class D : kotlin.Enum<D> {
@@ -96,7 +96,7 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<D>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<D>
+    public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
index 63baee2fd7d..6af2fcc6595 100644
--- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
@@ -30,7 +30,7 @@ public final enum class A4 : kotlin.Enum<A4> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<A4>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A4
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A4>
+    public final /*synthesized*/ fun values(): kotlin.Array<A4>
 }
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
index f60ba1512fb..e0e5ea89cd4 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
@@ -17,7 +17,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
index 51bdcdb9db7..d27d78cfdac 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
@@ -21,9 +21,9 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
 public/*package*/ open class J {
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
index f2912395fe9..bc418513c87 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
@@ -17,7 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
index 5d0d2949719..780d4416b90 100644
--- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
@@ -17,7 +17,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<My>
+    public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
index 328998755f7..2600bc29ce6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
@@ -19,7 +19,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
index 328998755f7..2600bc29ce6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
@@ -19,7 +19,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
index fac68d13fc7..ea2f6daa232 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
@@ -21,7 +21,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Direction>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Direction>
+    public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
index 78fa37ba18b..96aede43abd 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
@@ -17,7 +17,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
index 85f7c549481..e7c66abc613 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
index 791cbcbce07..12243102d84 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     @org.jetbrains.annotations.NotNull() public open fun create(): J
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
index 85f7c549481..e7c66abc613 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
index 85f7c549481..e7c66abc613 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
index 85f7c549481..e7c66abc613 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
index fac68d13fc7..ea2f6daa232 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
@@ -21,7 +21,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<Direction>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<Direction>
+    public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
index 98392cb35ca..de10f9dd990 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
@@ -17,7 +17,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
index 98392cb35ca..de10f9dd990 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
@@ -17,7 +17,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
index 98392cb35ca..de10f9dd990 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
@@ -17,7 +17,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
index 85f7c549481..e7c66abc613 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
@@ -17,8 +17,8 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<J>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<J>
+    public final /*synthesized*/ fun values(): kotlin.Array<J>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
index 1a99a8225e7..1fbe6657b50 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
@@ -21,7 +21,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
index 1a99a8225e7..1fbe6657b50 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
@@ -21,7 +21,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
index 1a99a8225e7..1fbe6657b50 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
@@ -21,7 +21,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
index 2e746e14dc2..c166aa3f743 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
@@ -21,7 +21,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
index 98392cb35ca..de10f9dd990 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
@@ -17,7 +17,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<X>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<X>
+    public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
index 2fd10532e97..362e475602b 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
@@ -15,9 +15,9 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
 public final class Outer {
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
index 1ef85807f8e..19985815df1 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
@@ -24,9 +24,9 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<C>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<C>
+    public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
 
 public final class N {
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
index afb5acbc2b9..87589592598 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
@@ -82,9 +82,9 @@ public final class A {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
 
     public final inner class I {
@@ -211,9 +211,9 @@ public final enum class E : kotlin.Enum<E> {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<E.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<E.E>
     }
 
     public final inner class I {
@@ -250,9 +250,9 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<E>
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
 public interface T {
@@ -336,9 +336,9 @@ public interface T {
         }
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<T.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<T.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): T.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<T.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<T.E>
     }
 
     public interface T {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
index 8a69c4e9290..de756848e5e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
@@ -44,9 +44,9 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.E>
     }
 
     public object O {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index 8741875176c..cb73c768615 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -17,9 +17,9 @@ public interface CustomAnnotation {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.CustomAnnotation.MyEnum>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.CustomAnnotation.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
     }
 
     @test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE) public open class MyTest {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
index f7341c90c58..9e25cd65a21 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
@@ -14,9 +14,9 @@ public open class EnumArgumentWithCustomToString {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.EnumArgumentWithCustomToString.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumArgumentWithCustomToString.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumArgumentWithCustomToString.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
     }
 
     public final annotation class EnumAnno : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
index 9e317ff1289..33b1b399696 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
@@ -16,7 +16,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.EnumConstructorParameter>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumConstructorParameter
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumConstructorParameter>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
index 05d53fc9ae6..43cc49e419c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
@@ -19,8 +19,8 @@ public open class NestedEnumArgument {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.NestedEnumArgument.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.NestedEnumArgument.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.NestedEnumArgument.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.NestedEnumArgument.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.NestedEnumArgument.E>
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
index eaac6c31ced..05ca4c760c9 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
@@ -14,7 +14,7 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
     public open fun first(): kotlin.Boolean
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.EnumMembers>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumMembers>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
index d746fcfba22..bf540167e07 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
@@ -16,7 +16,7 @@ public open enum class EnumWithSpecializedEntry : kotlin.Enum<test.EnumWithSpeci
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.EnumWithSpecializedEntry>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithSpecializedEntry>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithSpecializedEntry
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithSpecializedEntry>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithSpecializedEntry>
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
index 39b68e5e826..626ba9e2f59 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
@@ -12,7 +12,7 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.JavaEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.JavaEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index 356d43e1d10..675e81b7782 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -26,7 +26,7 @@ public final enum class Enum : kotlin.Enum<test.Enum!> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Enum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index 23dd0bddc97..5ae29ff5532 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -12,10 +12,10 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     // Static members
     public final val CONSTANT: test.StaticMembersInEnum!
     public final var STATIC_FIELD: kotlin.Int
-    public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
     public open fun foo(): kotlin.Unit
     public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
     public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
index 65e3640a674..e44ad424cfc 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
@@ -29,8 +29,8 @@ public/*package*/ final enum class StaticMembersInEnum : kotlin.Enum<test.Static
     public final var c: kotlin.Int
     public final override /*1*/ var d: kotlin.Int
     public const final override /*1*/ /*fake_override*/ val e: kotlin.Int
-    public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
     public open fun foo(): kotlin.Unit
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index bd80421a3e5..9af6850357e 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -16,10 +16,10 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.E>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
 
 public final annotation class EnumOption : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index e0451bf9dca..89a280b3546 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -12,10 +12,10 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.E>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
 
 public final annotation class EnumAnno : kotlin.Annotation {
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
index dae063c3d6c..668e04648b1 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -22,8 +22,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.E>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
index 24af155de4a..628f1862b6d 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -10,8 +10,8 @@ public final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test.E
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithGenericConstructorParameter): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.EnumWithGenericConstructorParameter>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithGenericConstructorParameter>
         public final fun <get-values>(): kotlin.Array<test.EnumWithGenericConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index 86a989591fe..0888db7acda 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -10,8 +10,8 @@ public final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum<test
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithPrimitiveConstructorParameter): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
         public final fun <get-values>(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
index aaa47d0c6eb..5a74c37944c 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
@@ -12,10 +12,10 @@ internal final enum class In : kotlin.Enum<test.In> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.In>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.In>
         public final fun <get-values>(): kotlin.Array<test.In>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.In>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.In>
 }
 
 private final enum class Pr : kotlin.Enum<test.Pr> {
@@ -30,10 +30,10 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Pr>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Pr>
         public final fun <get-values>(): kotlin.Array<test.Pr>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
 }
 
 public final enum class Pu : kotlin.Enum<test.Pu> {
@@ -48,8 +48,8 @@ public final enum class Pu : kotlin.Enum<test.Pu> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Pu>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Pu>
         public final fun <get-values>(): kotlin.Array<test.Pu>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
index 676c7226bed..b8ca83d373e 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
@@ -20,8 +20,8 @@ public final enum class En : kotlin.Enum<test.En> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.En>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.En>
         public final fun <get-values>(): kotlin.Array<test.En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.En>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.En>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
index dcdf813f1ea..58b0f86c5ce 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
@@ -28,8 +28,8 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     }
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Enum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Enum>
         public final fun <get-values>(): kotlin.Array<test.Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
index e5866a190b4..ce41f7ce5fd 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
@@ -15,9 +15,9 @@ public final class A {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.A.E>
             public final fun <get-values>(): kotlin.Array<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
index a5be2a4ff8f..ac83cb8a674 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
@@ -19,9 +19,9 @@ public final class A {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
 
         // Static members
-        public final /*synthesized*/ val values: kotlin.Array<test.A.E>
+        @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.A.E>
             public final fun <get-values>(): kotlin.Array<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
-        @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
+        public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
index 3062d04343c..0898ac81f68 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
@@ -12,8 +12,8 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
         public final fun <get-values>(): kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
index 0a3caf23d88..b86d015636e 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
@@ -14,8 +14,8 @@ public final enum class Test : kotlin.Enum<test.Test> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Test>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Test>
         public final fun <get-values>(): kotlin.Array<test.Test>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
index 190919d39c6..3ece6e9ab8a 100644
--- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
+++ b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
@@ -26,8 +26,8 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.E>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.E>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
index 6955aac82de..65ec67e578b 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
@@ -32,7 +32,7 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
index 9a1eab59e4c..19c759738b5 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
@@ -14,9 +14,9 @@ public final enum class My : kotlin.Enum<test.My> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.My>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.My
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.My>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.My>
 }
 
 public final annotation class ann : kotlin.Annotation {
diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
index c0464999965..3b45ff98156 100644
--- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
+++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
@@ -45,7 +45,7 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/compiler/testData/serialization/js/dynamicConstants.txt b/compiler/testData/serialization/js/dynamicConstants.txt
index 93f30b8c034..92cfd9c91af 100644
--- a/compiler/testData/serialization/js/dynamicConstants.txt
+++ b/compiler/testData/serialization/js/dynamicConstants.txt
@@ -43,7 +43,7 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
+    @kotlin.Deprecated(message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
-    @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
index c3613a5bc04..883e1c4ebf1 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
@@ -121,12 +121,8 @@ public class DescriptorFactory {
 
     @NotNull
     public static SimpleFunctionDescriptor createEnumValuesMethod(@NotNull ClassDescriptor enumClass) {
-        AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget(
-                AnnotationUtilKt.createDeprecatedAnnotation(getBuiltIns(enumClass), "Use 'values' property instead", "this.values")
-        );
-
         SimpleFunctionDescriptorImpl values =
-                SimpleFunctionDescriptorImpl.create(enumClass, annotations, DescriptorUtils.ENUM_VALUES,
+                SimpleFunctionDescriptorImpl.create(enumClass, Annotations.Companion.getEMPTY(), DescriptorUtils.ENUM_VALUES,
                                                     CallableMemberDescriptor.Kind.SYNTHESIZED, enumClass.getSource());
         return values.initialize(null, null, Collections.<TypeParameterDescriptor>emptyList(),
                                  Collections.<ValueParameterDescriptor>emptyList(),
@@ -136,9 +132,13 @@ public class DescriptorFactory {
 
     @NotNull
     public static PropertyDescriptor createEnumValuesProperty(@NotNull ClassDescriptor enumClass) {
+        AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget(
+                AnnotationUtilKt.createDeprecatedAnnotation(getBuiltIns(enumClass), "Use 'values()' function instead", "this.values()")
+        );
+
         PropertyDescriptorImpl values =
                 PropertyDescriptorImpl.create(
-                        enumClass, Annotations.Companion.getEMPTY(), Modality.FINAL, Visibilities.PUBLIC, /* isVar */ false,
+                        enumClass, annotations, Modality.FINAL, Visibilities.PUBLIC, /* isVar */ false,
                         DescriptorUtils.ENUM_VALUES, CallableMemberDescriptor.Kind.SYNTHESIZED, enumClass.getSource(),
                         /* lateInit = */ false, /* isConst = */ false
                 );
diff --git a/idea/testData/checker/ClassObjectInEnum.kt b/idea/testData/checker/ClassObjectInEnum.kt
index ef36116d167..b3580c5fac2 100644
--- a/idea/testData/checker/ClassObjectInEnum.kt
+++ b/idea/testData/checker/ClassObjectInEnum.kt
@@ -3,16 +3,16 @@ enum class E {
 
     companion object {
         fun foo(): E = ENTRY
-        fun bar(): Array<E> = values
+        fun bar(): Array<E> = values()
         fun baz(): E = valueOf("ENTRY")
-        val valuez = values
+        val valuez = values()
     }
 
     fun oof(): E = ENTRY
-    fun rab(): Array<E> = values
+    fun rab(): Array<E> = values()
     fun zab(): E = valueOf("ENTRY")
 }
 
 fun foo() = E.ENTRY
-fun bar() = E.values
+fun bar() = E.values()
 fun baz() = E.valueOf("ENTRY")
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt
index 9e1638ae521..634ee61352d 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt
@@ -1,7 +1,7 @@
-// "Replace with 'this.values'" "true"
+// "Replace with 'this.values()'" "true"
 
 enum class MyEnum {}
 
 fun foo() {
-    MyEnum.<caret>values()
+    MyEnum.<caret>values
 }
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after
index fcea08e59c2..f6807f173f1 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after
@@ -1,7 +1,7 @@
-// "Replace with 'this.values'" "true"
+// "Replace with 'this.values()'" "true"
 
 enum class MyEnum {}
 
 fun foo() {
-    MyEnum.values
+    MyEnum.values()
 }