From 37b2e97e565d7054a860e1970b4b6795e931dfe2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 9 Jul 2015 15:02:41 +0300
Subject: [PATCH] Rendering changed: "annotation class" is now just "class"
 (with kotlin.annotation.annotation if it's kotlin annotation).

A swarm of tests fixed accordingly.
---
 .../staticFields/AnnotationClass.txt          | 14 ++++----
 .../staticFields/AnnotationTrait.txt          | 14 ++++----
 .../staticFields/kt3698.txt                   |  2 +-
 ...singEnumReferencedInAnnotationArgument.txt |  2 +-
 .../annotations/AnnotatedConstructor.txt      |  2 +-
 .../annotations/AnnotatedLocalObjectFun.txt   |  2 +-
 .../AnnotatedLocalObjectProperty.txt          |  2 +-
 .../tests/annotations/AnnotatedLoop.txt       |  2 +-
 .../tests/annotations/AnnotatedResultType.txt |  2 +-
 .../tests/annotations/AnnotatedTryCatch.txt   |  2 +-
 .../AnnotationAsDefaultParameter.txt          |  4 +--
 .../AnnotationForClassTypeParameter.txt       |  4 +--
 .../AnnotationForFunctionTypeParameter.txt    |  4 +--
 .../tests/annotations/AnnotationOnObject.txt  |  2 +-
 .../annotations/AnnotationsForClasses.txt     |  4 +--
 .../AnnotationsForPropertyTypeParameter.txt   |  4 +--
 .../tests/annotations/BasicAnnotations.txt    |  6 ++--
 .../tests/annotations/ConstructorCall.txt     | 10 +++---
 .../tests/annotations/DanglingMixed.txt       |  4 +--
 .../tests/annotations/DanglingNoBrackets.txt  |  2 +-
 .../annotations/DanglingWithBrackets.txt      |  2 +-
 .../JavaAnnotationConstructors.txt            |  4 +--
 ...allyRecursivelyAnnotatedGlobalFunction.txt |  2 +-
 .../annotations/RecursivelyAnnotated.txt      |  2 +-
 .../RecursivelyAnnotatedFunctionParameter.txt |  2 +-
 .../RecursivelyAnnotatedGlobalFunction.txt    |  2 +-
 .../RecursivelyAnnotatedGlobalProperty.txt    |  2 +-
 .../RecursivelyAnnotatedParameter.txt         |  2 +-
 .../RecursivelyAnnotatedParameterType.txt     |  2 +-
 .../RecursivelyAnnotatedParameterWithAt.txt   |  2 +-
 .../RecursivelyAnnotatedProperty.txt          |  2 +-
 .../WrongAnnotationArgsOnObject.txt           |  2 +-
 .../annotations/annotationInheritance.txt     |  8 ++---
 .../tests/annotations/annotationModifier.txt  |  2 +-
 .../booleanLocalVal.txt                       |  2 +-
 .../compareAndEquals.txt                      |  2 +-
 .../enumConst.txt                             |  2 +-
 .../javaProperties.txt                        |  2 +-
 .../kotlinProperties.txt                      |  2 +-
 .../strings.txt                               |  2 +-
 .../annotationsOnLambdaAsCallArgument.txt     |  2 +-
 .../tests/annotations/atAnnotationResolve.txt |  2 +-
 .../annotations/extensionFunctionType.txt     |  2 +-
 .../forParameterAnnotationResolve.txt         |  2 +-
 .../invalidTypesInAnnotationConstructor.txt   | 36 +++++++++----------
 .../tests/annotations/kt1860-positive.txt     |  2 +-
 .../annotations/kt1886annotationBody.txt      | 20 +++++------
 .../annotations/missingValOnParameter.txt     |  2 +-
 .../tests/annotations/noNameProperty.txt      |  2 +-
 .../tests/annotations/onExpression.txt        |  2 +-
 .../tests/annotations/onFunctionParameter.txt |  2 +-
 .../tests/annotations/onInitializer.txt       |  2 +-
 .../diagnostics/tests/annotations/onLoops.txt |  2 +-
 .../tests/annotations/onLoopsUnreachable.txt  |  2 +-
 .../tests/annotations/onMultiDeclaration.txt  |  2 +-
 .../tests/annotations/options/annotation.txt  |  6 ++--
 .../tests/annotations/options/brackets.txt    |  2 +-
 .../tests/annotations/options/repeatable.txt  |  2 +-
 .../tests/annotations/options/retention.txt   |  2 +-
 .../tests/annotations/options/target.txt      |  2 +-
 .../annotations/options/targets/accessors.txt |  6 ++--
 .../options/targets/annotation.txt            |  4 +--
 .../options/targets/classifier.txt            |  4 +--
 .../options/targets/constructor.txt           |  4 +--
 .../annotations/options/targets/empty.txt     |  4 +--
 .../annotations/options/targets/expr.txt      |  4 +--
 .../annotations/options/targets/file.txt      |  4 +--
 .../annotations/options/targets/function.txt  |  4 +--
 .../options/targets/funtypeargs.txt           |  4 +--
 .../annotations/options/targets/incorrect.txt |  4 +--
 .../annotations/options/targets/init.txt      |  2 +-
 .../annotations/options/targets/local.txt     |  4 +--
 .../annotations/options/targets/nested.txt    |  6 ++--
 .../annotations/options/targets/property.txt  |  4 +--
 .../options/targets/returntype.txt            |  4 +--
 .../annotations/options/targets/type.txt      |  4 +--
 .../annotations/options/targets/typeargs.txt  |  2 +-
 .../options/targets/valueparam.txt            |  4 +--
 .../function/abstractClassConstructors.txt    |  2 +-
 .../FunctionWithMissingNames.txt              |  2 +-
 .../illegalModifiersOnClass.txt               |  2 +-
 .../deparenthesize/annotatedSafeCall.txt      |  2 +-
 .../tests/deprecated/annotationUsage.txt      |  4 +--
 .../duplicateJvmSignature/missingNames.txt    |  4 +--
 .../tests/evaluate/divisionByZero.txt         |  2 +-
 .../tests/functionAsExpression/Common.txt     |  2 +-
 .../functionAsExpression/WithoutBody.txt      |  2 +-
 .../inner/classesInClassObjectHeader.txt      |  2 +-
 .../tests/inner/illegalModifier.txt           |  2 +-
 .../inner/selfAnnotationForClassObject.txt    |  4 +--
 .../tests/modifiers/IllegalModifiers.txt      |  2 +-
 .../primaryConstructorMissingKeyword.txt      |  2 +-
 .../namedArguments/allowForJavaAnnotation.txt |  2 +-
 .../recovery/namelessToplevelDeclarations.txt |  2 +-
 .../resolveAnnotatedLambdaArgument.txt        |  2 +-
 .../ctrsAnnotationResolve.txt                 |  4 +--
 .../tests/when/AnnotatedWhenStatement.txt     |  2 +-
 .../ClassObjectAnnotatedWithItsKClass.txt     |  2 +-
 .../annotations/annotationClassMethodCall.txt |  2 +-
 .../array.txt                                 |  4 +--
 .../simple.txt                                |  8 ++---
 .../vararg.txt                                |  4 +--
 .../annotationParameters/orderWithValue.txt   |  2 +-
 .../orderWithoutValue.txt                     |  2 +-
 .../annotationParameters/valueArray.txt       |  2 +-
 .../valueArrayAndOtherDefault.txt             |  2 +-
 .../annotationParameters/valueArrayOnly.txt   |  2 +-
 .../valueArrayWithDefault.txt                 |  2 +-
 .../javaAnnotationWithVarargArgument.txt      |  2 +-
 .../kotlinAnnotationWithVarargArgument.txt    |  2 +-
 .../defaultValueMustBeConstant.txt            |  4 +--
 .../annotationAsArgument.txt                  |  4 +--
 .../arg.txt                                   |  2 +-
 .../argAndOtherDefault.txt                    |  2 +-
 .../argArray.txt                              |  2 +-
 .../argWithDefault.txt                        |  2 +-
 .../argWithDefaultAndOther.txt                |  2 +-
 .../twoArgs.txt                               |  2 +-
 .../value.txt                                 |  2 +-
 .../valueAndOtherDefault.txt                  |  2 +-
 .../valueArray.txt                            |  2 +-
 .../valueWithDefault.txt                      |  2 +-
 .../valueWithDefaultAndOther.txt              |  2 +-
 .../kClassArrayInAnnotationsInVariance.txt    |  4 +--
 .../kClassArrayInAnnotationsOutVariance.txt   |  4 +--
 .../annotations/kClass/kClassInAnnotation.txt |  6 ++--
 .../kClass/kClassInAnnotationsInVariance.txt  |  4 +--
 .../kClass/kClassInAnnotationsOutVariance.txt |  4 +--
 .../annotations/kClass/kClassInvariantTP.txt  |  4 +--
 ...kClassOutArrayInAnnotationsOutVariance.txt |  2 +-
 .../kotlinAnnotation.txt                      |  2 +-
 .../tooManyArgs.txt                           |  2 +-
 .../typeMismatch.txt                          |  2 +-
 .../prohibitPositionedArgument/withValue.txt  |  2 +-
 .../withoutValue.txt                          |  2 +-
 .../annotations/qualifiedCallValue.txt        | 10 +++---
 .../annotations/AnnotatedAnnotation.txt       |  2 +-
 .../annotations/AnnotatedConstructor.txt      |  2 +-
 .../annotations/AnnotatedField.txt            |  2 +-
 .../annotations/AnnotatedMethod.txt           |  2 +-
 .../annotations/AnnotatedValueParameter.txt   |  2 +-
 .../annotations/AnnotationInParam.txt         | 12 +++----
 .../ArithmeticExpressionInParam.txt           |  2 +-
 .../annotations/ArrayOfEnumInParam.txt        |  2 +-
 .../annotations/ArrayOfStringInParam.txt      |  2 +-
 .../annotations/ClassObjectArrayInParam.txt   |  2 +-
 .../annotations/ClassObjectInParam.txt        |  2 +-
 .../annotations/ClassObjectInParamRaw.txt     |  2 +-
 .../ClassObjectInParamVariance.txt            |  2 +-
 .../annotations/CustomAnnotation.txt          |  2 +-
 .../CustomAnnotationWithDefaultParameter.txt  |  2 +-
 .../annotations/EmptyArrayInParam.txt         |  2 +-
 .../EnumArgumentWithCustomToString.txt        |  4 +--
 .../annotations/EnumConstructorParameter.txt  |  2 +-
 .../compiledJava/annotations/EnumInParam.txt  |  4 +--
 .../annotations/NestedEnumArgument.txt        |  2 +-
 .../annotations/PrimitiveValueInParam.txt     |  2 +-
 .../annotations/RecursiveAnnotation.txt       |  4 +--
 .../annotations/RecursiveAnnotation2.txt      |  4 +--
 .../annotations/SimpleAnnotation.txt          |  2 +-
 .../StringConcatenationInParam.txt            |  2 +-
 .../annotations/StringConstantInParam.txt     |  2 +-
 .../annotations/StringInParam.txt             |  2 +-
 .../annotations/AnnotatedAnnotation.txt       |  2 +-
 .../AnnotationInAnnotationArguments.txt       |  6 ++--
 .../EnumArgumentWithCustomToString.txt        |  4 +--
 .../MultiDimensionalArrayMethod.txt           |  2 +-
 .../annotations/SimpleAnnotation.txt          |  2 +-
 .../annotations/TargetedAnnotation.txt        |  2 +-
 .../classMembers/ClassObjectPropertyField.txt |  2 +-
 .../annotations/classMembers/Constructor.txt  |  2 +-
 .../classMembers/DelegatedProperty.txt        |  2 +-
 .../annotations/classMembers/EnumArgument.txt |  2 +-
 .../annotations/classMembers/Function.txt     |  2 +-
 .../annotations/classMembers/Getter.txt       |  2 +-
 .../classMembers/PropertyField.txt            |  2 +-
 .../annotations/classMembers/Setter.txt       |  2 +-
 .../classes/AnnotationInClassObject.txt       |  4 +--
 .../classes/ClassInClassObject.txt            |  2 +-
 .../annotations/classes/ClassObject.txt       |  2 +-
 .../classes/DollarsInAnnotationName.txt       |  4 +--
 .../annotations/classes/EnumArgument.txt      |  2 +-
 .../classes/MultipleAnnotations.txt           |  6 ++--
 .../annotations/classes/NestedAnnotation.txt  |  2 +-
 .../annotations/classes/NestedClass.txt       |  2 +-
 .../annotations/classes/Retention.txt         |  2 +-
 .../annotations/classes/Simple.txt            |  2 +-
 .../annotations/classes/WithArgument.txt      | 16 ++++-----
 .../classes/WithMultipleArguments.txt         |  2 +-
 .../packageMembers/DelegatedProperty.txt      |  2 +-
 .../packageMembers/EnumArgument.txt           |  2 +-
 .../packageMembers/EnumArrayArgument.txt      |  2 +-
 .../annotations/packageMembers/Function.txt   |  2 +-
 .../annotations/packageMembers/Getter.txt     |  2 +-
 .../packageMembers/PropertyField.txt          |  2 +-
 .../annotations/packageMembers/Setter.txt     |  2 +-
 .../packageMembers/StringArrayArgument.txt    |  2 +-
 .../annotations/parameters/Constructor.txt    |  4 +--
 .../parameters/EnumConstructor.txt            |  4 +--
 .../parameters/ExtensionFunction.txt          |  2 +-
 .../parameters/ExtensionFunctionInClass.txt   |  2 +-
 .../parameters/ExtensionPropertySetter.txt    |  2 +-
 .../parameters/FunctionInClass.txt            |  2 +-
 .../parameters/FunctionInTrait.txt            |  2 +-
 .../parameters/InnerClassConstructor.txt      |  2 +-
 .../parameters/ManyAnnotations.txt            |  8 ++---
 .../parameters/PropertySetterInClass.txt      |  2 +-
 .../parameters/TopLevelFunction.txt           |  2 +-
 .../parameters/TopLevelPropertySetter.txt     |  4 +--
 .../propertiesWithoutBackingFields/Class.txt  |  2 +-
 .../ClassObject.txt                           |  2 +-
 .../ExtensionsWithSameNameClass.txt           |  6 ++--
 .../ExtensionsWithSameNamePackage.txt         |  6 ++--
 .../NestedTrait.txt                           |  2 +-
 .../TopLevel.txt                              |  2 +-
 .../propertiesWithoutBackingFields/Trait.txt  |  2 +-
 .../TraitClassObject.txt                      |  2 +-
 .../annotations/types/ReceiverParameter.txt   |  2 +-
 .../types/SimpleTypeAnnotation.txt            |  2 +-
 .../annotations/types/SupertypesAndBounds.txt |  2 +-
 .../types/TypeAnnotationWithArguments.txt     |  2 +-
 .../fromLoadJava/classObjectAnnotation.txt    |  2 +-
 .../platformNames/functionName.txt            |  2 +-
 .../loadJava/sourceJava/NullInAnnotation.txt  |  2 +-
 compiler/testData/renderer/Classes.kt         |  4 +--
 compiler/testData/renderer/KeywordsInNames.kt |  2 +-
 .../annotationArguments/annotation.txt        |  6 ++--
 .../annotationArguments/enum.txt              |  4 +--
 .../annotationArguments/primitiveArrays.txt   |  2 +-
 .../annotationArguments/primitives.txt        |  2 +-
 .../annotationArguments/string.txt            |  4 +--
 .../annotationArguments/varargs.txt           |  4 +--
 .../builtinsSerializer/annotationTargets.txt  |  2 +-
 .../kotlin/renderer/DescriptorRenderer.kt     |  2 +-
 .../AnnotationClass/AnnotationClass.txt       | 22 +++++++++++-
 .../stubBuilder/ClassObject/ClassObject.txt   | 22 +++++++++++-
 236 files changed, 411 insertions(+), 371 deletions(-)

diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt
index 72aa9140eaf..c1267305f6b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt
@@ -1,36 +1,36 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class AByte : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AByte : kotlin.Annotation {
     public constructor AByte(/*0*/ kotlin.Byte)
     internal final val value: kotlin.Byte
 }
 
-kotlin.annotation.annotation() internal final annotation class AChar : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AChar : kotlin.Annotation {
     public constructor AChar(/*0*/ kotlin.Char)
     internal final val value: kotlin.Char
 }
 
-kotlin.annotation.annotation() internal final annotation class ADouble : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ADouble : kotlin.Annotation {
     public constructor ADouble(/*0*/ kotlin.Double)
     internal final val value: kotlin.Double
 }
 
-kotlin.annotation.annotation() internal final annotation class AFloat : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AFloat : kotlin.Annotation {
     public constructor AFloat(/*0*/ kotlin.Float)
     internal final val value: kotlin.Float
 }
 
-kotlin.annotation.annotation() internal final annotation class AInt : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AInt : kotlin.Annotation {
     public constructor AInt(/*0*/ kotlin.Int)
     internal final val value: kotlin.Int
 }
 
-kotlin.annotation.annotation() internal final annotation class ALong : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ALong : kotlin.Annotation {
     public constructor ALong(/*0*/ kotlin.Long)
     internal final val value: kotlin.Long
 }
 
-kotlin.annotation.annotation() internal final annotation class AString : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AString : kotlin.Annotation {
     public constructor AString(/*0*/ kotlin.String)
     internal final val value: kotlin.String
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt
index d9be3db2f41..4f0b36ea32f 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt
@@ -1,36 +1,36 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class AByte : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AByte : kotlin.Annotation {
     public constructor AByte(/*0*/ kotlin.Byte)
     internal final val value: kotlin.Byte
 }
 
-kotlin.annotation.annotation() internal final annotation class AChar : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AChar : kotlin.Annotation {
     public constructor AChar(/*0*/ kotlin.Char)
     internal final val value: kotlin.Char
 }
 
-kotlin.annotation.annotation() internal final annotation class ADouble : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ADouble : kotlin.Annotation {
     public constructor ADouble(/*0*/ kotlin.Double)
     internal final val value: kotlin.Double
 }
 
-kotlin.annotation.annotation() internal final annotation class AFloat : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AFloat : kotlin.Annotation {
     public constructor AFloat(/*0*/ kotlin.Float)
     internal final val value: kotlin.Float
 }
 
-kotlin.annotation.annotation() internal final annotation class AInt : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AInt : kotlin.Annotation {
     public constructor AInt(/*0*/ kotlin.Int)
     internal final val value: kotlin.Int
 }
 
-kotlin.annotation.annotation() internal final annotation class ALong : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ALong : kotlin.Annotation {
     public constructor ALong(/*0*/ kotlin.Long)
     internal final val value: kotlin.Long
 }
 
-kotlin.annotation.annotation() internal final annotation class AString : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AString : kotlin.Annotation {
     public constructor AString(/*0*/ kotlin.String)
     internal final val value: kotlin.String
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt
index fe3d067c610..16f4f02d951 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt
@@ -12,7 +12,7 @@ internal final class KotlinClass {
 public open class kt3698 {
     public constructor kt3698()
 
-    public/*package*/ final annotation class Foo : kotlin.Annotation {
+    public/*package*/ final class Foo : kotlin.Annotation {
         public/*package*/ constructor Foo(/*0*/ kotlin.Int)
         public final val value: kotlin.Int
         public abstract fun value(): kotlin.Int
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt
index cb2b210d1d8..324116aa37a 100644
--- a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     public constructor Anno(/*0*/ e: [ERROR : test.E])
     internal final val e: [ERROR : test.E]
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt
index be859092854..496574921bd 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt
index a8cb2ef610e..fcce010b9b2 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt
index b1d5e2f3548..260fc95945a 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt
index a8cb2ef610e..fcce010b9b2 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt
index 9a014ebe437..aa0615c7e0b 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt
index ed5812bd39b..6d159c39fe1 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt
index 8da2e8abffe..0231895ca4b 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt
index 63336f0c387..060db6d4c60 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt
index a8f7f0581dc..7ca10075d05 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt
index ac01753b989..3ffe8307356 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt
index db0de398de3..cd4d9230b13 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
index 2cd7c1a72e4..7606613f710 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt
index c7a9a1acc1e..a1080dfccfa 100644
--- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt
index fe2358c16c2..6762022a638 100644
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt
index 7d717629e2a..21d8689635a 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt b/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt
index 73272a69e57..07b847fab59 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt b/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt
index 49b1179cd42..0bb690e6be8 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt
index 397822550f8..bb382d11bd2 100644
--- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt
index a93c3ee35e0..27dc28b3fa2 100644
--- a/compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt
index cd8b8330b27..3ce20f4bfb6 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt
index 7e02bec3b7f..3e581906594 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt
index 2a8ee5a14b7..02471ce11b6 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt
index e876d7bfe73..b1510e02906 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt
index 63856371b5a..aa410c44299 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt
index c5994b1e87d..111ffbf2d28 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt
index 63856371b5a..aa410c44299 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt
index 2083a6eef89..f8e48441007 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt
index 44f8f2ffc6c..4593d4f7324 100644
--- a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt
index 4bcbbaf7487..964e089f8ed 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt
index 89ed33fb51f..07873eeeea1 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt
index 0cebb69f97e..c4dcedead55 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt
index 0cebb69f97e..c4dcedead55 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
index 374ce3a0743..6aff3a44df4 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt
index f668b06ebe5..6b3e2e6c5b8 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt
index 7ea52668e62..923186e5b28 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt
index 84691e400a0..643282d24c9 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt
index 0c44086913f..98a9c0f6da4 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt
index 21b5655e9f7..195d72eac5c 100644
--- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
index b23c290f7d9..d7f1091fb38 100644
--- a/compiler/testData/diagnostics/tests/annotations/extensionFunctionType.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt
index a83e76784e4..295d0ab72c5 100644
--- a/compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
index 68ca164db63..0c727b02bec 100644
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt
index 2335c66eb3f..bb12f4d9876 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt
index dc668dc34c9..8a04f9cd324 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt b/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt
index 2ad51fa26d7..d97e7526c9d 100644
--- a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt b/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt
index 34a8a5548bd..d21bd493602 100644
--- a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.txt b/compiler/testData/diagnostics/tests/annotations/onExpression.txt
index 6334c0133bc..483adc1101c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onExpression.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt
index a9365dcac93..275ad1ebb8c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onInitializer.txt b/compiler/testData/diagnostics/tests/annotations/onInitializer.txt
index b15a7444d68..f986750a6e9 100644
--- a/compiler/testData/diagnostics/tests/annotations/onInitializer.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoops.txt b/compiler/testData/diagnostics/tests/annotations/onLoops.txt
index fc0855189ee..9d3e9a20d6b 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoops.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt
index fc0855189ee..9d3e9a20d6b 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt
index cdc24442601..638c6f3ebde 100644
--- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/annotation.txt
index 198ad1c81c6..6e7bdae469f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/annotation.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/brackets.txt b/compiler/testData/diagnostics/tests/annotations/options/brackets.txt
index 1c973ff3e93..58f0f9f3087 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/brackets.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt
index cfb2fb1f2fe..a396fa6b17f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/retention.txt b/compiler/testData/diagnostics/tests/annotations/options/retention.txt
index 679d908bc7d..b96dea2f173 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/retention.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/target.txt b/compiler/testData/diagnostics/tests/annotations/options/target.txt
index c2ff25c4794..09152f6db0f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/target.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
index 7bd6d9c347e..641527b226c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index 8b552426e94..4a78537850d 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index 7aeb85464e7..b9bb02b00a6 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index b6349ff0521..1aecd91bde6 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index 1cda0cbb71b..20ef832c08c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt
index d1ccd693c0b..58e6479fa39 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt
index d9a0c13e9fb..084c6b9a796 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index b637c7e45a1..fd0f3cc25a5 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt
index b73fa4a2c92..f0528388ae0 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index 16fc5207109..7349f38fb4a 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt
index f982ecf3ed0..c6358f550ed 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/init.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index 09bab8ef41c..ef69abc5583 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt
index 527e9a08bc0..8387782eb3f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index 67c7280e71a..51a25e3e6e0 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt
index b598f3a1315..134aba571d9 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index 61f16ff5b15..cb2288581ff 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
index f6a16227230..df24e4d4b28 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 48bc7e297b2..2bf1f70df71 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/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
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
index af982686f82..74af0216149 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
@@ -15,7 +15,7 @@ internal abstract class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class C : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class C : kotlin.Annotation {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
index f71ecf397f6..bb83655f05b 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt
@@ -29,7 +29,7 @@ internal final class Outer {
     internal final fun B.<no name provided>(): kotlin.Unit
 }
 
-kotlin.annotation.annotation() internal final annotation class a : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class a : kotlin.Annotation {
     public constructor a()
     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/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
index 7ea444df8ee..afd5407a54f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
@@ -83,7 +83,7 @@ internal interface D {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal open annotation class E : kotlin.Annotation {
+kotlin.annotation.annotation() internal open class E : kotlin.Annotation {
     public constructor E()
     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/deparenthesize/annotatedSafeCall.txt b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt
index b259d40e6f1..0e1cfbb02fd 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt
@@ -2,7 +2,7 @@ package
 
 internal fun f(/*0*/ s: kotlin.String?): kotlin.Boolean
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final annotation class foo : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class foo : kotlin.Annotation {
     public constructor foo()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
index b6707e92e98..0df0472fb3e 100644
--- a/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/annotationUsage.txt
@@ -14,14 +14,14 @@ obsoleteWithParam(text = "text") internal final class Obsolete2 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.deprecated(value = "text") kotlin.annotation.annotation() internal final annotation class obsolete : kotlin.Annotation {
+kotlin.deprecated(value = "text") kotlin.annotation.annotation() internal final class obsolete : kotlin.Annotation {
     public constructor obsolete()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.deprecated(value = "text") kotlin.annotation.annotation() internal final annotation class obsoleteWithParam : kotlin.Annotation {
+kotlin.deprecated(value = "text") kotlin.annotation.annotation() internal final class obsoleteWithParam : kotlin.Annotation {
     public constructor obsoleteWithParam(/*0*/ text: kotlin.String)
     internal final val text: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
index b987a4e3d20..0ec587b3416 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
@@ -32,7 +32,7 @@ internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
 
-kotlin.annotation.annotation() internal final annotation class <no name provided> : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class <no name provided> : kotlin.Annotation {
     public constructor <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
@@ -81,7 +81,7 @@ internal final class Outer {
         public final /*synthesized*/ fun values(): kotlin.Array<Outer.<no name provided>>
     }
 
-    kotlin.annotation.annotation() internal final annotation class <no name provided> : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class <no name provided> : kotlin.Annotation {
         public constructor <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
diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
index 9f39b50c712..a59c065f023 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
@@ -12,7 +12,7 @@ internal val a9: kotlin.Int
 internal val b1: kotlin.Byte
 Ann() internal val b2: 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*/ i: kotlin.Int)
     internal final val i: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt b/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt
index 357ebb7e3e4..08042e068ce 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/Common.txt
@@ -18,7 +18,7 @@ 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*/ name: kotlin.String)
     internal final val name: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt b/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt
index 1c4568fe3c2..2dbb32eea0c 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.txt
@@ -4,7 +4,7 @@ internal val bas: () -> kotlin.Unit
 internal fun bar(/*0*/ a: kotlin.Any): () -> kotlin.Unit
 internal fun outer(): 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
diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
index b65c7f0e43c..9d1f545c42f 100644
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
+++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt
@@ -13,7 +13,7 @@ internal final class Test {
         public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class InnerAnnotation : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class InnerAnnotation : kotlin.Annotation {
         public constructor InnerAnnotation()
         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/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
index 86141ba352e..722225dc574 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
@@ -71,7 +71,7 @@ internal final class D {
         public final /*synthesized*/ fun values(): kotlin.Array<D.R>
     }
 
-    kotlin.annotation.annotation() internal final annotation class S : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class S : kotlin.Annotation {
         public constructor S()
         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/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
index bcefa1a0250..ecdb25a2d37 100644
--- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
+++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
@@ -12,7 +12,7 @@ internal final class Test {
         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 ClassObjectAnnotation : kotlin.Annotation {
+        kotlin.annotation.annotation() internal final class ClassObjectAnnotation : kotlin.Annotation {
             public constructor ClassObjectAnnotation()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -20,7 +20,7 @@ internal final class Test {
         }
     }
 
-    kotlin.annotation.annotation() internal final annotation class NestedAnnotation : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class NestedAnnotation : kotlin.Annotation {
         public constructor NestedAnnotation()
         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/modifiers/IllegalModifiers.txt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
index 621e0e99aba..c0302f33667 100644
--- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
@@ -138,7 +138,7 @@ package illegal_modifiers {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    kotlin.annotation.annotation() internal final annotation class annotated : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class annotated : kotlin.Annotation {
         public constructor annotated(/*0*/ text: kotlin.String = ...)
         internal final val text: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt b/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt
index 7a1433d4be0..b10e1ac4536 100644
--- a/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.txt
@@ -17,7 +17,7 @@ internal final class A {
     }
 }
 
-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
diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt
index a732ee60232..72c58383a23 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.txt
@@ -2,7 +2,7 @@ package
 
 A(x = IntegerValueType(1), y = "2") internal fun test(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     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/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
index 190218c136c..b36af47c889 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
@@ -30,7 +30,7 @@ internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
 
-kotlin.annotation.annotation() internal final annotation class <no name provided> : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class <no name provided> : kotlin.Annotation {
     public constructor <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
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
index ec267707044..ee455a37a64 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
+++ b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt
@@ -3,7 +3,7 @@ package
 internal fun </*0*/ T> bar(/*0*/ block: (T) -> kotlin.Int): kotlin.Unit
 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()
     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/secondaryConstructors/ctrsAnnotationResolve.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
index c6263fedc43..1a3899fe003 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.txt
@@ -9,14 +9,14 @@ internal final class A {
     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()
     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(/*0*/ x: kotlin.Int)
     internal final val x: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt
index 6cd40599d2a..996fffb1cc4 100644
--- a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt
+++ b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.txt
@@ -2,7 +2,7 @@ package
 
 internal fun foo(/*0*/ a: 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
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt
index e1031c8f225..06cd552887e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt
@@ -2,7 +2,7 @@ package
 
 package test {
 
-    kotlin.annotation.annotation() internal final annotation class AnnClass : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class AnnClass : kotlin.Annotation {
         public constructor AnnClass(/*0*/ a: kotlin.reflect.KClass<*>)
         internal final val a: kotlin.reflect.KClass<*>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.txt
index cb1cabf4374..5d763d51ae8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.txt
@@ -3,7 +3,7 @@ package
 internal fun foo(/*0*/ ann: A): kotlin.Unit
 internal fun A.bar(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.String, /*1*/ arg: kotlin.Int)
     public final val arg: kotlin.Int
     public final val value: kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
index daf42a4580c..bc95994fb3f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.txt
@@ -6,7 +6,7 @@ internal val i3: kotlin.Int
 internal val iAnn: 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*/ i: kotlin.IntArray)
     internal final val i: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,7 +14,7 @@ kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Anno
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class AnnAnn : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnAnn : kotlin.Annotation {
     public constructor AnnAnn(/*0*/ i: kotlin.Array<Ann>)
     internal final val i: kotlin.Array<Ann>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
index daf04ac3f9c..c97995c25ea 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.txt
@@ -6,7 +6,7 @@ internal val ia: kotlin.IntArray
 internal val sa: kotlin.Array<kotlin.String>
 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*/ i: kotlin.Int)
     internal final val i: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -14,14 +14,14 @@ kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Anno
     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
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class AnnIA : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnIA : kotlin.Annotation {
     public constructor AnnIA(/*0*/ ia: kotlin.IntArray)
     internal final val ia: kotlin.IntArray
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -29,7 +29,7 @@ kotlin.annotation.annotation() internal final annotation class AnnIA : kotlin.An
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class AnnSA : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnSA : kotlin.Annotation {
     public constructor AnnSA(/*0*/ sa: kotlin.Array<kotlin.String>)
     internal final val sa: kotlin.Array<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
index f56afafb342..f1a137aefb6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt
@@ -6,7 +6,7 @@ internal val i3: kotlin.Int
 internal val iAnn: 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*/ 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
@@ -14,7 +14,7 @@ kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Anno
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class AnnAnn : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnAnn : kotlin.Annotation {
     public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array<out Ann>*/)
     internal final val i: kotlin.Array<out Ann>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt
index 8eb4cc4a5cc..41bc6d8a4e3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.String, /*1*/ b: kotlin.Double, /*2*/ x1: kotlin.reflect.KClass<*>, /*3*/ a: kotlin.Int, /*4*/ x: kotlin.reflect.KClass<*>, /*5*/ x2: kotlin.reflect.KClass<*>)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt
index df8f9fb54aa..6a068e6b817 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ b: kotlin.Double, /*1*/ x1: kotlin.reflect.KClass<*>, /*2*/ a: kotlin.Int, /*3*/ x: kotlin.reflect.KClass<*>, /*4*/ x2: kotlin.reflect.KClass<*>)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt
index c5af1272f2e..032f49996fc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt
@@ -9,7 +9,7 @@ A(value = {{"5", "6"}, "7"}, x = kotlin.Any::class, y = IntegerValueType(6)) int
 A(value = {}, y = IntegerValueType(7)) internal fun test7(): kotlin.Unit
 A(value = {"8", "9", "10"}) internal fun test8(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ x: kotlin.reflect.KClass<*> = ..., /*2*/ y: kotlin.Int)
     public final val value: kotlin.Array<kotlin.String>
     public final val x: kotlin.reflect.KClass<*>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt
index 3a0f8acfd92..56f9dfb46d6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt
@@ -12,7 +12,7 @@ A(value = {}) internal fun test7(): kotlin.Unit
 A(value = {}) internal fun test8(): kotlin.Unit
 A(value = {}, x = kotlin.Any::class, y = IntegerValueType(3)) internal fun test9(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ x: kotlin.reflect.KClass<*> = ..., /*2*/ y: kotlin.Int = ...)
     public final val value: kotlin.Array<kotlin.String>
     public final val x: kotlin.reflect.KClass<*>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt
index bc2cf56de7a..c8b06abd6c4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt
@@ -6,7 +6,7 @@ A(value = {{"5", "6"}, "7"}) internal fun test3(): kotlin.Unit
 A(value = {}) internal fun test4(): kotlin.Unit
 A(value = {}) internal fun test5(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val value: kotlin.Array<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
index ffaeaa870ba..ab13f0ae3e1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
@@ -6,7 +6,7 @@ A(value = {{"5", "6"}, "7"}) internal fun test3(): kotlin.Unit
 A() internal fun test4(): kotlin.Unit
 A() internal fun test5(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/ = ...)
     public final val value: kotlin.Array<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt
index 8493cb21b51..fd257b84b8c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt
@@ -2,7 +2,7 @@ package
 
 A(value = {IntegerValueType(1), "b"}) internal fun test(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     public final val value: kotlin.Array<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt
index 3d6d1b39e0b..ac5ed31f939 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.txt
@@ -2,7 +2,7 @@ package
 
 B(args = {IntegerValueType(1), "b"}) internal fun test(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     public constructor B(/*0*/ vararg args: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     internal final val args: kotlin.Array<out kotlin.String>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt
index a12adfd65b1..bc66b807956 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.txt
@@ -5,7 +5,7 @@ internal val nonConst: kotlin.Int
 internal val nonConstKClass: kotlin.reflect.KClass<kotlin.String>
 internal fun foo(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class InvalidAnn : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class InvalidAnn : kotlin.Annotation {
     public constructor InvalidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.Int = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ...)
     internal final val p1: kotlin.Int
     internal final val p2: kotlin.Int
@@ -15,7 +15,7 @@ kotlin.annotation.annotation() internal final annotation class InvalidAnn : kotl
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class ValidAnn : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ValidAnn : kotlin.Annotation {
     public constructor ValidAnn(/*0*/ p1: kotlin.Int = ..., /*1*/ p2: kotlin.String = ..., /*2*/ p3: kotlin.reflect.KClass<*> = ..., /*3*/ p4: kotlin.IntArray = ..., /*4*/ p5: kotlin.Array<kotlin.String> = ..., /*5*/ p6: kotlin.Array<kotlin.reflect.KClass<*>> = ...)
     internal final val p1: kotlin.Int
     internal final val p2: kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt
index 12130f57a1f..a6254ef6253 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B)
     public final val arg: kotlin.reflect.KClass<*>
     public final val b: B
@@ -13,7 +13,7 @@ public final annotation class A : kotlin.Annotation {
     public abstract fun x(): kotlin.Int
 }
 
-public final annotation class B : kotlin.Annotation {
+public final class B : kotlin.Annotation {
     public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...)
     public final val arg: kotlin.reflect.KClass<*>
     public final val y: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt
index e4717d047f2..e6bc9ffc1e1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>)
     public final val arg: kotlin.reflect.KClass<*>
     public abstract fun arg(): kotlin.reflect.KClass<*>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt
index 4f2666750ec..c2c0e772a6d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
     public final val arg: kotlin.reflect.KClass<*>
     public final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt
index ad9fc65193e..29b347d1df1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
     public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
     public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
index dfe18e08c97..364ad61d6b7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...)
     public final val arg: kotlin.reflect.KClass<*>
     public abstract fun arg(): kotlin.reflect.KClass<*>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt
index 4585128b24c..0ad8f243afb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
     public final val arg: kotlin.reflect.KClass<*>
     public final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt
index cf23b3bef0b..ee6386f2a0b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>)
     public final val arg1: kotlin.reflect.KClass<*>
     public final val arg2: kotlin.reflect.KClass<*>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt
index ce33baa7cb8..75ad0c7ba9d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.reflect.KClass<*>)
     public final val value: kotlin.reflect.KClass<*>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt
index 8a7894a5aea..783990fc9f0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
     public final val value: kotlin.reflect.KClass<*>
     public final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt
index 404b8943c43..d3f68330c80 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
     public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
index b2d4e88c8c1..8f230970148 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ...)
     public final val value: kotlin.reflect.KClass<*>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt
index 72d973e8303..15eb1a6a038 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt
@@ -1,6 +1,6 @@
 package
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
     public final val value: kotlin.reflect.KClass<*>
     public final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt
index 4cd49a057d2..5c140838c73 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.Array<kotlin.reflect.KClass<in A>>)
     internal final val arg: kotlin.Array<kotlin.reflect.KClass<in A>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,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*/ arg: kotlin.Array<kotlin.reflect.KClass<in B1>>)
     internal final val arg: kotlin.Array<kotlin.reflect.KClass<in B1>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt
index f90ae74eaea..4d041ec83e7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.Array<kotlin.reflect.KClass<out A>>)
     internal final val arg: kotlin.Array<kotlin.reflect.KClass<out A>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,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*/ arg: kotlin.Array<kotlin.reflect.KClass<out B1>>)
     internal final val arg: kotlin.Array<kotlin.reflect.KClass<out B1>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
index 91c9611a4c5..c35e04678e9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.txt
@@ -16,7 +16,7 @@ internal final class A2 {
     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*/ arg: kotlin.reflect.KClass<*>)
     internal final val arg: kotlin.reflect.KClass<*>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -24,7 +24,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*/ vararg arg: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
     internal final val arg: kotlin.Array<out kotlin.reflect.KClass<*>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -32,7 +32,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*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
     internal final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt
index fb014b3e4a1..0a89c9c7ba1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.reflect.KClass<in A>)
     internal final val arg: kotlin.reflect.KClass<in A>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,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*/ arg: kotlin.reflect.KClass<in B1>)
     internal final val arg: kotlin.reflect.KClass<in B1>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt
index e3f12e9d99a..6aed0440f52 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.reflect.KClass<out A>)
     internal final val arg: kotlin.reflect.KClass<out A>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,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*/ arg: kotlin.reflect.KClass<out B1>)
     internal final val arg: kotlin.reflect.KClass<out B1>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt
index 7b2fb1b0873..9e160a446e1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.reflect.KClass<A>)
     internal final val arg: kotlin.reflect.KClass<A>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,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*/ arg: kotlin.reflect.KClass<B>)
     internal final val arg: kotlin.reflect.KClass<B>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt
index 4641ce46200..a070f6c89aa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.txt
@@ -7,7 +7,7 @@ internal open class A {
     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*/ arg: kotlin.Array<out kotlin.reflect.KClass<out A>>)
     internal final val arg: kotlin.Array<out kotlin.reflect.KClass<out A>>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt
index f1a842cbadf..2ad42368826 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.txt
@@ -4,7 +4,7 @@ Ann(value = "a", x = IntegerValueType(1), y = 1.0.toDouble()) internal fun foo1(
 Ann(value = "b", x = IntegerValueType(2), y = 2.0.toDouble()) internal fun foo2(): kotlin.Unit
 Ann(value = "c", x = IntegerValueType(3), y = 2.0.toDouble()) internal fun foo3(): 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*/ x: kotlin.Int, /*1*/ value: kotlin.String, /*2*/ y: kotlin.Double)
     internal final val value: kotlin.String
     internal final val x: kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt
index 699fa97cffe..208bbf61e93 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt
@@ -2,7 +2,7 @@ package
 
 A(a = false, b = 1.0.toDouble(), x = false) internal fun foo1(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt
index a64bbd54aa0..5822e0e3670 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt
@@ -3,7 +3,7 @@ package
 A(a = false, b = 1.0.toDouble(), x = false) internal fun foo1(): kotlin.Unit
 A(a = 2.0.toDouble(), b = 2.0.toDouble(), x = true) internal fun foo2(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt
index f4fbbf7c874..964ccf60e5e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt
@@ -5,7 +5,7 @@ A(a = IntegerValueType(2), b = 2.0.toDouble(), value = "v2", x = true) internal
 A(a = IntegerValueType(4), b = 3.0.toDouble(), value = "v2", x = true) internal fun foo3(): kotlin.Unit
 A(a = IntegerValueType(4), b = 3.0.toDouble(), value = "v2", x = true) internal fun foo4(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ value: kotlin.String, /*1*/ a: kotlin.Int, /*2*/ b: kotlin.Double, /*3*/ x: kotlin.Boolean)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt
index 6c282e4da72..af89ce48848 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt
@@ -4,7 +4,7 @@ A(a = IntegerValueType(1), b = 1.0.toDouble(), x = false) internal fun foo1(): k
 A(a = IntegerValueType(2), b = 2.0.toDouble(), x = true) internal fun foo2(): kotlin.Unit
 A(a = IntegerValueType(4), b = 3.0.toDouble(), x = true) internal fun foo3(): kotlin.Unit
 
-public final annotation class A : kotlin.Annotation {
+public final class A : kotlin.Annotation {
     public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Double, /*2*/ x: kotlin.Boolean)
     public final val a: kotlin.Int
     public final val b: kotlin.Double
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
index a29557f9f7c..dc2e947c62e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.txt
@@ -13,7 +13,7 @@ package a {
                 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 IAnn : kotlin.Annotation {
+                kotlin.annotation.annotation() internal final class IAnn : kotlin.Annotation {
                     public constructor IAnn()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,7 +21,7 @@ package a {
                 }
             }
 
-            kotlin.annotation.annotation() internal final annotation class ann1 : kotlin.Annotation {
+            kotlin.annotation.annotation() internal final class ann1 : kotlin.Annotation {
                 public constructor ann1(/*0*/ p: kotlin.deprecated = ...)
                 internal final val p: kotlin.deprecated
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -29,7 +29,7 @@ package a {
                 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*/ p: a.b.c.ann1 = ...)
                 internal final val p: a.b.c.ann1
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,7 +37,7 @@ package a {
                 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*/ p: a.b.c.A.IAnn = ..., /*1*/ p2: a.b.c.A.IAnn = ...)
                 internal final val p: a.b.c.A.IAnn
                 internal final val p2: a.b.c.A.IAnn
@@ -46,7 +46,7 @@ package a {
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
             }
 
-            kotlin.annotation.annotation() internal final annotation class annArray : kotlin.Annotation {
+            kotlin.annotation.annotation() internal final class annArray : kotlin.Annotation {
                 public constructor annArray(/*0*/ p: kotlin.Array<kotlin.String> = ...)
                 internal final val p: kotlin.Array<kotlin.String>
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
index f96ba4792ab..493171abcab 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
+test.AnnotatedAnnotation() public final class AnnotatedAnnotation : kotlin.Annotation {
     public constructor AnnotatedAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt
index 95dca11e461..09d42cde161 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.txt
@@ -3,7 +3,7 @@ package test
 public open class AnnotatedConstructor {
     test.AnnotatedConstructor.Anno(value = "constructor") public constructor AnnotatedConstructor()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt
index 10e51ea5c51..701973217fb 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.txt
@@ -4,7 +4,7 @@ public open class AnnotatedField {
     public constructor AnnotatedField()
     test.AnnotatedField.Anno(value = "member") public final val y: kotlin.Int = 0
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
index 3289d27d40d..468eab0dfb9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
@@ -4,7 +4,7 @@ public open class AnnotatedMethod {
     public constructor AnnotatedMethod()
     test.AnnotatedMethod.Anno(value = 42) public open fun f(): kotlin.Unit
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.Int)
         public final val value: kotlin.Int
         public abstract fun value(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
index 16ceafcc8b5..f8253f22a54 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
@@ -4,7 +4,7 @@ public open class AnnotatedValueParameter {
     public constructor AnnotatedValueParameter()
     public open fun f(/*0*/ test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
index 6a571b0e9d0..04376a23376 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
@@ -14,19 +14,19 @@ public interface AnnotationInParam {
         public constructor C()
     }
 
-    public final annotation class MyAnnotation : kotlin.Annotation {
+    public final class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
     }
 
-    public final annotation class MyAnnotation2 : kotlin.Annotation {
+    public final class MyAnnotation2 : kotlin.Annotation {
         public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
         public abstract fun value(): kotlin.Array<kotlin.String>
     }
 
-    public final annotation class MyAnnotation3 : kotlin.Annotation {
+    public final class MyAnnotation3 : kotlin.Annotation {
         public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
         public final val first: kotlin.String
         public final val second: kotlin.String
@@ -34,19 +34,19 @@ public interface AnnotationInParam {
         public abstract fun second(): kotlin.String
     }
 
-    public final annotation class MyAnnotationWithParam : kotlin.Annotation {
+    public final class MyAnnotationWithParam : kotlin.Annotation {
         public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation)
         public final val value: test.AnnotationInParam.MyAnnotation
         public abstract fun value(): test.AnnotationInParam.MyAnnotation
     }
 
-    public final annotation class MyAnnotationWithParam2 : kotlin.Annotation {
+    public final class MyAnnotationWithParam2 : kotlin.Annotation {
         public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2)
         public final val value: test.AnnotationInParam.MyAnnotation2
         public abstract fun value(): test.AnnotationInParam.MyAnnotation2
     }
 
-    public final annotation class MyAnnotationWithParam3 : kotlin.Annotation {
+    public final class MyAnnotationWithParam3 : kotlin.Annotation {
         public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3)
         public final val value: test.AnnotationInParam.MyAnnotation3
         public abstract fun value(): test.AnnotationInParam.MyAnnotation3
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
index 2018810e8e4..70f2c1f562a 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
@@ -3,7 +3,7 @@ package test
 public open class ArithmeticExpressionInParam {
     public constructor ArithmeticExpressionInParam()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.Int)
         public final val value: kotlin.Int
         public abstract fun value(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
index e8f1e248e0a..b1052c7af49 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
@@ -2,7 +2,7 @@ package test
 
 public interface ArrayOfEnumInParam {
 
-    java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}) public final annotation class targetAnnotation : kotlin.Annotation {
+    java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}) public final class targetAnnotation : kotlin.Annotation {
         public constructor targetAnnotation(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
index 6ea8dbd0b25..dc32eb3b47b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
@@ -6,7 +6,7 @@ public interface ArrayOfStringInParam {
         public constructor A()
     }
 
-    public final annotation class MyAnnotation : kotlin.Annotation {
+    public final class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
         public abstract fun value(): kotlin.Array<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
index 9ab3346d4b5..2f37306b809 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
@@ -3,7 +3,7 @@ package test
 public open class ClassObjectArrayInParam {
     public constructor ClassObjectArrayInParam()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
         public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
         public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
index 30b7148f686..c27804ebb3c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
@@ -3,7 +3,7 @@ package test
 public open class ClassObjectInParam {
     public constructor ClassObjectInParam()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>)
         public final val value: kotlin.reflect.KClass<*>
         public abstract fun value(): kotlin.reflect.KClass<*>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt
index 884d7d88a9e..52ef7432620 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt
@@ -3,7 +3,7 @@ package test
 public open class ClassObjectInParamRaw {
     public constructor ClassObjectInParamRaw()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
         public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
         public final val value: kotlin.reflect.KClass<*>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt
index da7962c1fcc..0c8555932d6 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt
@@ -3,7 +3,7 @@ package test
 public open class ClassObjectInParamVariance {
     public constructor ClassObjectInParamVariance()
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ arg1: kotlin.reflect.KClass<out kotlin.Int!>, /*1*/ arg2: kotlin.reflect.KClass<in kotlin.Int!>, /*2*/ arg3: kotlin.Array<kotlin.reflect.KClass<out kotlin.Int!>>, /*3*/ arg4: kotlin.Array<kotlin.reflect.KClass<in kotlin.Int!>>, /*4*/ arg5: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<*>!>>, /*5*/ arg6: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<*>!>>, /*6*/ arg7: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<kotlin.Int!>!>>, /*7*/ arg8: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<kotlin.Int!>!>>)
         public final val arg1: kotlin.reflect.KClass<out kotlin.Int!>
         public final val arg2: kotlin.reflect.KClass<in kotlin.Int!>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index ad2240254a2..3c4e239984b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -2,7 +2,7 @@ package test
 
 public interface CustomAnnotation {
 
-    public final annotation class MyAnnotation : kotlin.Annotation {
+    public final class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
         public final val value: test.CustomAnnotation.MyEnum
         public abstract fun value(): test.CustomAnnotation.MyEnum
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
index 0aeb32d87e9..c1868ddb32e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
@@ -2,7 +2,7 @@ package test
 
 public interface CustomAnnotationWithDefaultParameter {
 
-    public final annotation class MyAnnotation : kotlin.Annotation {
+    public final class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*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/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
index 67585145f3f..9b035d95478 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
@@ -6,7 +6,7 @@ public interface EmptyArrayInParam {
         public constructor A()
     }
 
-    public final annotation class MyAnnotation : kotlin.Annotation {
+    public final class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/)
         public final val value: kotlin.Array<kotlin.String>
         public abstract fun value(): kotlin.Array<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
index dc660338c96..c9aa39761ce 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
@@ -22,13 +22,13 @@ public open class EnumArgumentWithCustomToString {
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
     }
 
-    public final annotation class EnumAnno : kotlin.Annotation {
+    public final class EnumAnno : kotlin.Annotation {
         public constructor EnumAnno(/*0*/ value: test.EnumArgumentWithCustomToString.E)
         public final val value: test.EnumArgumentWithCustomToString.E
         public abstract fun value(): test.EnumArgumentWithCustomToString.E
     }
 
-    public final annotation class EnumArrayAnno : kotlin.Annotation {
+    public final class EnumArrayAnno : kotlin.Annotation {
         public constructor EnumArrayAnno(/*0*/ vararg value: test.EnumArgumentWithCustomToString.E /*kotlin.Array<out test.EnumArgumentWithCustomToString.E>*/)
         public final val value: kotlin.Array<test.EnumArgumentWithCustomToString.E>
         public abstract fun value(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
index aa5d3e430a5..f7431df93f5 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
@@ -14,7 +14,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
index f96852c9f45..bb7fca9463c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
@@ -2,13 +2,13 @@ package test
 
 public interface EnumInParam {
 
-    public final annotation class MyRetention : kotlin.Annotation {
+    public final class MyRetention : kotlin.Annotation {
         public constructor MyRetention(/*0*/ value: java.lang.annotation.RetentionPolicy)
         public final val value: java.lang.annotation.RetentionPolicy
         public abstract fun value(): java.lang.annotation.RetentionPolicy
     }
 
-    test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final annotation class RetentionAnnotation : kotlin.Annotation {
+    test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final class RetentionAnnotation : kotlin.Annotation {
         public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
index 49e3048693f..d4436bb8921 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
@@ -4,7 +4,7 @@ public open class NestedEnumArgument {
     public constructor NestedEnumArgument()
     test.NestedEnumArgument.Anno(value = E.FIRST) public/*package*/ open fun foo(): kotlin.Unit
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: test.NestedEnumArgument.E)
         public final val value: test.NestedEnumArgument.E
         public abstract fun value(): test.NestedEnumArgument.E
diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
index bad55772615..8d79b9f39c4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
@@ -6,7 +6,7 @@ public interface PrimitiveValueInParam {
         public constructor A()
     }
 
-    public final annotation class Ann : kotlin.Annotation {
+    public final class Ann : kotlin.Annotation {
         public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String)
         public final val bool: kotlin.Boolean
         public final val d: kotlin.Double
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
index 11ef47aaa6d..512ad82a346 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
@@ -2,13 +2,13 @@ package test
 
 public interface RecursiveAnnotation {
 
-    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class A : kotlin.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class A : kotlin.Annotation {
         public constructor A(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
     }
 
-    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class B : kotlin.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final class B : kotlin.Annotation {
         public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
         public final val value: test.RecursiveAnnotation.A
         public abstract fun value(): test.RecursiveAnnotation.A
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
index c42658f26f9..047351bad50 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
@@ -2,13 +2,13 @@ package test
 
 public interface RecursiveAnnotation2 {
 
-    public final annotation class A : kotlin.Annotation {
+    public final class A : kotlin.Annotation {
         public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)
         public final val value: test.RecursiveAnnotation2.B
         public abstract fun value(): test.RecursiveAnnotation2.B
     }
 
-    test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final annotation class B : kotlin.Annotation {
+    test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final class B : kotlin.Annotation {
         public constructor B(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
index b53630f497e..2c44061e9d4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-public final annotation class SimpleAnnotation : kotlin.Annotation {
+public final class SimpleAnnotation : kotlin.Annotation {
     public constructor SimpleAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
index 91cb46c6318..88c59dd750f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
@@ -2,7 +2,7 @@ package test
 
 public interface StringConcatenationInParam {
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
index 66c54ad876d..e10cf3c559f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
@@ -2,7 +2,7 @@ package test
 
 public interface StringConstantInParam {
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
index 05152b47227..819282cceb1 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
@@ -2,7 +2,7 @@ package test
 
 public interface StringInParam {
 
-    public final annotation class Anno : kotlin.Annotation {
+    public final class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public final val value: kotlin.String
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
index dc0aeab2ec7..4942e256940 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-test.AnnotatedAnnotation() kotlin.annotation.annotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
+test.AnnotatedAnnotation() kotlin.annotation.annotation() public final class AnnotatedAnnotation : kotlin.Annotation {
     /*primary*/ public constructor AnnotatedAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index 9f7d03729aa..d7c67438af2 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -22,13 +22,13 @@ internal final enum class E : kotlin.Enum<test.E> {
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
 
-kotlin.annotation.annotation() internal final annotation class EnumOption : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class EnumOption : kotlin.Annotation {
     /*primary*/ public constructor EnumOption(/*0*/ option: test.E)
     internal final val option: test.E
         internal final fun <get-option>(): test.E
 }
 
-kotlin.annotation.annotation() internal final annotation class OptionGroups : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class OptionGroups : kotlin.Annotation {
     /*primary*/ public constructor OptionGroups(/*0*/ o1: test.StringOptions, /*1*/ o2: test.EnumOption)
     internal final val o1: test.StringOptions
         internal final fun <get-o1>(): test.StringOptions
@@ -36,7 +36,7 @@ kotlin.annotation.annotation() internal final annotation class OptionGroups : ko
         internal final fun <get-o2>(): test.EnumOption
 }
 
-kotlin.annotation.annotation() internal final annotation class StringOptions : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class StringOptions : kotlin.Annotation {
     /*primary*/ public constructor StringOptions(/*0*/ vararg option: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     internal final val option: kotlin.Array<out kotlin.String>
         internal final fun <get-option>(): kotlin.Array<out kotlin.String>
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index 0356b39bc5a..9ecf3aaec69 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -18,7 +18,7 @@ internal final enum class E : kotlin.Enum<test.E> {
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
 
-kotlin.annotation.annotation() internal final annotation class EnumAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class EnumAnno : kotlin.Annotation {
     /*primary*/ public constructor EnumAnno(/*0*/ value: test.E)
     internal final val value: test.E
         internal final fun <get-value>(): test.E
@@ -29,7 +29,7 @@ public final class EnumArgumentWithCustomToString {
     test.EnumAnno(value = E.CAKE) test.EnumArrayAnno(value = {E.CAKE, E.CAKE}) internal final fun annotated(): kotlin.Unit
 }
 
-kotlin.annotation.annotation() internal final annotation class EnumArrayAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class EnumArrayAnno : kotlin.Annotation {
     /*primary*/ public constructor EnumArrayAnno(/*0*/ vararg value: test.E /*kotlin.Array<out test.E>*/)
     internal final val value: kotlin.Array<out test.E>
         internal final fun <get-value>(): kotlin.Array<out test.E>
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt
index 51117cc7663..c961f664c64 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ s: kotlin.String)
     internal final val s: kotlin.String
         internal final fun <get-s>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt
index 5e6cfce6549..1ebd05de6b8 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.annotation() public final annotation class SimpleAnnotation : kotlin.Annotation {
+kotlin.annotation.annotation() public final class SimpleAnnotation : kotlin.Annotation {
     /*primary*/ public constructor SimpleAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt
index 5d67f42b301..fab329677cf 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt
@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() public final annotation class TargetedAnnotation : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() public final class TargetedAnnotation : kotlin.Annotation {
     /*primary*/ public constructor TargetedAnnotation()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index f11f12849ca..4ad780aedfb 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt
index 8af7dfcdf44..32fa1fab70d 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ value: kotlin.String)
     internal final val value: kotlin.String
         internal final fun <get-value>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
index 9d09f00cdb8..c7e0e9473ed 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt
index 22c826ecca4..42e31ecfc79 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType)
     internal final val t: java.lang.annotation.ElementType
         internal final fun <get-t>(): java.lang.annotation.ElementType
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
index b52d3b3dea7..eabef133146 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
index 232718e6ad8..1e3f2918105 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
index 221a25a0db3..44c27f1ce64 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
index c3c12f29f73..3d032c01d95 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
index a3aff97886e..91d3ed913c9 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt
@@ -6,14 +6,14 @@ internal final class A {
     public companion object Companion {
         /*primary*/ private constructor Companion()
 
-        kotlin.annotation.annotation() internal final annotation class Anno1 : kotlin.Annotation {
+        kotlin.annotation.annotation() internal final class Anno1 : kotlin.Annotation {
             /*primary*/ public constructor Anno1()
         }
 
         internal final class B {
             /*primary*/ public constructor B()
 
-            kotlin.annotation.annotation() internal final annotation class Anno2 : kotlin.Annotation {
+            kotlin.annotation.annotation() internal final class Anno2 : kotlin.Annotation {
                 /*primary*/ public constructor Anno2()
             }
         }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
index 37fb81b01bc..96fb06f7282 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
index 3f0a7c24240..2aa2a930bbe 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
index 59992e8e4c3..19eeea564aa 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class `$$$$$$` : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class `$$$$$$` : kotlin.Annotation {
     /*primary*/ public constructor `$$$$$$`()
 }
 
@@ -8,7 +8,7 @@ test.`$$$$$$`() internal final class A {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class `Anno$tation` : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class `Anno$tation` : kotlin.Annotation {
     /*primary*/ public constructor `Anno$tation`()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt
index c592d495c9e..10b33f0bdd9 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType)
     internal final val t: java.lang.annotation.ElementType
         internal final fun <get-t>(): java.lang.annotation.ElementType
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
index ae9de1d4caf..35b2e56e329 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt
@@ -1,14 +1,14 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A1 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A1 : kotlin.Annotation {
     /*primary*/ public constructor A1()
 }
 
-kotlin.annotation.annotation() internal final annotation class A2 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A2 : kotlin.Annotation {
     /*primary*/ public constructor A2()
 }
 
-kotlin.annotation.annotation() internal final annotation class A3 : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A3 : kotlin.Annotation {
     /*primary*/ public constructor A3()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
index d6e2929cf91..f7a5a2a5a0b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.txt
@@ -3,7 +3,7 @@ package test
 internal final class A {
     /*primary*/ public constructor A()
 
-    kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+    kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
         /*primary*/ public constructor Anno()
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
index 2b142756a49..365077aef49 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt
index 95dc30c54f9..8159335fcc1 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt
@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.annotation(retention = AnnotationRetention.RUNTIME) internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation(retention = AnnotationRetention.RUNTIME) internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
index ea52afc4b87..2c2ed8919e3 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt
index 02cded471d1..b58cb2c56bc 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt
@@ -1,18 +1,18 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class BooleanAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class BooleanAnno : kotlin.Annotation {
     /*primary*/ public constructor BooleanAnno(/*0*/ value: kotlin.Boolean)
     internal final val value: kotlin.Boolean
         internal final fun <get-value>(): kotlin.Boolean
 }
 
-kotlin.annotation.annotation() internal final annotation class ByteAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ByteAnno : kotlin.Annotation {
     /*primary*/ public constructor ByteAnno(/*0*/ value: kotlin.Byte)
     internal final val value: kotlin.Byte
         internal final fun <get-value>(): kotlin.Byte
 }
 
-kotlin.annotation.annotation() internal final annotation class CharAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class CharAnno : kotlin.Annotation {
     /*primary*/ public constructor CharAnno(/*0*/ value: kotlin.Char)
     internal final val value: kotlin.Char
         internal final fun <get-value>(): kotlin.Char
@@ -22,31 +22,31 @@ test.IntAnno(value = 42) test.ShortAnno(value = 42.toShort()) test.ByteAnno(valu
     /*primary*/ public constructor Class()
 }
 
-kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class DoubleAnno : kotlin.Annotation {
     /*primary*/ public constructor DoubleAnno(/*0*/ value: kotlin.Double)
     internal final val value: kotlin.Double
         internal final fun <get-value>(): kotlin.Double
 }
 
-kotlin.annotation.annotation() internal final annotation class FloatAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class FloatAnno : kotlin.Annotation {
     /*primary*/ public constructor FloatAnno(/*0*/ value: kotlin.Float)
     internal final val value: kotlin.Float
         internal final fun <get-value>(): kotlin.Float
 }
 
-kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class IntAnno : kotlin.Annotation {
     /*primary*/ public constructor IntAnno(/*0*/ value: kotlin.Int)
     internal final val value: kotlin.Int
         internal final fun <get-value>(): kotlin.Int
 }
 
-kotlin.annotation.annotation() internal final annotation class LongAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class LongAnno : kotlin.Annotation {
     /*primary*/ public constructor LongAnno(/*0*/ value: kotlin.Long)
     internal final val value: kotlin.Long
         internal final fun <get-value>(): kotlin.Long
 }
 
-kotlin.annotation.annotation() internal final annotation class ShortAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ShortAnno : kotlin.Annotation {
     /*primary*/ public constructor ShortAnno(/*0*/ value: kotlin.Short)
     internal final val value: kotlin.Short
         internal final fun <get-value>(): kotlin.Short
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt
index 94ef8eda087..c9810d4bc12 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String, /*2*/ double: kotlin.Double)
     internal final val double: kotlin.Double
         internal final fun <get-double>(): kotlin.Double
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
index 352a71cacdc..41fb1aa192b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt
@@ -3,6 +3,6 @@ package test
 test.Anno() internal val x: kotlin.Int
     internal fun <get-x>(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt
index d17b6d8782b..9d851d40c4e 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt
@@ -4,7 +4,7 @@ test.Anno(t = ElementType.FIELD) internal val bar: kotlin.Int = 42
     internal fun <get-bar>(): kotlin.Int
 test.Anno(t = ElementType.METHOD) internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType)
     internal final val t: java.lang.annotation.ElementType
         internal final fun <get-t>(): java.lang.annotation.ElementType
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
index 855c2ffc454..a4eabd6ee5d 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
@@ -5,7 +5,7 @@ test.Anno(t = {ElementType.PACKAGE}) internal val bar: kotlin.Int = 42
 test.Anno(t = {}) internal fun baz(): kotlin.Unit
 test.Anno(t = {ElementType.METHOD, ElementType.FIELD}) internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array<out java.lang.annotation.ElementType>*/)
     internal final val t: kotlin.Array<out java.lang.annotation.ElementType>
         internal final fun <get-t>(): kotlin.Array<out java.lang.annotation.ElementType>
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
index 585aaee7bf4..5bb274c0472 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt
@@ -2,6 +2,6 @@ package test
 
 test.Anno() internal fun function(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
index 31f46a51f2e..b92b8539aac 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt
@@ -3,6 +3,6 @@ package test
 internal val property: kotlin.Int
     test.Anno() internal fun <get-property>(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
index 8e0a02fa96e..8f138279dfc 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt
@@ -4,6 +4,6 @@ test.Anno() internal var property: kotlin.Int
     internal fun <get-property>(): kotlin.Int
     internal fun <set-property>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
index 04fb642e419..84b2c392e1a 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt
@@ -4,6 +4,6 @@ internal var property: kotlin.Int
     internal fun <get-property>(): kotlin.Int
     test.Anno() internal fun <set-property>(/*0*/ value: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt
index 8974c0fc9b3..b5fd307a2f4 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt
@@ -5,7 +5,7 @@ test.Anno(t = {"prosper"}) internal val bar: kotlin.Int = 42
 test.Anno(t = {}) internal fun baz(): kotlin.Unit
 test.Anno(t = {"live", "long"}) internal fun foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array<out kotlin.String>*/)
     internal final val t: kotlin.Array<out kotlin.String>
         internal final fun <get-t>(): kotlin.Array<out kotlin.String>
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
index 6b27388be55..ab0e3a3c78c 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt
@@ -1,10 +1,10 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
index 3b4ec2434af..3f2bf6f2b1a 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -1,10 +1,10 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
index d09853c0ddc..3e8eb8ed2d7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt
@@ -2,6 +2,6 @@ package test
 
 internal fun kotlin.Int.foo(/*0*/ test.A() x: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
index 4f23c527fcd..000278bdc48 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index 5dcbed29e07..b920161d443 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
index 236a876ec32..6188cef5000 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
index 70e5a27be90..35407d90748 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt
index 1a929ba986c..41fe04dd9dc 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A(/*0*/ s: kotlin.String)
     internal final val s: kotlin.String
         internal final fun <get-s>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
index 8a7ca50d4eb..abb4292a20c 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt
@@ -3,18 +3,18 @@ package test
 internal fun bar(/*0*/ test.A() test.B() test.C() test.D() x: kotlin.Int): kotlin.Unit
 internal fun foo(/*0*/ test.A() test.B() x: kotlin.Int, /*1*/ test.A() test.C() y: kotlin.Double, /*2*/ test.B() test.C() test.D() z: kotlin.String): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
 
-kotlin.annotation.annotation() internal final annotation class C : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class C : kotlin.Annotation {
     /*primary*/ public constructor C()
 }
 
-kotlin.annotation.annotation() internal final annotation class D : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class D : kotlin.Annotation {
     /*primary*/ public constructor D()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
index 144beb4d129..064d3f53fe4 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
index c2891374258..8bc9d7e5a07 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt
@@ -2,6 +2,6 @@ package test
 
 internal fun foo(/*0*/ test.Anno() x: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
index e71ccf19f0e..9bf02b3fb29 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
@@ -4,10 +4,10 @@ internal var foo: kotlin.Int
     internal fun <get-foo>(): kotlin.Int
     internal fun <set-foo>(/*0*/ test.A() test.B() value: kotlin.Int): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
-kotlin.annotation.annotation() internal final annotation class B : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class B : kotlin.Annotation {
     /*primary*/ public constructor B()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
index f5102295613..45cc5c02a33 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index d5293e678f4..7d80dc02fd7 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
index d628a915d32..41b9bc19b9c 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
@@ -10,14 +10,14 @@ internal final class Class {
         internal final fun kotlin.String.<get-extension>(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class DoubleAnno : kotlin.Annotation {
     /*primary*/ public constructor DoubleAnno()
 }
 
-kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class IntAnno : kotlin.Annotation {
     /*primary*/ public constructor IntAnno()
 }
 
-kotlin.annotation.annotation() internal final annotation class StringAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class StringAnno : kotlin.Annotation {
     /*primary*/ public constructor StringAnno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
index 617bfcd67a2..3f24c08d080 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
@@ -7,14 +7,14 @@ test.IntAnno() internal val kotlin.Int.extension: kotlin.Int
 test.StringAnno() internal val kotlin.String.extension: kotlin.String
     internal fun kotlin.String.<get-extension>(): kotlin.String
 
-kotlin.annotation.annotation() internal final annotation class DoubleAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class DoubleAnno : kotlin.Annotation {
     /*primary*/ public constructor DoubleAnno()
 }
 
-kotlin.annotation.annotation() internal final annotation class IntAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class IntAnno : kotlin.Annotation {
     /*primary*/ public constructor IntAnno()
 }
 
-kotlin.annotation.annotation() internal final annotation class StringAnno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class StringAnno : kotlin.Annotation {
     /*primary*/ public constructor StringAnno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index 5c060817c2e..370dcc1b041 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
index dcd9b1875eb..a1f6fc2342d 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
@@ -3,6 +3,6 @@ package test
 test.Anno() internal val property: kotlin.Int
     internal fun <get-property>(): kotlin.Int
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
index cc0f7717db0..197bcc1db98 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
index 9ad34b16d1a..813266df8f0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class Anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
index 47190d4e0e4..49b0ae3d3da 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt
@@ -2,6 +2,6 @@ package test
 
 internal fun @[test.A()] kotlin.String.foo(): kotlin.Unit
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
index bf596b8f642..e28ef2829f2 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
index 81a5e323a3b..7650fdaabbe 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A()
 }
 
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
index a034f7b1084..f7a5831e0ac 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final annotation class Ann : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
     /*primary*/ public constructor Ann(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Double)
     internal final val x: kotlin.String
         internal final fun <get-x>(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt
index 78c5da4693d..27141a06545 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt
@@ -6,7 +6,7 @@ internal final class Some {
     test.Some.Companion.TestAnnotation() public companion object Companion {
         /*primary*/ private constructor Companion()
 
-        kotlin.annotation.annotation() internal final annotation class TestAnnotation : kotlin.Annotation {
+        kotlin.annotation.annotation() internal final class TestAnnotation : kotlin.Annotation {
             /*primary*/ public constructor TestAnnotation()
         }
     }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt
index a44a114910e..3eb82760baf 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt
@@ -5,7 +5,7 @@ test.A(s = "2") internal var v: kotlin.Int
     kotlin.platform.platformName(name = "vset") test.A(s = "4") internal fun <set-v>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
 kotlin.platform.platformName(name = "bar") test.A(s = "1") internal fun foo(): kotlin.String
 
-kotlin.annotation.annotation() internal final annotation class A : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class A : kotlin.Annotation {
     /*primary*/ public constructor A(/*0*/ s: kotlin.String)
     internal final val s: kotlin.String
         internal final fun <get-s>(): kotlin.String
diff --git a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt
index 6faf51d956c..4724d7b698c 100644
--- a/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt
+++ b/compiler/testData/loadJava/sourceJava/NullInAnnotation.txt
@@ -5,7 +5,7 @@ public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit):
 public interface NullInAnnotation {
     test.NullInAnnotation.Ann(a = null, b = {null}) public abstract fun foo(): kotlin.Unit
 
-    public final annotation class Ann : kotlin.Annotation {
+    public final class Ann : kotlin.Annotation {
         public constructor Ann(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Array<kotlin.String>)
         public final val a: kotlin.String
         public final val b: kotlin.Array<kotlin.String>
diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt
index 9a6b220b470..722173536e6 100644
--- a/compiler/testData/renderer/Classes.kt
+++ b/compiler/testData/renderer/Classes.kt
@@ -35,9 +35,9 @@ public class WithReified<reified A, reified out B>
 public interface TwoUpperBounds<T> where T : Number, T : Any
 
 //package rendererTest
-//kotlin.annotation.annotation internal final annotation class TheAnnotation : kotlin.Annotation defined in rendererTest
+//kotlin.annotation.annotation internal final class TheAnnotation : kotlin.Annotation defined in rendererTest
 //public constructor TheAnnotation() defined in rendererTest.TheAnnotation
-//kotlin.annotation.annotation internal final annotation class AnotherAnnotation : kotlin.Annotation defined in rendererTest
+//kotlin.annotation.annotation internal final class AnotherAnnotation : kotlin.Annotation defined in rendererTest
 //public constructor AnotherAnnotation() defined in rendererTest.AnotherAnnotation
 //rendererTest.TheAnnotation public open class TheClass<out T : kotlin.Int, X> defined in rendererTest
 //<out T : kotlin.Int> defined in rendererTest.TheClass
diff --git a/compiler/testData/renderer/KeywordsInNames.kt b/compiler/testData/renderer/KeywordsInNames.kt
index cfd65f664f8..b76e7c22f7c 100644
--- a/compiler/testData/renderer/KeywordsInNames.kt
+++ b/compiler/testData/renderer/KeywordsInNames.kt
@@ -17,7 +17,7 @@ val AS_SAFE = 1
 val NOT_IN = 2
 val NOT_IS = 3
 
-//kotlin.annotation.annotation internal final annotation class `true` : kotlin.Annotation defined in root package
+//kotlin.annotation.annotation internal final class `true` : kotlin.Annotation defined in root package
 //public constructor `true`() defined in `true`
 //internal val `val`: kotlin.Int defined in root package
 //`true` internal interface `interface` defined in root package
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
index 6f95aea08e2..09c493ea2a4 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
@@ -1,6 +1,6 @@
 package test
 
-kotlin.annotation.annotation() internal final annotation class AnnotationArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class AnnotationArray : kotlin.Annotation {
     public constructor AnnotationArray(/*0*/ annotationArray: kotlin.Array<test.JustAnnotation>)
     internal final val annotationArray: kotlin.Array<test.JustAnnotation>
 }
@@ -13,11 +13,11 @@ test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Em
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class Empty : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Empty : kotlin.Annotation {
     public constructor Empty()
 }
 
-kotlin.annotation.annotation() internal final annotation class JustAnnotation : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustAnnotation : kotlin.Annotation {
     public constructor JustAnnotation(/*0*/ annotation: test.Empty)
     internal final val annotation: test.Empty
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
index f01734d10e8..d37e6bbe6e8 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
@@ -8,12 +8,12 @@ test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) internal final class C2
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class EnumArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class EnumArray : kotlin.Annotation {
     public constructor EnumArray(/*0*/ enumArray: kotlin.Array<test.Weapon>)
     internal final val enumArray: kotlin.Array<test.Weapon>
 }
 
-kotlin.annotation.annotation() internal final annotation class JustEnum : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustEnum : kotlin.Annotation {
     public constructor JustEnum(/*0*/ weapon: test.Weapon)
     internal final val weapon: test.Weapon
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt
index f5c7253a19d..ba43984c650 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt
@@ -8,7 +8,7 @@ test.PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleAr
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class PrimitiveArrays : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class PrimitiveArrays : kotlin.Annotation {
     public constructor PrimitiveArrays(/*0*/ byteArray: kotlin.ByteArray, /*1*/ charArray: kotlin.CharArray, /*2*/ shortArray: kotlin.ShortArray, /*3*/ intArray: kotlin.IntArray, /*4*/ longArray: kotlin.LongArray, /*5*/ floatArray: kotlin.FloatArray, /*6*/ doubleArray: kotlin.DoubleArray, /*7*/ booleanArray: kotlin.BooleanArray)
     internal final val booleanArray: kotlin.BooleanArray
     internal final val byteArray: kotlin.ByteArray
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt
index 84b02aa9784..36f1e4f7b0a 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt
@@ -8,7 +8,7 @@ test.Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double =
     public constructor D()
 }
 
-kotlin.annotation.annotation() internal final annotation class Primitives : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class Primitives : kotlin.Annotation {
     public constructor Primitives(/*0*/ byte: kotlin.Byte, /*1*/ char: kotlin.Char, /*2*/ short: kotlin.Short, /*3*/ int: kotlin.Int, /*4*/ long: kotlin.Long, /*5*/ float: kotlin.Float, /*6*/ double: kotlin.Double, /*7*/ boolean: kotlin.Boolean)
     internal final val boolean: kotlin.Boolean
     internal final val byte: kotlin.Byte
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt
index fceb8171734..4c074ac6138 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt
@@ -8,12 +8,12 @@ test.StringArray(stringArray = {"java", ""}) internal final class C2 {
     public constructor C2()
 }
 
-kotlin.annotation.annotation() internal final annotation class JustString : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class JustString : kotlin.Annotation {
     public constructor JustString(/*0*/ string: kotlin.String)
     internal final val string: kotlin.String
 }
 
-kotlin.annotation.annotation() internal final annotation class StringArray : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class StringArray : kotlin.Annotation {
     public constructor StringArray(/*0*/ stringArray: kotlin.Array<kotlin.String>)
     internal final val stringArray: kotlin.Array<kotlin.String>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
index 30d245911e6..af5bb7fcbb9 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
@@ -32,11 +32,11 @@ internal final enum class My : kotlin.Enum<test.My> {
     public final /*synthesized*/ fun values(): kotlin.Array<test.My>
 }
 
-kotlin.annotation.annotation() internal final annotation class ann : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class ann : kotlin.Annotation {
     public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array<out test.My>*/)
     internal final val m: kotlin.Array<out test.My>
 }
 
-test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() internal final annotation class annotated : kotlin.Annotation {
+test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() internal final class annotated : kotlin.Annotation {
     public constructor annotated()
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt
index b03c61aeceb..6389756693d 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt
@@ -21,7 +21,7 @@ test.anno(x = "top level class") internal final class C1 {
     }
 }
 
-kotlin.annotation.annotation() internal final annotation class anno : kotlin.Annotation {
+kotlin.annotation.annotation() internal final class anno : kotlin.Annotation {
     public constructor anno(/*0*/ x: kotlin.String)
     internal final val x: kotlin.String
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
index 89fe98bdfab..422e3036d08 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
@@ -140,7 +140,7 @@ public interface DescriptorRenderer : Renderer<DeclarationDescriptor> {
                 ClassKind.INTERFACE -> "interface"
                 ClassKind.ENUM_CLASS -> "enum class"
                 ClassKind.OBJECT -> "object"
-                ClassKind.ANNOTATION_CLASS -> "annotation class"
+                ClassKind.ANNOTATION_CLASS -> "class"
                 ClassKind.ENUM_ENTRY -> "enum entry"
             }
         }
diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
index fe8754994bf..f9f3011a981 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
@@ -5,7 +5,27 @@ PsiJetFileStubImpl[package=test.a]
       REFERENCE_EXPRESSION:[referencedName=a]
   IMPORT_LIST:
   CLASS:[fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]]
-    MODIFIER_LIST:[annotation public final]
+    MODIFIER_LIST:[public final]
+      ANNOTATION_ENTRY:[hasValueArguments=false, shortName=annotation]
+        CONSTRUCTOR_CALLEE:
+          TYPE_REFERENCE:
+            USER_TYPE:[isAbsoluteInRootPackage=false]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                USER_TYPE:[isAbsoluteInRootPackage=false]
+                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                REFERENCE_EXPRESSION:[referencedName=annotation]
+              REFERENCE_EXPRESSION:[referencedName=annotation]
+      ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Retention]
+        CONSTRUCTOR_CALLEE:
+          TYPE_REFERENCE:
+            USER_TYPE:[isAbsoluteInRootPackage=false]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                USER_TYPE:[isAbsoluteInRootPackage=false]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=java]
+                  REFERENCE_EXPRESSION:[referencedName=lang]
+                REFERENCE_EXPRESSION:[referencedName=annotation]
+              REFERENCE_EXPRESSION:[referencedName=Retention]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
index 018c213880e..d9f5b894866 100644
--- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
+++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt
@@ -113,7 +113,27 @@ PsiJetFileStubImpl[package=test.class_object]
                                       REFERENCE_EXPRESSION:[referencedName=kotlin]
                                     REFERENCE_EXPRESSION:[referencedName=Unit]
                               CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]]
-                                MODIFIER_LIST:[annotation internal final]
+                                MODIFIER_LIST:[internal final]
+                                  ANNOTATION_ENTRY:[hasValueArguments=false, shortName=annotation]
+                                    CONSTRUCTOR_CALLEE:
+                                      TYPE_REFERENCE:
+                                        USER_TYPE:[isAbsoluteInRootPackage=false]
+                                          USER_TYPE:[isAbsoluteInRootPackage=false]
+                                            USER_TYPE:[isAbsoluteInRootPackage=false]
+                                              REFERENCE_EXPRESSION:[referencedName=kotlin]
+                                            REFERENCE_EXPRESSION:[referencedName=annotation]
+                                          REFERENCE_EXPRESSION:[referencedName=annotation]
+                                  ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Retention]
+                                    CONSTRUCTOR_CALLEE:
+                                      TYPE_REFERENCE:
+                                        USER_TYPE:[isAbsoluteInRootPackage=false]
+                                          USER_TYPE:[isAbsoluteInRootPackage=false]
+                                            USER_TYPE:[isAbsoluteInRootPackage=false]
+                                              USER_TYPE:[isAbsoluteInRootPackage=false]
+                                                REFERENCE_EXPRESSION:[referencedName=java]
+                                              REFERENCE_EXPRESSION:[referencedName=lang]
+                                            REFERENCE_EXPRESSION:[referencedName=annotation]
+                                          REFERENCE_EXPRESSION:[referencedName=Retention]
                                 PRIMARY_CONSTRUCTOR:
                                   MODIFIER_LIST:[public]
                                   VALUE_PARAMETER_LIST: