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

A swarm of tests fixed accordingly.

compiler/testData/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()
 }

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

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

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

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

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

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

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

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>

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<*>>

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<*>

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<*>

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!>

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

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

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>

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>

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

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

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

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

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

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

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()
 }

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

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

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

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()
 }

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>

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>

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

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()
 }

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()
 }

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()
 }
 

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

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()
 }
 

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

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()
 }
 

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()
 }
 

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()
 }
 

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()
 }
 

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()
             }
         }

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()
 }
 

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()
 }
 

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`()
 }
 

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

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()
 }
 

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()
     }
 }

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()
 }
 

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()
 }

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()
 }
 

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

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

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()
 }

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

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>

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()
 }

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()
 }

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()
 }

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()
 }

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>

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()
 }
 

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()
 }
 

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()
 }

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()
 }
 

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()
 }
 

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()
 }
 

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()
 }
 

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

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()
 }

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()
 }
 

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()
 }

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()
 }

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()
 }
 

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()
 }
 

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()
 }

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()
 }

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()
 }
 

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()
 }

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()
 }
 

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()
 }
 

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()
 }

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()
 }
 

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()
 }
 

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

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()
         }
     }

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

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>