Rendering changed: "annotation class" is now just "class" (with kotlin.annotation.annotation if it's kotlin annotation).

A swarm of tests fixed accordingly.

compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt

@@ -8,7 +8,7 @@ internal final class Annotated {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class My : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class My : kotlin.Annotation {
     public constructor My()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class My : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class My : kotlin.Annotation {
     public constructor My()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class My : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class My : kotlin.Annotation {
     public constructor My()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): @[My(x = IntegerValueType(42))] kotlin.Int
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class My : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class My : kotlin.Annotation {
     public constructor My(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(/*0*/ arg: kotlin.Int): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class My : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class My : kotlin.Annotation {
     public constructor My()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Base : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Base : kotlin.Annotation {
     public constructor Base(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ UseBase() internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class UseBase : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class UseBase : kotlin.Annotation {
     public constructor UseBase(/*0*/ b: Base = ...)
     internal final val b: Base
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt

@@ -1,13 +1,13 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class A1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A1 : kotlin.Annotation {
     public constructor A1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class A2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A2 : kotlin.Annotation {
     public constructor A2(/*0*/ some: kotlin.Int = ...)
     internal final val some: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt

@@ -2,14 +2,14 @@ package
 
 internal fun </*0*/ T> topFun(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class A1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A1 : kotlin.Annotation {
     public constructor A1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class A2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A2 : kotlin.Annotation {
     public constructor A2(/*0*/ some: kotlin.Int = ...)
     internal final val some: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt

@@ -2,7 +2,7 @@ package
 
 package test {
 
-    kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
         public constructor A(/*0*/ a: kotlin.Int = ..., /*1*/ b: kotlin.String = ..., /*2*/ c: kotlin.String)
         internal final val a: kotlin.Int
         internal final val b: kotlin.String

compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt

@@ -1,13 +1,13 @@
 package
 
-kotlin.annotation.annotation() java.lang.Deprecated() internal final annotation class my : kotlin.Annotation {
+kotlin.annotation.annotation() java.lang.Deprecated() internal final class my : kotlin.Annotation {
     public constructor my()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() java.lang.Deprecated() internal final annotation class my1 : kotlin.Annotation {
+kotlin.annotation.annotation() java.lang.Deprecated() internal final class my1 : kotlin.Annotation {
     public constructor my1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt

@@ -2,14 +2,14 @@ package
 
 internal val </*0*/ T> topProp: kotlin.Int = 12
 
-kotlin.annotation.annotation() internal final annotation class A1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A1 : kotlin.Annotation {
     public constructor A1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class A2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A2 : kotlin.Annotation {
     public constructor A2(/*0*/ some: kotlin.Int = ...)
     internal final val some: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt

@@ -7,14 +7,14 @@ my2() internal fun foo4(): kotlin.Unit
 my2() internal fun foo41(): kotlin.Unit
 my2(i = IntegerValueType(2)) internal fun foo42(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class my : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class my : kotlin.Annotation {
     public constructor my()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class my1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class my1 : kotlin.Annotation {
     public constructor my1(/*0*/ i: kotlin.Int)
     internal final val i: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -22,7 +22,7 @@ kotlin.annotation.annotation() internal final annotation class my1 : kotlin.Anno
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class my2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class my2 : kotlin.Annotation {
     public constructor my2(/*0*/ i: kotlin.Int = ...)
     internal final val i: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt

@@ -7,14 +7,14 @@ internal fun foo(): kotlin.Unit
 internal fun </*0*/ T> javaClass(): java.lang.Class<T>
 internal fun kotlin.String.invoke(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann1 : kotlin.Annotation {
     public constructor Ann1(/*0*/ a: kotlin.Int)
     internal final val a: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -22,7 +22,7 @@ kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Ann
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann2 : kotlin.Annotation {
     public constructor Ann2(/*0*/ a: Ann1)
     internal final val a: Ann1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -30,7 +30,7 @@ kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Ann
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann3 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann3 : kotlin.Annotation {
     public constructor Ann3(/*0*/ a: Ann1 = ...)
     internal final val a: Ann1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -38,7 +38,7 @@ kotlin.annotation.annotation() internal final annotation class Ann3 : kotlin.Ann
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann4 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann4 : kotlin.Annotation {
     public constructor Ann4(/*0*/ value: kotlin.String)
     internal final val value: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt

@@ -1,13 +1,13 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann2 : kotlin.Annotation {
     public constructor Ann2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt

@@ -1,13 +1,13 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class my : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class my : kotlin.Annotation {
     public constructor my()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) internal final annotation class my1 : kotlin.Annotation {
+kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) internal final class my1 : kotlin.Annotation {
     public constructor my1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt

@@ -3,7 +3,7 @@ package
 ann() internal fun bar(): kotlin.Int
 ann() internal fun foo(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt

@@ -1,6 +1,6 @@
 package
 
-RecursivelyAnnotated(x = IntegerValueType(1)) kotlin.annotation.annotation() internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
+RecursivelyAnnotated(x = IntegerValueType(1)) kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation {
     public constructor RecursivelyAnnotated(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(/*0*/ ann() x: kotlin.Int): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt

@@ -2,7 +2,7 @@ package
 
 ann() internal fun foo(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt

@@ -2,7 +2,7 @@ package
 
 ann(x = 1) internal val x: kotlin.Int = 1
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation {
     public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1)) x: kotlin.Int)
     RecursivelyAnnotated(x = IntegerValueType(1)) internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation {
     public constructor RecursivelyAnnotated(/*0*/ x: @[RecursivelyAnnotated(x = IntegerValueType(1))] kotlin.Int)
     internal final val x: @[RecursivelyAnnotated(x = IntegerValueType(1))] kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation {
     public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1)) x: kotlin.Int)
     RecursivelyAnnotated(x = IntegerValueType(1)) internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt

@@ -8,7 +8,7 @@ internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt

@@ -3,7 +3,7 @@ package
 package test {
     internal val some: test.SomeObject
 
-    kotlin.annotation.annotation() internal final annotation class BadAnnotation : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class BadAnnotation : kotlin.Annotation {
         public constructor BadAnnotation(/*0*/ s: kotlin.String)
         internal final val s: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt

@@ -2,28 +2,28 @@ package
 
 internal val a: T
 
-kotlin.annotation.annotation() internal final annotation class Ann : C {
+kotlin.annotation.annotation() internal final class Ann : C {
     public constructor Ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann2 : T {
+kotlin.annotation.annotation() internal final class Ann2 : T {
     public constructor Ann2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann3 : T {
+kotlin.annotation.annotation() internal final class Ann3 : T {
     public constructor Ann3()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann4 : C, T {
+kotlin.annotation.annotation() internal final class Ann4 : C, T {
     public constructor Ann4()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/annotationModifier.txt

@@ -18,7 +18,7 @@ internal final class A {
     }
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.Boolean /*kotlin.BooleanArray*/)
     internal final val i: kotlin.BooleanArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.Boolean /*kotlin.BooleanArray*/)
     internal final val i: kotlin.BooleanArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt

@@ -2,7 +2,7 @@ package
 
 internal val e: MyEnum
 
-kotlin.annotation.annotation() internal final annotation class AnnE : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnE : kotlin.Annotation {
     public constructor AnnE(/*0*/ i: MyEnum)
     internal final val i: MyEnum
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt

@@ -7,7 +7,7 @@ Ann(i = {1, 1, 1}) internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/)
     internal final val i: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt

@@ -7,7 +7,7 @@ internal val i4: kotlin.Int = 1
 internal var i5: kotlin.Int
 internal var i6: kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/)
     internal final val i: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt

@@ -3,7 +3,7 @@ package
 internal val topLevel: kotlin.String = "topLevel"
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ vararg i: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     internal final val i: kotlin.Array<out kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt

@@ -3,7 +3,7 @@ package
 kotlin.inline() internal fun bar(/*0*/ block: () -> kotlin.Int): kotlin.Int
 internal fun foo(): kotlin.Unit
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation(repeatable = true) internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation(repeatable = true) internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int = ...)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt

@@ -10,7 +10,7 @@ Ann(x = IntegerValueType(1)) Ann(x = IntegerValueType(2)) Ann(x = IntegerValueTy
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) kotlin.annotation.annotation(repeatable = true) internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) kotlin.annotation.annotation(repeatable = true) internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int = ...)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt

@@ -10,7 +10,7 @@ internal interface Some {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt

@@ -15,7 +15,7 @@ kotlin.data() internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt

@@ -2,7 +2,7 @@ package
 
 package test {
 
-    kotlin.annotation.annotation() internal final annotation class Ann1 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann1 : kotlin.Annotation {
         public constructor Ann1(/*0*/ p1: kotlin.Int, /*1*/ p2: kotlin.Byte, /*2*/ p3: kotlin.Short, /*3*/ p4: kotlin.Long, /*4*/ p5: kotlin.Double, /*5*/ p6: kotlin.Float, /*6*/ p7: kotlin.Char, /*7*/ p8: kotlin.Boolean)
         internal final val p1: kotlin.Int
         internal final val p2: kotlin.Byte
@@ -17,7 +17,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann2 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann2 : kotlin.Annotation {
         public constructor Ann2(/*0*/ p1: kotlin.String)
         internal final val p1: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -25,7 +25,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann3 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann3 : kotlin.Annotation {
         public constructor Ann3(/*0*/ p1: test.Ann1)
         internal final val p1: test.Ann1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -33,7 +33,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann4 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann4 : kotlin.Annotation {
         public constructor Ann4(/*0*/ p1: kotlin.IntArray, /*1*/ p2: kotlin.ByteArray, /*2*/ p3: kotlin.ShortArray, /*3*/ p4: kotlin.LongArray, /*4*/ p5: kotlin.DoubleArray, /*5*/ p6: kotlin.FloatArray, /*6*/ p7: kotlin.CharArray, /*7*/ p8: kotlin.BooleanArray)
         internal final val p1: kotlin.IntArray
         internal final val p2: kotlin.ByteArray
@@ -48,7 +48,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann5 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann5 : kotlin.Annotation {
         public constructor Ann5(/*0*/ p1: test.MyEnum)
         internal final val p1: test.MyEnum
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -56,7 +56,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann6 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann6 : kotlin.Annotation {
         public constructor Ann6(/*0*/ p: java.lang.Class<*>)
         internal final val p: java.lang.Class<*>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -64,7 +64,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann7 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann7 : kotlin.Annotation {
         public constructor Ann7(/*0*/ p: java.lang.annotation.RetentionPolicy)
         internal final val p: java.lang.annotation.RetentionPolicy
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -72,7 +72,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann8 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann8 : kotlin.Annotation {
         public constructor Ann8(/*0*/ p1: kotlin.Array<kotlin.String>, /*1*/ p2: kotlin.Array<java.lang.Class<*>>, /*2*/ p3: kotlin.Array<test.MyEnum>, /*3*/ p4: kotlin.Array<test.Ann1>)
         internal final val p1: kotlin.Array<kotlin.String>
         internal final val p2: kotlin.Array<java.lang.Class<*>>
@@ -83,7 +83,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class Ann9 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Ann9 : kotlin.Annotation {
         public constructor Ann9(/*0*/ vararg p1: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ vararg p2: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/, /*2*/ vararg p3: test.MyEnum /*kotlin.Array<out test.MyEnum>*/, /*3*/ vararg p4: test.Ann1 /*kotlin.Array<out test.Ann1>*/, /*4*/ vararg p5: kotlin.Int /*kotlin.IntArray*/)
         internal final val p1: kotlin.Array<out kotlin.String>
         internal final val p2: kotlin.Array<out java.lang.Class<*>>
@@ -95,7 +95,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn1 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn1 : kotlin.Annotation {
         public constructor InAnn1(/*0*/ p1: kotlin.Int?, /*1*/ p3: kotlin.Short?, /*2*/ p4: kotlin.Long?, /*3*/ p5: kotlin.Double?, /*4*/ p6: kotlin.Float?, /*5*/ p7: kotlin.Char?, /*6*/ p8: kotlin.Boolean?)
         internal final val p1: kotlin.Int?
         internal final val p3: kotlin.Short?
@@ -109,7 +109,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn10 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn10 : kotlin.Annotation {
         public constructor InAnn10(/*0*/ p1: kotlin.String?)
         internal final val p1: kotlin.String?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -117,7 +117,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn11 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn11 : kotlin.Annotation {
         public constructor InAnn11(/*0*/ p1: test.Ann1?)
         internal final val p1: test.Ann1?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -125,7 +125,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn12 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn12 : kotlin.Annotation {
         public constructor InAnn12(/*0*/ p1: test.MyEnum?)
         internal final val p1: test.MyEnum?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -133,7 +133,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn4 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn4 : kotlin.Annotation {
         public constructor InAnn4(/*0*/ p1: kotlin.Array<kotlin.Int>, /*1*/ p2: kotlin.Array<kotlin.Int>?)
         internal final val p1: kotlin.Array<kotlin.Int>
         internal final val p2: kotlin.Array<kotlin.Int>?
@@ -142,7 +142,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn6 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn6 : kotlin.Annotation {
         public constructor InAnn6(/*0*/ p: java.lang.Class<*>?)
         internal final val p: java.lang.Class<*>?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -150,7 +150,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn7 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn7 : kotlin.Annotation {
         public constructor InAnn7(/*0*/ p: java.lang.annotation.RetentionPolicy?)
         internal final val p: java.lang.annotation.RetentionPolicy?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -158,7 +158,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn8 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn8 : kotlin.Annotation {
         public constructor InAnn8(/*0*/ p1: kotlin.Array<kotlin.Int>, /*1*/ p2: kotlin.Array<kotlin.Int?>, /*2*/ p3: kotlin.Array<test.MyClass>, /*3*/ p4: kotlin.Array<kotlin.IntArray>)
         internal final val p1: kotlin.Array<kotlin.Int>
         internal final val p2: kotlin.Array<kotlin.Int?>
@@ -169,7 +169,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InAnn9 : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InAnn9 : kotlin.Annotation {
         public constructor InAnn9(/*0*/ p: test.MyClass)
         internal final val p: test.MyClass
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt

@@ -11,7 +11,7 @@ internal final class Hello {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final annotation class test : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class test : kotlin.Annotation {
     public constructor test()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt

@@ -1,20 +1,20 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Annotation1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation1 : kotlin.Annotation {
     public constructor Annotation1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation10 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation10 : kotlin.Annotation {
     public constructor Annotation10()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation2 : kotlin.Annotation {
     public constructor Annotation2()
     public final val s: kotlin.String = ""
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -22,7 +22,7 @@ kotlin.annotation.annotation() internal final annotation class Annotation2 : kot
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation3 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation3 : kotlin.Annotation {
     public constructor Annotation3()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
@@ -30,7 +30,7 @@ kotlin.annotation.annotation() internal final annotation class Annotation3 : kot
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation4 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation4 : kotlin.Annotation {
     public constructor Annotation4()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -44,7 +44,7 @@ kotlin.annotation.annotation() internal final annotation class Annotation4 : kot
     }
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation5 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation5 : kotlin.Annotation {
     public constructor Annotation5()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -58,14 +58,14 @@ kotlin.annotation.annotation() internal final annotation class Annotation5 : kot
     }
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation6 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation6 : kotlin.Annotation {
     public constructor Annotation6()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation7 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation7 : kotlin.Annotation {
     public constructor Annotation7(/*0*/ name: kotlin.String)
     internal final val name: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -73,7 +73,7 @@ kotlin.annotation.annotation() internal final annotation class Annotation7 : kot
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation8 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation8 : kotlin.Annotation {
     public constructor Annotation8(/*0*/ name: kotlin.String = ...)
     internal final var name: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -81,7 +81,7 @@ kotlin.annotation.annotation() internal final annotation class Annotation8 : kot
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class Annotation9 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Annotation9 : kotlin.Annotation {
     public constructor Annotation9(/*0*/ name: kotlin.String)
     internal final val name: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.String)
     internal final val a: kotlin.Int
     internal final var b: kotlin.Int

compiler/testData/diagnostics/tests/annotations/noNameProperty.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ <no name provided>: [ERROR : Type annotation was missing for parameter <no name provided>])
     internal final val <no name provided>: [ERROR : Annotation is absent]
     internal final val x: kotlin.Int

compiler/testData/diagnostics/tests/annotations/onExpression.txt

@@ -2,7 +2,7 @@ package
 
 internal fun foo(): kotlin.Int
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt

@@ -4,7 +4,7 @@ internal val bar: (kotlin.Int) -> kotlin.Unit
 internal val bas: (kotlin.Int) -> kotlin.Unit
 internal fun test(/*0*/ ann() p: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/onInitializer.txt

@@ -13,7 +13,7 @@ internal interface T {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/onLoops.txt

@@ -2,7 +2,7 @@ package
 
 internal fun test(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt

@@ -2,7 +2,7 @@ package
 
 internal fun test(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt

@@ -14,7 +14,7 @@ kotlin.data() internal final class P {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/annotation.txt

@@ -34,7 +34,7 @@ internal final enum class Target : kotlin.Enum<Target> {
     public final /*synthesized*/ fun values(): kotlin.Array<Target>
 }
 
-target(allowedTargets = {Target.CLASSIFIER}) annotation(retention = AnnotationRetention.SOURCE) public final annotation class annotation : kotlin.Annotation {
+target(allowedTargets = {Target.CLASSIFIER}) annotation(retention = AnnotationRetention.SOURCE) public final class annotation : kotlin.Annotation {
     public constructor annotation(/*0*/ retention: kotlin.annotation.AnnotationRetention = ..., /*1*/ repeatable: kotlin.Boolean = ...)
     internal final val repeatable: kotlin.Boolean
     internal final val retention: kotlin.annotation.AnnotationRetention
@@ -43,14 +43,14 @@ target(allowedTargets = {Target.CLASSIFIER}) annotation(retention = AnnotationRe
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-annotation() internal final annotation class some : kotlin.Annotation {
+annotation() internal final class some : kotlin.Annotation {
     public constructor some()
     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
 }
 
-target(allowedTargets = {Target.CLASSIFIER}) annotation() public final annotation class target : kotlin.Annotation {
+target(allowedTargets = {Target.CLASSIFIER}) annotation() public final class target : kotlin.Annotation {
     public constructor target(/*0*/ vararg allowedTargets: Target /*kotlin.Array<out Target>*/)
     internal final val allowedTargets: kotlin.Array<out Target>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/options/brackets.txt

@@ -7,7 +7,7 @@ emptyBrackets() internal final class base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class emptyBrackets : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class emptyBrackets : kotlin.Annotation {
     public constructor emptyBrackets()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/repeatable.txt

@@ -7,7 +7,7 @@ repann() repann() internal final class DoubleAnnotated {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation(repeatable = true) internal final annotation class repann : kotlin.Annotation {
+kotlin.annotation.annotation(repeatable = true) internal final class repann : kotlin.Annotation {
     public constructor repann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/retention.txt

@@ -7,7 +7,7 @@ sourceann() internal final class AnnotatedAtSource {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation(retention = AnnotationRetention.SOURCE) internal final annotation class sourceann : kotlin.Annotation {
+kotlin.annotation.annotation(retention = AnnotationRetention.SOURCE) internal final class sourceann : kotlin.Annotation {
     public constructor sourceann()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/target.txt

@@ -8,7 +8,7 @@ base() kotlin.data() internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt

@@ -9,21 +9,21 @@ internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final annotation class smartget : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final class smartget : kotlin.Annotation {
     public constructor smartget()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final annotation class smartset : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final class smartset : kotlin.Annotation {
     public constructor smartset()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt

@@ -46,14 +46,14 @@ empty() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-empty() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+empty() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final annotation class empty : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation {
     public constructor empty()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt

@@ -3,14 +3,14 @@ package
 base() special() internal fun foo(/*0*/ i: kotlin.Int): kotlin.Int
 internal fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final annotation class special : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation {
     public constructor special()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/file.txt

@@ -16,14 +16,14 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class common : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class common : kotlin.Annotation {
         public constructor common()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.target(allowedTargets = {AnnotationTarget.FILE}) kotlin.annotation.annotation() internal final annotation class special : kotlin.Annotation {
+    kotlin.annotation.target(allowedTargets = {AnnotationTarget.FILE}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation {
         public constructor special()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/function.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -54,7 +54,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt

@@ -3,14 +3,14 @@ package
 internal fun foo(/*0*/ i: kotlin.Int): kotlin.Int
 internal fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final annotation class special : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation {
     public constructor special()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt

@@ -46,14 +46,14 @@ incorrect() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-incorrect() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+incorrect() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final annotation class incorrect : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class incorrect : kotlin.Annotation {
     public constructor incorrect()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/init.txt

@@ -7,7 +7,7 @@ base() internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/local.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt

@@ -7,7 +7,7 @@ base() internal final class Outer {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    base() meta() kotlin.annotation.annotation() internal final annotation class Annotated : kotlin.Annotation {
+    base() meta() kotlin.annotation.annotation() internal final class Annotated : kotlin.Annotation {
         public constructor Annotated()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,14 +22,14 @@ base() internal final class Outer {
     }
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final annotation class meta : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation {
     public constructor meta()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/property.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt

@@ -10,14 +10,14 @@ base() internal final class My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class typed : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class typed : kotlin.Annotation {
     public constructor typed()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/type.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt

@@ -2,7 +2,7 @@ package
 
 internal val x: kotlin.List<kotlin.String>? = null
 
-kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt

@@ -37,7 +37,7 @@ base() internal final enum class My : kotlin.Enum<My> {
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final annotation class base : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation {
     public constructor base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,7 +53,7 @@ base() internal final class correct {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-base() kotlin.annotation.annotation() internal final annotation class derived : kotlin.Annotation {
+base() kotlin.annotation.annotation() internal final class derived : kotlin.Annotation {
     public constructor derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int