diff --git a/compiler/testData/diagnostics/tests/BacktickNames.txt b/compiler/testData/diagnostics/tests/BacktickNames.txt
index ecb5390a0ef..48a812ce0ba 100644
--- a/compiler/testData/diagnostics/tests/BacktickNames.txt
+++ b/compiler/testData/diagnostics/tests/BacktickNames.txt
@@ -52,7 +52,7 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Data {
+public final data class Data {
     public constructor Data(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     public final val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/Underscore.txt b/compiler/testData/diagnostics/tests/Underscore.txt
index 58e59817fce..135b51a3217 100644
--- a/compiler/testData/diagnostics/tests/Underscore.txt
+++ b/compiler/testData/diagnostics/tests/Underscore.txt
@@ -5,7 +5,7 @@ public val something: kotlin.Any?
 public fun __(/*0*/ ___: kotlin.Int, /*1*/ y: _<kotlin.Int>?): kotlin.Int
 public fun doIt(/*0*/ f: (kotlin.Any?) -> kotlin.Any?): kotlin.Any?
 
-@kotlin.Deprecated(message = "") @kotlin.data() public final class Pair {
+@kotlin.Deprecated(message = "") public final data class Pair {
     public constructor Pair(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     public final val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt
index 8da60a4ae83..b93e1a73a35 100644
--- a/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/annotations/MultiDeclaration.txt
@@ -9,7 +9,7 @@ public fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Pair {
+public final data class Pair {
     public constructor Pair(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     public final val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt
index ceeb787f8c7..a7878801ed0 100644
--- a/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt
+++ b/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt
@@ -3,7 +3,7 @@ package
 public fun bar(): kotlin.Array<A>
 public fun foo(): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     public final val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt
index df3be20e649..a494874ff94 100644
--- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt
@@ -2,7 +2,7 @@ package
 
 public fun test(): kotlin.Any?
 
-@kotlin.data() public final class P {
+public final data class P {
     public constructor P(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
     public final val a: kotlin.Int
     public final val b: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt
index 5a77e5822dc..5a72042184c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.txt
@@ -9,7 +9,7 @@ public fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Pair {
+public final data class Pair {
     public constructor Pair(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
     public final val a: kotlin.Int
     public final val b: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/target.txt b/compiler/testData/diagnostics/tests/annotations/options/target.txt
index 740e7f0b05a..ed73b7f82a0 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/target.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/target.txt
@@ -1,6 +1,6 @@
 package
 
-@base() @kotlin.data() public final class My {
+@base() public final data class My {
     public constructor My(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.txt
index 909274cc8e8..7e7beab89d7 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class ProductGroup {
+public final data class ProductGroup {
     public constructor ProductGroup(/*0*/ short_name: kotlin.String, /*1*/ parent: ProductGroup?)
     public final val name: kotlin.String
     public final val parent: ProductGroup?
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.txt b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.txt
index fdabd28b344..42d6e64c08f 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ component1: kotlin.Int)
     public final val component1: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.txt b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.txt
index f2102065ccb..773abd4be96 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.txt b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.txt
index 50cc83cd0d5..c426f360172 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.txt b/compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.txt
index 1e1f52dbb8e..18ed9e50aa3 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.txt
@@ -6,7 +6,7 @@ public final class Outer {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.data() private final class Nested {
+    private final data class Nested {
         public constructor Nested(/*0*/ c: kotlin.Int)
         public final val c: kotlin.Int
         public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.txt b/compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.txt
index 63169e5a31b..76bb06d100f 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class <no name provided> {
+public final data class <no name provided> {
     public constructor <no name provided>()
     public final /*synthesized*/ fun copy(): <no name provided>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -8,7 +8,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public interface <no name provided> {
+public data interface <no name provided> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.txt b/compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.txt
index ab617b66201..4f6f644a84c 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class My {
+public final data class My {
     public constructor My(/*0*/ x: kotlin.Int, /*1*/ vararg y: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val x: kotlin.Int
     public final val y: kotlin.Array<out kotlin.String>
@@ -12,7 +12,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Your {
+public final data class Your {
     public constructor Your(/*0*/ vararg z: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final /*synthesized*/ fun copy(/*0*/ vararg z: kotlin.String /*kotlin.Array<out kotlin.String>*/): Your
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/dataClasses/dataInheritance.txt b/compiler/testData/diagnostics/tests/dataClasses/dataInheritance.txt
index 9275ecb0a41..7d5e02b560e 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/dataInheritance.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/dataInheritance.txt
@@ -6,7 +6,7 @@ public interface Allowed {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public abstract class Base {
+public abstract data class Base {
     public constructor Base(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
@@ -16,7 +16,7 @@ public interface Allowed {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Complex : Allowed, NotAllowed {
+public final data class Complex : Allowed, NotAllowed {
     public constructor Complex(/*0*/ y: kotlin.Int)
     public final val y: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
@@ -36,7 +36,7 @@ public final class Derived : Base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Nasty : Base {
+public final data class Nasty : Base {
     public constructor Nasty(/*0*/ z: kotlin.Int, /*1*/ y: kotlin.Int)
     public final override /*1*/ /*fake_override*/ val x: kotlin.Int
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.txt b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.txt
index e48dadb0b21..d89fcfc4d27 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A()
     public final /*synthesized*/ fun copy(): A
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
index 1e01f38faec..33f5dce3721 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A : T {
+public final data class A : T {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator override /*1*/ /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
index 4510a47d289..a7811b0adde 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A : T {
+public final data class A : T {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator override /*1*/ /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/innerDataClass.txt b/compiler/testData/diagnostics/tests/dataClasses/innerDataClass.txt
index d5ac3e4a9ab..012fef42fc5 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/innerDataClass.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/innerDataClass.txt
@@ -6,7 +6,7 @@ public final class Outer {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    @kotlin.data() public final inner class Inner {
+    public final inner data class Inner {
         public constructor Inner(/*0*/ x: kotlin.Int)
         public final val x: kotlin.Int
         public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.txt b/compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.txt
index 4ee5314accd..4c6f3154d8a 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class Outer {
+public final data class Outer {
     public constructor Outer(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.txt b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.txt
index 881b5024989..bdfbdc1aa80 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.txt b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.txt
index 3ef137100c3..e4e6c7a8e49 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ arr: kotlin.Array<A>): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.txt b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.txt
index e48dadb0b21..d89fcfc4d27 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A()
     public final /*synthesized*/ fun copy(): A
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.txt b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.txt
index 2eab33ecbfe..728b7ca1151 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.txt b/compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.txt
index 7f653f24f2c..8a7f4c25cdc 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A1 {
+public final data class A1 {
     public constructor A1(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String, /*2*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final val x: kotlin.Int
@@ -15,7 +15,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class A2 {
+public final data class A2 {
     public constructor A2(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val x: kotlin.String = ""
@@ -28,7 +28,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class A3 {
+public final data class A3 {
     public constructor A3(/*0*/ <no name provided>: kotlin.Int, /*1*/ <no name provided>: kotlin.Int)
     public final val <no name provided>: kotlin.Int
     public final val <no name provided>: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.txt b/compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.txt
index 4241804b766..414072771e3 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public sealed class My {
+public sealed data class My {
     private constructor My(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
index da093f1eb27..ebb7a28c1c8 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final enum class First : kotlin.Enum<First> {
+public final data enum class First : kotlin.Enum<First> {
     enum entry A
 
     enum entry B
@@ -23,7 +23,7 @@ package
     @kotlin.Deprecated(message = "Use 'values' property instead", replaceWith = kotlin.ReplaceWith(expression = "this.values", imports = {})) public final /*synthesized*/ fun values(): kotlin.Array<First>
 }
 
-@kotlin.data() @kotlin.annotation.annotation() public final class Fourth : kotlin.Annotation {
+@kotlin.annotation.annotation() public final data class Fourth : kotlin.Annotation {
     public constructor Fourth(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
@@ -33,7 +33,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public object Second {
+public data object Second {
     private constructor Second()
     public final /*synthesized*/ fun copy(): Second
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -41,7 +41,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public interface Third {
+public data interface Third {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.txt b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.txt
index 881b5024989..bdfbdc1aa80 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final val x: kotlin.Int
     public final val y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.txt b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.txt
index 43dbcc4d63f..b59cfc837c4 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ a: A): kotlin.Unit
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
     public final var x: kotlin.Int
     public final var y: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt
index 4e172afa1ff..7fe15992cee 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.txt
@@ -5,7 +5,7 @@ package test {
     public fun b(/*0*/ s: kotlin.String): kotlin.Unit
     public fun println(/*0*/ a: kotlin.Any?): kotlin.Any?
 
-    @kotlin.data() public final class Pair</*0*/ A, /*1*/ B> {
+    public final data class Pair</*0*/ A, /*1*/ B> {
         public constructor Pair</*0*/ A, /*1*/ B>(/*0*/ a: A, /*1*/ b: B)
         public final val a: A
         public final val b: B
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt
index 17b0cac99f1..8b218fd3062 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class C {
+public final data class C {
     public constructor C(/*0*/ c: kotlin.Int)
     public final val c: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.txt b/compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.txt
index 7090fe326cd..c42e6700292 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.txt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ my: My?): kotlin.Int?
 
-@kotlin.data() public final class My {
+public final data class My {
     public constructor My(/*0*/ x: kotlin.Unit)
     public final val x: kotlin.Unit
     public final operator /*synthesized*/ fun component1(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt
index a93713addd7..65f132f7c6c 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt
@@ -24,7 +24,7 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Pair</*0*/ out A, /*1*/ out B> {
+public final data class Pair</*0*/ out A, /*1*/ out B> {
     public constructor Pair</*0*/ out A, /*1*/ out B>(/*0*/ first: A, /*1*/ second: B)
     public final val first: A
     public final val second: B
diff --git a/compiler/testData/diagnostics/tests/regressions/kt7585/base.txt b/compiler/testData/diagnostics/tests/regressions/kt7585/base.txt
index 81a235f2eca..75b4c10a526 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt7585/base.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt7585/base.txt
@@ -24,7 +24,7 @@ public final class MyWrapper : Wrapper<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Pair</*0*/ out T> {
+public final data class Pair</*0*/ out T> {
     public constructor Pair</*0*/ out T>(/*0*/ a: T, /*1*/ b: T)
     public final val a: T
     public final val b: T
diff --git a/compiler/testData/diagnostics/tests/regressions/kt7585/java.txt b/compiler/testData/diagnostics/tests/regressions/kt7585/java.txt
index 0ba058571ba..b3a30a23db5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt7585/java.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt7585/java.txt
@@ -24,7 +24,7 @@ public final class MyWrapper : Wrapper<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class Pair</*0*/ out T> {
+public final data class Pair</*0*/ out T> {
     public constructor Pair</*0*/ out T>(/*0*/ a: T, /*1*/ b: T)
     public final val a: T
     public final val b: T
diff --git a/compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.txt b/compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.txt
index 57f3ef708a1..7bdb773312b 100644
--- a/compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.txt
+++ b/compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.txt
@@ -44,7 +44,7 @@ public sealed class Sealed {
         }
     }
 
-    @kotlin.data() public final class Tuple {
+    public final data class Tuple {
         public constructor Tuple(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
         public final val x: kotlin.Int
         public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.txt
index 0520c1a6954..ba29337c040 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A1 {
+public final data class A1 {
     public constructor A1()
     public constructor A1(/*0*/ x: kotlin.String)
     public final val x: kotlin.String
@@ -11,7 +11,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class A2 {
+public final data class A2 {
     public constructor A2(/*0*/ x: kotlin.String)
     public constructor A2(/*0*/ y: kotlin.String, /*1*/ z: kotlin.Int)
     public final val y: kotlin.String
@@ -24,7 +24,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() public final class A3 {
+public final data class A3 {
     public constructor A3()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
index 8cba4186338..2585099e57b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
@@ -5,7 +5,7 @@ package a {
     public fun foo(/*0*/ map: kotlin.MutableMap<kotlin.Int, kotlin.String>, /*1*/ value: kotlin.String?): kotlin.Unit
     public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
 
-    @kotlin.data() public final class Tag {
+    public final data class Tag {
         public constructor Tag(/*0*/ tagName: kotlin.String)
         public final val attributes: kotlin.MutableMap<kotlin.String, kotlin.String>
         public final val contents: kotlin.MutableList<a.Tag>
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt3711.txt b/compiler/testData/diagnostics/tests/smartCasts/kt3711.txt
index 7076b7b05f9..e1581fe54a1 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt3711.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt3711.txt
@@ -3,7 +3,7 @@ package
 public fun f(/*0*/ a: kotlin.String?): kotlin.Unit
 public infix fun kotlin.String.to(/*0*/ second: kotlin.String): StringPair
 
-@kotlin.data() public final class StringPair {
+public final data class StringPair {
     public constructor StringPair(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
     public final val first: kotlin.String
     public final val second: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt b/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
index bfc97629990..f33c273f045 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
@@ -4,7 +4,7 @@ public fun F(): kotlin.MutableMap<kotlin.String, kotlin.String>
 public fun hashMapOf(/*0*/ pair: StringPair): kotlin.MutableMap<kotlin.String, kotlin.String>
 public infix fun kotlin.String.to(/*0*/ second: kotlin.String): StringPair
 
-@kotlin.data() public final class StringPair {
+public final data class StringPair {
     public constructor StringPair(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
     public final val first: kotlin.String
     public final val second: kotlin.String
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/property.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/property.txt
index 037a3e6223f..0c668999a23 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/property.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/property.txt
@@ -2,7 +2,7 @@ package
 
 public fun foo(/*0*/ y: MyClass): kotlin.Int
 
-@kotlin.data() public final class MyClass {
+public final data class MyClass {
     public constructor MyClass(/*0*/ x: kotlin.String?)
     public final val x: kotlin.String?
     public final operator /*synthesized*/ fun component1(): kotlin.String?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.txt
index 9caee9631f6..571281d3360 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): kotlin.Unit
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.txt
index ccc372a0a90..8ba36a01d1a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): SomeObject
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.txt
index ccc372a0a90..8ba36a01d1a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): SomeObject
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.txt
index ccc372a0a90..8ba36a01d1a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): SomeObject
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.txt
index 9caee9631f6..571281d3360 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): kotlin.Unit
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt
index 4086efde3da..712d67b36cc 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): kotlin.Unit
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.txt
index 9caee9631f6..571281d3360 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.txt
@@ -2,7 +2,7 @@ package
 
 public fun list(/*0*/ start: SomeObject): kotlin.Unit
 
-@kotlin.data() public final class SomeObject {
+public final data class SomeObject {
     public constructor SomeObject(/*0*/ n: SomeObject?)
     public final val n: SomeObject?
     public final operator /*synthesized*/ fun component1(): SomeObject?
diff --git a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.txt b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.txt
index aa6c6146023..8ef3e5656f0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.txt
@@ -33,7 +33,7 @@ public final class BigInteger {
     public final fun xor(/*0*/ o: BigInteger): BigInteger
 }
 
-@kotlin.data() private final class BinaryOperationKey</*0*/ A, /*1*/ B> {
+private final data class BinaryOperationKey</*0*/ A, /*1*/ B> {
     public constructor BinaryOperationKey</*0*/ A, /*1*/ B>(/*0*/ f: CompileTimeType<out A>, /*1*/ g: CompileTimeType<out B>, /*2*/ functionName: kotlin.String)
     public final val f: CompileTimeType<out A>
     public final val functionName: kotlin.String
@@ -54,7 +54,7 @@ private final class CompileTimeType</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-@kotlin.data() private final class UnaryOperationKey</*0*/ A> {
+private final data class UnaryOperationKey</*0*/ A> {
     public constructor UnaryOperationKey</*0*/ A>(/*0*/ f: CompileTimeType<out A>, /*1*/ functionName: kotlin.String)
     public final val f: CompileTimeType<out A>
     public final val functionName: kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
index 00a61a89dd5..13973ae6dc5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.data() public final class A {
+public final data class A {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
     public final operator /*synthesized*/ fun component1(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.txt
index 2c08958dd8a..f877e7ffa32 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class My {
+public final data class My {
     /*primary*/ public constructor My(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
         public final fun <get-x>(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt
index ea80c22c59f..2c05a6fff5b 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class DataClass {
+public final data class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ z: kotlin.Double)
     public final var x: kotlin.String
         public final fun <get-x>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt
index fb95b898696..91594deeb3a 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.txt
@@ -1,11 +1,11 @@
 package test
 
-@kotlin.data() public final class DataClass {
+public final data class DataClass {
     /*primary*/ public constructor DataClass()
     public final /*synthesized*/ fun copy(): test.DataClass
 }
 
-@kotlin.data() public final class OtherDataClass {
+public final data class OtherDataClass {
     /*primary*/ public constructor OtherDataClass()
     public final /*synthesized*/ fun copy(): test.OtherDataClass
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt
index eae153ff388..5313016513d 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class DataClass {
+public final data class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String)
     public final val x: kotlin.String
         public final fun <get-x>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/ParamNameSameToField.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/ParamNameSameToField.txt
index 9bc2a187819..ecd4282aa5d 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/ParamNameSameToField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/ParamNameSameToField.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class A {
+public final data class A {
     /*primary*/ public constructor A(/*0*/ foo: kotlin.String, /*1*/ bar: kotlin.Int, /*2*/ other: kotlin.Long)
     public final val bar: kotlin.Int
         public final fun <get-bar>(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt
index 0ef5c0617ea..9041723eb1f 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class DataClass {
+public final data class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int)
     public final val x: kotlin.String
         public final fun <get-x>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt
index 892deef4705..feb84b8b3e3 100644
--- a/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.txt
@@ -1,6 +1,6 @@
 package test
 
-@kotlin.data() public final class DataClass {
+public final data class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int)
     public final var x: kotlin.String
         public final fun <get-x>(): kotlin.String