diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java b/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java
index a370e4fe9c4..38682f8f4a7 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java
+++ b/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java
@@ -1,5 +1,6 @@
-public enum AnnotatedParameterInEnumConstructor {
-    A;
+public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
+  A;
+
+  private  AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
 
-    private AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String a, @test.Anno(x = "b") java.lang.String b) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java
index c7002108cdc..09263b278b3 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java
+++ b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java
@@ -1,11 +1,12 @@
-public final class AnnotatedParameterInInnerClassConstructor {
-    public AnnotatedParameterInInnerClassConstructor() { /* compiled code */ }
+public final class AnnotatedParameterInInnerClassConstructor /* test.AnnotatedParameterInInnerClassConstructor*/ {
+  public  AnnotatedParameterInInnerClassConstructor();//  .ctor()
 
-    public final class Inner {
-        public Inner(@test.Anno(x = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @test.Anno(x = "b") @org.jetbrains.annotations.NotNull java.lang.String b) { /* compiled code */ }
-    }
 
-    public final class InnerGeneric <T> {
-        public InnerGeneric(@test.Anno(x = "a") T a, @test.Anno(x = "b") @org.jetbrains.annotations.NotNull java.lang.String b) { /* compiled code */ }
-    }
-}
\ No newline at end of file
+
+public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ {
+  public  Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
+
+}public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/<T>  {
+  public  InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);//  .ctor(T, java.lang.String)
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java
index 4e57bad8a6c..598bff616b3 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java
+++ b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java
@@ -1,5 +1,6 @@
 public final class Test /* Test*/ {
   @MyAnnotation5()
+  @org.jetbrains.annotations.NotNull()
   private java.lang.String bar;
 
   @MyAnnotation()
@@ -9,6 +10,13 @@ public final class Test /* Test*/ {
   @MyAnnotation2()
   public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);//  setBar(java.lang.String)
 
+  @org.jetbrains.annotations.NotNull()
+  public final kotlin.Unit getFooP(@MyAnnotation7() int);//  getFooP(int)
+
   public  Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
-}
+  public final void fooF(@MyAnnotation7() int);//  fooF(int)
+
+  public final void setFooP(@MyAnnotation7() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);//  setFooP(int, kotlin.Unit)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt
index 9ec2d98b316..4d21f84c924 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt
+++ b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt
@@ -5,5 +5,13 @@ annotation class MyAnnotation3
 annotation class MyAnnotation4
 annotation class MyAnnotation5
 annotation class MyAnnotation6
+@Target(AnnotationTarget.VALUE_PARAMETER)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MyAnnotation7
 
-class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @property:MyAnnotation4 @field:MyAnnotation5 @param:MyAnnotation6 var bar: String)
+class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @property:MyAnnotation4 @field:MyAnnotation5 @param:MyAnnotation6 var bar: String) {
+    fun @receiver:MyAnnotation7 Int.fooF() = Unit
+    var @receiver:MyAnnotation7 Int.fooP
+        get() = Unit
+        set(value) {}
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/AnnotationClass.java b/compiler/testData/asJava/lightClasses/AnnotationClass.java
index 15ee97ba512..722eaff771f 100644
--- a/compiler/testData/asJava/lightClasses/AnnotationClass.java
+++ b/compiler/testData/asJava/lightClasses/AnnotationClass.java
@@ -1,14 +1,15 @@
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface Anno {
-    int i();
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno /* Anno*/ {
+  public abstract double d() default 0.0;//  d()
 
-    int j() default 5;
+  public abstract int i();//  i()
 
-    java.lang.String value() default "a";
+  public abstract int j() default 5;//  j()
 
-    double d() default 0.0;
+  public abstract int[] ia();//  ia()
 
-    int[] ia();
+  public abstract int[] ia2() default {1, 2, 3};//  ia2()
+
+  public abstract java.lang.String value() default "a";//  value()
 
-    int[] ia2() default {1, 2, 3};
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java
index a5a92b58574..46540aa9b6c 100644
--- a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java
+++ b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java
@@ -1,72 +1,73 @@
-public final class Wrapper {
-    public Wrapper() { /* compiled code */ }
+public final class Wrapper /* p.Wrapper*/ {
+  public  Wrapper();//  .ctor()
 
-    public static final class Equals {
-        @org.jetbrains.annotations.NotNull
-        private final p.G code;
 
-        public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object other) { /* compiled code */ }
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G getCode() { /* compiled code */ }
 
-        public Equals(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+public static final class Equals /* p.Wrapper.Equals*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final p.G code;
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G component1() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G component1();//  component1()
 
-        @org.jetbrains.annotations.NotNull
-        public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G getCode();//  getCode()
 
-        @org.jetbrains.annotations.NotNull
-        public java.lang.String toString() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-        public int hashCode() { /* compiled code */ }
-    }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
 
-    public static final class HashCode {
-        @org.jetbrains.annotations.NotNull
-        private final p.G code;
+  public  Equals(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
 
-        public int hashCode() { /* compiled code */ }
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G getCode() { /* compiled code */ }
+  public int hashCode();//  hashCode()
 
-        public HashCode(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+}public static final class HashCode /* p.Wrapper.HashCode*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final p.G code;
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G component1() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G component1();//  component1()
 
-        @org.jetbrains.annotations.NotNull
-        public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G getCode();//  getCode()
 
-        @org.jetbrains.annotations.NotNull
-        public java.lang.String toString() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-        public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object p) { /* compiled code */ }
-    }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
 
-    public static final class ToString {
-        @org.jetbrains.annotations.NotNull
-        private final p.G code;
+  public  HashCode(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
 
-        @org.jetbrains.annotations.NotNull
-        public java.lang.String toString() { /* compiled code */ }
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G getCode() { /* compiled code */ }
+  public int hashCode();//  hashCode()
 
-        public ToString(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+}public static final class ToString /* p.Wrapper.ToString*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final p.G code;
 
-        @org.jetbrains.annotations.NotNull
-        public final p.G component1() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G component1();//  component1()
 
-        @org.jetbrains.annotations.NotNull
-        public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.G getCode();//  getCode()
 
-        public int hashCode() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);//  copy(p.G)
 
-        public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object p) { /* compiled code */ }
-    }
-}
\ No newline at end of file
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
+
+  public  ToString(@org.jetbrains.annotations.NotNull() p.G);//  .ctor(p.G)
+
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
+
+  public int hashCode();//  hashCode()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DelegatedNested.java b/compiler/testData/asJava/lightClasses/DelegatedNested.java
index 7430267544e..404ceb2a2f5 100644
--- a/compiler/testData/asJava/lightClasses/DelegatedNested.java
+++ b/compiler/testData/asJava/lightClasses/DelegatedNested.java
@@ -1,13 +1,14 @@
-public final class B {
-    public B() { /* compiled code */ }
+public final class B /* p.B*/ {
+  public  B();//  .ctor()
 
-    public static final class A implements p.I {
-        private final p.I f;
 
-        public A(@org.jetbrains.annotations.NotNull p.I f) { /* compiled code */ }
+public static final class A /* p.B.A*/ implements p.I {
+  private final p.I f;
 
-        public void f() { /* compiled code */ }
+  public  A(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
 
-        public void g() { /* compiled code */ }
-    }
-}
+  public void f();//  f()
+
+  public void g();//  g()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/Delegation.java b/compiler/testData/asJava/lightClasses/Delegation.java
index e06d816adf2..cb3e779e47d 100644
--- a/compiler/testData/asJava/lightClasses/Delegation.java
+++ b/compiler/testData/asJava/lightClasses/Delegation.java
@@ -1,9 +1,10 @@
-public final class B implements p.I {
-    private final p.I f;
+public final class B /* p.B*/ implements p.I {
+  private final p.I f;
 
-    public B(@org.jetbrains.annotations.NotNull p.I f) { /* compiled code */ }
+  public  B(@org.jetbrains.annotations.NotNull() p.I);//  .ctor(p.I)
 
-    public void f() { /* compiled code */ }
+  public void f();//  f()
+
+  public void g();//  g()
 
-    public void g() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java b/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java
index aeaedcd3053..70d38298344 100644
--- a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java
+++ b/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java
@@ -1,13 +1,8 @@
-public enum E {
-    /**
-     * @deprecated
-     */
-    @kotlin.Deprecated(message = "a")
-    Entry1, Entry2, /**
-     * @deprecated
-     */
-    @kotlin.Deprecated(message = "b")
-    Entry3;
+public enum E /* p.E*/ {
+  Entry1,
+  Entry2,
+  Entry3;
 
-    private E() { /* compiled code */ }
-}
+  private  E();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java b/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java
index 3f676af287c..f93fd607ac5 100644
--- a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java
+++ b/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java
@@ -1,9 +1,7 @@
-public final class A {
-    /**
-     * @deprecated
-     */
-    @kotlin.Deprecated(message = "f")
-    public final void f() { /* compiled code */ }
+public final class A /* a.A*/ {
+  @kotlin.Deprecated(message = "f")
+  public final void f();//  f()
 
-    public A() { /* compiled code */ }
-}
+  public  A();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DollarsInName.java b/compiler/testData/asJava/lightClasses/DollarsInName.java
index 7db366a3771..f4e579c16e1 100644
--- a/compiler/testData/asJava/lightClasses/DollarsInName.java
+++ b/compiler/testData/asJava/lightClasses/DollarsInName.java
@@ -1,15 +1,16 @@
-public final class A$B {
-    public A$B() { /* compiled code */ }
+public final class A$B /* c.b.a.A$B*/ {
+  public  A$B();//  .ctor()
 
-    public final class C$D {
-        public C$D() { /* compiled code */ }
-    }
 
-    public static final class $$$$$$$ {
-        public $$$$$$$() { /* compiled code */ }
 
-        public final class G$G$ {
-            public G$G$() { /* compiled code */ }
-        }
-    }
-}
\ No newline at end of file
+public final class C$D /* c.b.a.A$B.C$D*/ {
+  public  C$D();//  .ctor()
+
+}public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ {
+  public  $$$$$$$();//  .ctor()
+
+
+public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ {
+  public  G$G$();//  .ctor()
+
+}}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java b/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java
index 46c03b6e2e2..9386817cb32 100644
--- a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java
+++ b/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java
@@ -1,15 +1,16 @@
-public final class A$B {
-    public A$B() { /* compiled code */ }
+public final class A$B /* A$B*/ {
+  public  A$B();//  .ctor()
 
-    public final class C$D {
-        public C$D() { /* compiled code */ }
-    }
 
-    public static final class $$$$$$$ {
-        public $$$$$$$() { /* compiled code */ }
 
-        public final class G$G$ {
-            public G$G$() { /* compiled code */ }
-        }
-    }
-}
+public final class C$D /* A$B.C$D*/ {
+  public  C$D();//  .ctor()
+
+}public static final class $$$$$$$ /* A$B.$$$$$$$*/ {
+  public  $$$$$$$();//  .ctor()
+
+
+public final class G$G$ /* A$B.$$$$$$$.G$G$*/ {
+  public  G$G$();//  .ctor()
+
+}}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java b/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java
index 995eb35b70d..44105c60b2d 100644
--- a/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java
+++ b/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java
@@ -1,12 +1,13 @@
-public interface B extends p.A {
-    @org.jetbrains.annotations.NotNull
-    java.lang.String b();
+public abstract interface B /* p.B*/ extends p.A {
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String b();//  b()
 
-    static final class DefaultImpls {
-        @org.jetbrains.annotations.NotNull
-        public static java.lang.String b(@org.jetbrains.annotations.NotNull p.B $this) { /* compiled code */ }
 
-        @org.jetbrains.annotations.NotNull
-        public static java.lang.String a(@org.jetbrains.annotations.NotNull p.B $this) { /* compiled code */ }
-    }
-}
\ No newline at end of file
+public static final class DefaultImpls /* p.B.DefaultImpls*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.B);//  a(p.B)
+
+  @org.jetbrains.annotations.NotNull()
+  public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.B);//  b(p.B)
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecated.java b/compiler/testData/asJava/lightClasses/HiddenDeprecated.java
index c0cf7f65417..dfa32748259 100644
--- a/compiler/testData/asJava/lightClasses/HiddenDeprecated.java
+++ b/compiler/testData/asJava/lightClasses/HiddenDeprecated.java
@@ -1,2 +1,2 @@
-public final class HiddenDeprecatedKt {
-}
+public final class HiddenDeprecatedKt /* a.HiddenDeprecatedKt*/ {
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java b/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java
index b36e461d559..3156b77e63f 100644
--- a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java
+++ b/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java
@@ -1,3 +1,4 @@
-public final class A {
-    public A() { /* compiled code */ }
-}
+public final class A /* a.A*/ {
+  public  A();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java
index 59a42a2bf07..24a76ce99f2 100644
--- a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java
+++ b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java
@@ -1,13 +1,14 @@
-public final class Inheritor implements p.I, p.I2 {
-    public final void f() { /* compiled code */ }
+public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String bar();//  bar()
 
-    public void g() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String foo();//  foo()
 
-    public Inheritor() { /* compiled code */ }
+  public  Inheritor();//  .ctor()
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.String foo() { /* compiled code */ }
+  public final void f();//  f()
+
+  public void g();//  g()
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.String bar() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java
index 4e30aafdcd9..3643b1afce8 100644
--- a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java
+++ b/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java
@@ -1,7 +1,8 @@
-public final class Inheritor implements p.I, p.I2 {
-    public final void f() { /* compiled code */ }
+public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
+  public  Inheritor();//  .ctor()
 
-    public void g() { /* compiled code */ }
+  public final void f();//  f()
+
+  public void g();//  g()
 
-    public Inheritor() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/InlineReified.java b/compiler/testData/asJava/lightClasses/InlineReified.java
index de2a76e3d28..77527c39a7c 100644
--- a/compiler/testData/asJava/lightClasses/InlineReified.java
+++ b/compiler/testData/asJava/lightClasses/InlineReified.java
@@ -1,3 +1,4 @@
-public final class InlineReified {
-    public InlineReified() { /* compiled code */ }
-}
+public final class InlineReified /* a.InlineReified*/ {
+  public  InlineReified();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/JvmNameOnMember.java b/compiler/testData/asJava/lightClasses/JvmNameOnMember.java
index a47195ef1a3..c70163f8ad0 100644
--- a/compiler/testData/asJava/lightClasses/JvmNameOnMember.java
+++ b/compiler/testData/asJava/lightClasses/JvmNameOnMember.java
@@ -1,9 +1,10 @@
-public final class C {
-    @kotlin.jvm.JvmName(name = "myFun")
-    public final void myFun(@org.jetbrains.annotations.NotNull C c) { /* compiled code */ }
+public final class C /* C*/ {
+  @kotlin.jvm.JvmName(name = "myFun")
+  public final void myFun(@org.jetbrains.annotations.NotNull() C);//  myFun(C)
 
-    @kotlin.jvm.JvmName(name = "myFun")
-    public final void myFun(@org.jetbrains.annotations.NotNull C c, @org.jetbrains.annotations.NotNull C c2) { /* compiled code */ }
+  @kotlin.jvm.JvmName(name = "myFun")
+  public final void myFun(@org.jetbrains.annotations.NotNull() C, @org.jetbrains.annotations.NotNull() C);//  myFun(C, C)
 
-    public C() { /* compiled code */ }
-}
+  public  C();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/JvmStatic.java b/compiler/testData/asJava/lightClasses/JvmStatic.java
index 467c1aadd08..7a455d72380 100644
--- a/compiler/testData/asJava/lightClasses/JvmStatic.java
+++ b/compiler/testData/asJava/lightClasses/JvmStatic.java
@@ -1,26 +1,27 @@
-public final class A {
-    @org.jetbrains.annotations.NotNull
-    public static final A.Companion Companion;
+public final class A /* A*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.Companion Companion;
 
-    public A() { /* compiled code */ }
+  @kotlin.jvm.JvmStatic()
+  public static final void f();//  f()
 
-    @kotlin.jvm.JvmStatic
-    public static final void f() { /* compiled code */ }
+  public  A();//  .ctor()
 
-    public static final class B {
-        @org.jetbrains.annotations.NotNull
-        public static final A.B INSTANCE;
 
-        @kotlin.jvm.JvmStatic
-        public static final void g() { /* compiled code */ }
 
-        private B() { /* compiled code */ }
-    }
+public static final class B /* A.B*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.B INSTANCE;
 
-    public static final class Companion {
-        @kotlin.jvm.JvmStatic
-        public final void f() { /* compiled code */ }
+  @kotlin.jvm.JvmStatic()
+  public static final void g();//  g()
 
-        private Companion() { /* compiled code */ }
-    }
-}
+  private  B();//  .ctor()
+
+}public static final class Companion /* A.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  public final void f();//  f()
+
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/NestedObjects.java b/compiler/testData/asJava/lightClasses/NestedObjects.java
index 56fb640b826..5236f5b73a5 100644
--- a/compiler/testData/asJava/lightClasses/NestedObjects.java
+++ b/compiler/testData/asJava/lightClasses/NestedObjects.java
@@ -1,42 +1,43 @@
-public final class A {
-    public A() { /* compiled code */ }
+public final class A /* A*/ {
+  public  A();//  .ctor()
 
-    public static final class B {
-        public B() { /* compiled code */ }
 
-        public static final class I {
-            @org.jetbrains.annotations.NotNull
-            public static final A.B.I INSTANCE;
 
-            private I() { /* compiled code */ }
-        }
+public static final class B /* A.B*/ {
+  public  B();//  .ctor()
 
-        public static final class II {
-            @org.jetbrains.annotations.NotNull
-            public static final A.B.II INSTANCE;
 
-            private II() { /* compiled code */ }
-        }
-    }
 
-    public static final class C {
-        @org.jetbrains.annotations.NotNull
-        public static final A.C INSTANCE;
+public static final class I /* A.B.I*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.B.I INSTANCE;
 
-        private C() { /* compiled code */ }
+  private  I();//  .ctor()
 
-        public static final class D {
-            @org.jetbrains.annotations.NotNull
-            public static final A.C.D INSTANCE;
+}public static final class II /* A.B.II*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.B.II INSTANCE;
 
-            private D() { /* compiled code */ }
+  private  II();//  .ctor()
 
-            public static final class G {
-                @org.jetbrains.annotations.NotNull
-                public static final A.C.D.G INSTANCE;
+}}public static final class C /* A.C*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.C INSTANCE;
 
-                private G() { /* compiled code */ }
-            }
-        }
-    }
-}
\ No newline at end of file
+  private  C();//  .ctor()
+
+
+public static final class D /* A.C.D*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.C.D INSTANCE;
+
+  private  D();//  .ctor()
+
+
+public static final class G /* A.C.D.G*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.C.D.G INSTANCE;
+
+  private  G();//  .ctor()
+
+}}}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java b/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java
index 1e8812cc038..1920daf2a3b 100644
--- a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java
+++ b/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java
@@ -1,16 +1,17 @@
-public final class A {
-    private final int y;
+public final class A /* p.A*/ {
+  private final int y;
 
-    public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object other) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String toString();//  toString()
 
-    public int hashCode() { /* compiled code */ }
+  public  A(int);//  .ctor(int)
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.String toString() { /* compiled code */ }
+  public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);//  equals(java.lang.Object)
 
-    public final int component1() { /* compiled code */ }
+  public final int component1();//  component1()
 
-    public final int getY() { /* compiled code */ }
+  public final int getY();//  getY()
 
-    public A(int y) { /* compiled code */ }
-}
+  public int hashCode();//  hashCode()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/PublishedApi.java b/compiler/testData/asJava/lightClasses/PublishedApi.java
index d2f852bba98..ae7f2121962 100644
--- a/compiler/testData/asJava/lightClasses/PublishedApi.java
+++ b/compiler/testData/asJava/lightClasses/PublishedApi.java
@@ -1,8 +1,9 @@
-public final class A {
-    public final void test() { /* compiled code */ }
+public final class A /* A*/ {
+  @kotlin.PublishedApi()
+  public final int access$test(int);//  access$test(int)
 
-    @kotlin.PublishedApi
-    public final int access$test(int p) { /* compiled code */ }
+  public  A();//  .ctor()
 
-    public A() { /* compiled code */ }
-}
+  public final void test();//  test()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java b/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java
index 1b1dfbc0541..e82640d994c 100644
--- a/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java
+++ b/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java
@@ -1,10 +1,11 @@
-@kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE)
+@java.lang.annotation.Documented()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
+@java.lang.annotation.Target(value = {})
+@kotlin.annotation.MustBeDocumented()
+@kotlin.annotation.Repeatable()
+@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
 @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER})
-@kotlin.annotation.MustBeDocumented
-@kotlin.annotation.Repeatable
-@java.lang.annotation.Documented
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
-@java.lang.annotation.Target({})
-public @interface Anno {
-    int i();
-}
+public abstract @interface Anno /* Anno*/ {
+  public abstract int i();//  i()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java
index 2c3a8ecba6e..02951cc22a7 100644
--- a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java
+++ b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java
@@ -1,7 +1,8 @@
-public final class A {
-    public final void foo(@org.jetbrains.annotations.Nullable P p1, @org.jetbrains.annotations.Nullable P p2) { /* compiled code */ }
+public final class A /* A*/ {
+  public  A();//  .ctor()
 
-    public final void foo(@org.jetbrains.annotations.NotNull kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object> listener) { /* compiled code */ }
+  public final void foo(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>);//  foo(kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>)
+
+  public final void foo(@org.jetbrains.annotations.Nullable() P, @org.jetbrains.annotations.Nullable() P);//  foo(P, P)
 
-    public A() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/TypePararametersInClass.java b/compiler/testData/asJava/lightClasses/TypePararametersInClass.java
index 137786688ce..1abf72c55d0 100644
--- a/compiler/testData/asJava/lightClasses/TypePararametersInClass.java
+++ b/compiler/testData/asJava/lightClasses/TypePararametersInClass.java
@@ -1,11 +1,12 @@
-public abstract class A <T extends A<T>> extends B<java.util.Collection<? extends T>> implements C<T> {
-    public A() { /* compiled code */ }
+public abstract class A /* A*/<T extends A<T>>  extends B<java.util.Collection<? extends T>> implements C<T> {
+  public  A();//  .ctor()
 
-    public class Inner <D> extends B<java.util.Collection<? extends T>> implements C<D> {
-        public Inner() { /* compiled code */ }
-    }
 
-    public final class Inner2 <X> extends A<T>.Inner<X> implements C<X> {
-        public Inner2() { /* compiled code */ }
-    }
-}
+
+public class Inner /* A.Inner*/<D>  extends B<java.util.Collection<? extends T>> implements C<D> {
+  public  Inner();//  .ctor()
+
+}public final class Inner2 /* A.Inner2*/<X>  extends A<T>.Inner<X> implements C<X> {
+  public  Inner2();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/VarArgs.java b/compiler/testData/asJava/lightClasses/VarArgs.java
index cf9fbfd42f0..3ebd35cc9d5 100644
--- a/compiler/testData/asJava/lightClasses/VarArgs.java
+++ b/compiler/testData/asJava/lightClasses/VarArgs.java
@@ -1,7 +1,8 @@
-public final class C {
-    public final void f(@org.jetbrains.annotations.NotNull int... i) { /* compiled code */ }
+public final class C /* C*/ {
+  public  C();//  .ctor()
 
-    public final void p(int i, @org.jetbrains.annotations.NotNull java.lang.String... s) { /* compiled code */ }
+  public final /* vararg */ void f(@org.jetbrains.annotations.NotNull() int...);//  f(int[])
 
-    public C() { /* compiled code */ }
-}
+  public final /* vararg */ void p(int, @org.jetbrains.annotations.NotNull() java.lang.String...);//  p(int, java.lang.String[])
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java
index e2f1a74734b..bd5698c3a90 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java
@@ -1,3 +1,4 @@
-public final class B {
-    public B() { /* compiled code */ }
-}
+public final class B /* p.B*/ {
+  public  B();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java
index 027cc2431a7..a8edcac586c 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java
@@ -1,2 +1,2 @@
-public final class ActualTypeAliasKt {
+public final class ActualTypeAliasKt /* p.ActualTypeAliasKt*/ {
 }
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java
index 5d6d9acee04..8863f0e844b 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java
@@ -1,3 +1,3 @@
 @kotlin.jvm.JvmPackageName(name = "a.b.c")
-public final class ActualTypeAliasCustomJvmPackageNameKt {
+public final class ActualTypeAliasCustomJvmPackageNameKt /* a.b.c.ActualTypeAliasCustomJvmPackageNameKt*/ {
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java
index 8abeb659475..643b6afab8d 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java
@@ -1,2 +1,2 @@
-public final class AllInlineOnly {
+public final class AllInlineOnly /* p.AllInlineOnly*/ {
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
index 2e3b6e4c1db..ac48268dda4 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt
@@ -1,4 +1,5 @@
 // p.AllInlineOnly
+// WITH_RUNTIME
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("AllInlineOnly")
 
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java
index 6e5eb025bc7..99987dc2364 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java
@@ -1,17 +1,18 @@
-public final class A {
-    @kotlin.jvm.Transient
-    @kotlin.jvm.Volatile
-    @org.jetbrains.annotations.NotNull
-    private transient volatile java.lang.String c;
+public final class A /* A*/ {
+  @kotlin.jvm.Transient()
+  @kotlin.jvm.Volatile()
+  @org.jetbrains.annotations.NotNull()
+  private transient volatile java.lang.String c;
 
-    @kotlin.jvm.Synchronized
-    @kotlin.jvm.Strictfp
-    public final synchronized strictfp void f() { /* compiled code */ }
+  @kotlin.jvm.Strictfp()
+  @kotlin.jvm.Synchronized()
+  public final synchronized strictfp void f();//  f()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getC() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getC();//  getC()
 
-    public final void setC(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  public  A();//  .ctor()
+
+  public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);//  setC(java.lang.String)
 
-    public A() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java b/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java
index 1e8085706f0..bc55d50cd3f 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java
@@ -1,5 +1,6 @@
-public enum EnumNameOverride implements Bar {
-    ;
+public enum EnumNameOverride /* EnumNameOverride*/ implements Bar {
+  ;
 
-    private EnumNameOverride() { /* compiled code */ }
-}
+  private  EnumNameOverride();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java
index db21da09624..ef12094c13d 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java
@@ -1,4 +1,5 @@
 @kotlin.jvm.JvmPackageName(name = "a.b.c")
-public final class JvmPackageNameKt {
-    public static final void f() { /* compiled code */ }
+public final class JvmPackageNameKt /* a.b.c.JvmPackageNameKt*/ {
+  public static final void f();//  f()
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java
index a3325709b84..6d322675405 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java
@@ -1,9 +1,10 @@
-public interface PrivateInTrait {
-    static final class DefaultImpls {
-        private static java.lang.String getNn(PrivateInTrait $this) { /* compiled code */ }
+public abstract interface PrivateInTrait /* PrivateInTrait*/ {
 
-        private static void setNn(PrivateInTrait $this, java.lang.String value) { /* compiled code */ }
+public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
+  private static java.lang.String getN(PrivateInTrait);//  getN(PrivateInTrait)
 
-        private static java.lang.String getN(PrivateInTrait $this) { /* compiled code */ }
-    }
-}
\ No newline at end of file
+  private static java.lang.String getNn(PrivateInTrait);//  getNn(PrivateInTrait)
+
+  private static void setNn(PrivateInTrait, java.lang.String);//  setNn(PrivateInTrait, java.lang.String)
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java b/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java
index edc1dfc214a..e99b60a7a46 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java
@@ -1,18 +1,19 @@
-public final class Annotations {
-    @p.R(s = "a")
-    @p.R(s = "b")
-    @p.R(s = "c")
-    public final void repeatables1() { /* compiled code */ }
+public final class Annotations /* p.Annotations*/ {
+  @p.R(s = "a")
+  @p.R(s = "b")
+  @p.R(s = "c")
+  public final void repeatables1();//  repeatables1()
 
-    @p.R(s = "a")
-    public final void repeatables2() { /* compiled code */ }
+  @p.R(s = "a")
+  @p.R(s = "c")
+  @p.R(s = "f")
+  @p.S(g = "D")
+  @p.S(g = "b")
+  public final void repeatables3();//  repeatables3()
 
-    @p.R(s = "a")
-    @p.S(g = "b")
-    @p.R(s = "c")
-    @p.S(g = "D")
-    @p.R(s = "f")
-    public final void repeatables3() { /* compiled code */ }
+  @p.R(s = "a")
+  public final void repeatables2();//  repeatables2()
 
-    public Annotations() { /* compiled code */ }
-}
+  public  Annotations();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
index 649cbde844a..65a662f1d11 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
@@ -1,17 +1,21 @@
-public final class A {
-    private final int i;
-    private final java.lang.String i$1;
-    private final java.lang.String j;
-    private final java.lang.String j$1;
+public final class A /* A*/ {
+  private final int i;
 
-    public final void f(int i, double s) { /* compiled code */ }
+  private final java.lang.String i$1;
 
-    public final void f(int i, double s) { /* compiled code */ }
+  private final java.lang.String j$1;
 
-    public final int g(int i, double s) { /* compiled code */ }
+  private final java.lang.String j;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String g(int s, double i) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String g(int, double);//  g(int, double)
+
+  public  A();//  .ctor()
+
+  public final int g(int, double);//  g(int, double)
+
+  public final void f(int, double);//  f(int, double)
+
+  public final void f(int, double);//  f(int, double)
 
-    public A() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
index b902fcdc688..1b9c8b8349f 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
@@ -1,5 +1,6 @@
-public final class TopLevelDestructuringKt {
-    private static final int z;
+public final class TopLevelDestructuringKt /* TopLevelDestructuringKt*/ {
+  private static final int z;
 
-    public static final int getZ() { /* compiled code */ }
-}
+  public static final int getZ();//  getZ()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
index 6aa90eee653..da5740db940 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
@@ -1,14 +1,17 @@
-public interface TraitClassObjectField {
-    @org.jetbrains.annotations.NotNull
-    TraitClassObjectField.Companion Companion;
-    @org.jetbrains.annotations.Nullable
-    java.lang.String x = "";
+public abstract interface TraitClassObjectField /* TraitClassObjectField*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final TraitClassObjectField.Companion Companion;
 
-    static final class Companion {
-        @org.jetbrains.annotations.Nullable
-        public static final java.lang.String x = "";
-        private static final java.lang.String y;
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
 
-        private Companion() { /* compiled code */ }
-    }
-}
\ No newline at end of file
+
+public static final class Companion /* TraitClassObjectField.Companion*/ {
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value  */;
+
+  private static final java.lang.String y;
+
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java b/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java
index 7b6ddd37000..1aa12862a7c 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java
@@ -1,9 +1,10 @@
-public final class TwoOverrides implements java.lang.Iterable<java.lang.String>, kotlin.collections.Iterable<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
-    @org.jetbrains.annotations.Nullable
-    public java.lang.Void iterator() { /* compiled code */ }
+public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<java.lang.String>, kotlin.collections.Iterable<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
+  @org.jetbrains.annotations.Nullable()
+  public java.lang.Void iterator();//  iterator()
 
-    @org.jetbrains.annotations.Nullable
-    public java.lang.Void iterator() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public java.lang.Void iterator();//  iterator()
 
-    public TwoOverrides() { /* compiled code */ }
-}
+  public  TwoOverrides();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java b/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java
index d5c7803613d..f3173040d6a 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java
@@ -1,31 +1,32 @@
-public final class A {
-    @org.jetbrains.annotations.NotNull
-    public static final A.Companion Companion;
+public final class A /* A*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final A.Companion Companion;
 
-    public A() { /* compiled code */ }
+  @kotlin.jvm.JvmStatic()
+  public static final void f3();//  f3()
 
-    @kotlin.jvm.JvmStatic
-    public static final void f3() { /* compiled code */ }
+  public  A();//  .ctor()
 
-    public static final class Companion {
-        @kotlin.jvm.JvmName(name = "realName")
-        public final void realName() { /* compiled code */ }
 
-        @kotlin.jvm.JvmName(name = 1)
-        public final void f2() { /* compiled code */ }
+public static final class Companion /* A.Companion*/ {
+  @kotlin.jvm.JvmName()
+  public final void f4();//  f4()
 
-        @kotlin.jvm.JvmStatic
-        public final void f3() { /* compiled code */ }
+  @kotlin.jvm.JvmName(name = "realName")
+  public final void realName();//  realName()
 
-        @kotlin.jvm.JvmName
-        public final void f4() { /* compiled code */ }
+  @kotlin.jvm.JvmName(name = 1)
+  public final void f2();//  f2()
 
-        @kotlin.jvm.JvmOverloads
-        public final void f5() { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  public final void f5();//  f5()
 
-        @kotlin.jvm.JvmOverloads
-        public final void f6() { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  public final void f6();//  f6()
 
-        private Companion() { /* compiled code */ }
-    }
-}
+  @kotlin.jvm.JvmStatic()
+  public final void f3();//  f3()
+
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/delegation/Function.java b/compiler/testData/asJava/lightClasses/delegation/Function.java
index c184f995c0d..1b189c5d7f1 100644
--- a/compiler/testData/asJava/lightClasses/delegation/Function.java
+++ b/compiler/testData/asJava/lightClasses/delegation/Function.java
@@ -1,6 +1,7 @@
-public final class Derived implements Base {
-    public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
+public final class Derived /* Derived*/ implements Base {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);//  baz(java.lang.String)
+
+  public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.String baz(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/delegation/Property.java b/compiler/testData/asJava/lightClasses/delegation/Property.java
index 21acba1c939..e2216c10499 100644
--- a/compiler/testData/asJava/lightClasses/delegation/Property.java
+++ b/compiler/testData/asJava/lightClasses/delegation/Property.java
@@ -1,6 +1,7 @@
-public final class Derived implements Base {
-    public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
+public final class Derived /* Derived*/ implements Base {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.String getBoo();//  getBoo()
+
+  public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.String getBoo() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/AllPrivate.java b/compiler/testData/asJava/lightClasses/facades/AllPrivate.java
index 8f999fd931b..07c3cb76737 100644
--- a/compiler/testData/asJava/lightClasses/facades/AllPrivate.java
+++ b/compiler/testData/asJava/lightClasses/facades/AllPrivate.java
@@ -1,2 +1,2 @@
-public final class AllPrivate {
-}
+public final class AllPrivate /* p.AllPrivate*/ {
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt b/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
index a39e4df727b..1ba5d242fbc 100644
--- a/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
+++ b/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt
@@ -1,4 +1,5 @@
 // p.AllPrivate
+// WITH_RUNTIME
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("AllPrivate")
 
diff --git a/compiler/testData/asJava/lightClasses/facades/MultiFile.java b/compiler/testData/asJava/lightClasses/facades/MultiFile.java
index 10fb647940d..4691470a543 100644
--- a/compiler/testData/asJava/lightClasses/facades/MultiFile.java
+++ b/compiler/testData/asJava/lightClasses/facades/MultiFile.java
@@ -1,3 +1,4 @@
-public final class MultiFile {
-    public static final int getFoo() { /* compiled code */ }
-}
+public final class MultiFile /* test.MultiFile*/ {
+  public static final int getFoo();//  getFoo()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/MultiFile.kt b/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
index 3174dced668..a1b02f37ab1 100644
--- a/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
+++ b/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
@@ -1,5 +1,5 @@
 // test.MultiFile
-
+// WITH_RUNTIME
 @file:JvmMultifileClass
 @file:JvmName("MultiFile")
 
diff --git a/compiler/testData/asJava/lightClasses/facades/SingleFile.java b/compiler/testData/asJava/lightClasses/facades/SingleFile.java
index 53fd2aa1d34..fd093f36deb 100644
--- a/compiler/testData/asJava/lightClasses/facades/SingleFile.java
+++ b/compiler/testData/asJava/lightClasses/facades/SingleFile.java
@@ -1,3 +1,4 @@
-public final class SingleFileKt {
-    public static final void foo() { /* compiled code */ }
-}
+public final class SingleFileKt /* SingleFileKt*/ {
+  public static final void foo();//  foo()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java
index 9ea81709ad3..f251d914f26 100644
--- a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java
+++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java
@@ -1,4 +1,5 @@
 @kotlin.jvm.JvmName(name = "NewName")
-public final class NewName {
-    public static final void foo() { /* compiled code */ }
+public final class NewName /* NewName*/ {
+  public static final void foo();//  foo()
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java b/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java
index e11ea9960a4..c5c8fcd5376 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java
@@ -1,25 +1,26 @@
-@test.AllOpen
-public class C {
-    private final int p;
+@test.AllOpen()
+public class C /* test.C*/ {
+  private final int p;
 
-    public void f() { /* compiled code */ }
+  public  C();//  .ctor()
 
-    public void g() { /* compiled code */ }
+  public int getP();//  getP()
 
-    public int getP() { /* compiled code */ }
+  public void f();//  f()
 
-    public C() { /* compiled code */ }
+  public void g();//  g()
 
-    public static final class D {
-        public final void z() { /* compiled code */ }
 
-        public D() { /* compiled code */ }
-    }
 
-    @test.AllOpen
-    public static class H {
-        public void j() { /* compiled code */ }
+@test.AllOpen()
+public static class H /* test.C.H*/ {
+  public  H();//  .ctor()
 
-        public H() { /* compiled code */ }
-    }
-}
\ No newline at end of file
+  public void j();//  j()
+
+}public static final class D /* test.C.D*/ {
+  public  D();//  .ctor()
+
+  public final void z();//  z()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java
index c2b37a047f2..f1a6a61fc8a 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java
@@ -1,38 +1,37 @@
-public final class Container {
-    public Container() { /* compiled code */ }
+public final class Container /* p1.Container*/ {
+  public  Container();//  .ctor()
 
-    public static final class MyString implements java.lang.CharSequence {
-        public int getLength() { /* compiled code */ }
 
-        @org.jetbrains.annotations.NotNull
-        public error.NonExistentClass chars() { /* compiled code */ }
 
-        @org.jetbrains.annotations.NotNull
-        public error.NonExistentClass codePoints() { /* compiled code */ }
+public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
+  public  MyNumber();//  .ctor()
 
-        public char get(int index) { /* compiled code */ }
+  public byte toByte();//  toByte()
 
-        @org.jetbrains.annotations.NotNull
-        public java.lang.CharSequence subSequence(int startIndex, int endIndex) { /* compiled code */ }
+  public char toChar();//  toChar()
 
-        public MyString() { /* compiled code */ }
-    }
+  public double toDouble();//  toDouble()
 
-    public static final class MyNumber extends java.lang.Number {
-        public byte toByte() { /* compiled code */ }
+  public float toFloat();//  toFloat()
 
-        public char toChar() { /* compiled code */ }
+  public int toInt();//  toInt()
 
-        public double toDouble() { /* compiled code */ }
+  public long toLong();//  toLong()
 
-        public float toFloat() { /* compiled code */ }
+  public short toShort();//  toShort()
 
-        public int toInt() { /* compiled code */ }
+}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.CharSequence subSequence(int, int);//  subSequence(int, int)
 
-        public long toLong() { /* compiled code */ }
+  public  MyString();//  .ctor()
 
-        public short toShort() { /* compiled code */ }
+  public char get(int);//  get(int)
 
-        public MyNumber() { /* compiled code */ }
-    }
-}
+  public error.NonExistentClass chars();//  chars()
+
+  public error.NonExistentClass codePoints();//  codePoints()
+
+  public int getLength();//  getLength()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java
index 0ea9ac18be5..348538fba5d 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java
@@ -1,5 +1,6 @@
-public final class TypeHierarchyMap <TValue> implements java.util.Map<java.lang.Class<?>,TValue>, kotlin.collections.Map<java.lang.Class<?>,TValue>, kotlin.jvm.internal.markers.KMappedMarker {
-    public boolean containsKey(@org.jetbrains.annotations.NotNull java.lang.Class<?> key) { /* compiled code */ }
+public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue>  implements java.util.Map<java.lang.Class<?>,TValue>, kotlin.collections.Map<java.lang.Class<?>,TValue>, kotlin.jvm.internal.markers.KMappedMarker {
+  public  TypeHierarchyMap();//  .ctor()
+
+  public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);//  containsKey(java.lang.Class<?>)
 
-    public TypeHierarchyMap() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java
index 5df874e5a5e..5d7a414d19e 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java
@@ -1,40 +1,44 @@
-public final class SmartSet <T> extends kotlin.collections.AbstractSet<T> implements java.util.Set<T>, kotlin.collections.MutableSet<T>, kotlin.jvm.internal.markers.KMutableSet {
-    private java.lang.Object data;
-    private int size;
-    private static final int ARRAY_THRESHOLD;
-    @org.jetbrains.annotations.NotNull
-    public static final SmartSet.Companion Companion;
+public final class SmartSet /* SmartSet*/<T>  extends kotlin.collections.AbstractSet<T> implements java.util.Set<T>, kotlin.collections.MutableSet<T>, kotlin.jvm.internal.markers.KMutableSet {
+  @org.jetbrains.annotations.NotNull()
+  public static final SmartSet.Companion Companion;
 
-    public int getSize() { /* compiled code */ }
+  private int size;
 
-    public void setSize(int i) { /* compiled code */ }
+  private java.lang.Object data;
 
-    @org.jetbrains.annotations.NotNull
-    public java.util.Iterator<T> iterator() { /* compiled code */ }
+  private static final int ARRAY_THRESHOLD;
 
-    public boolean add(T element) { /* compiled code */ }
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final <T> SmartSet<T> create();// <T>  create()
 
-    public void clear() { /* compiled code */ }
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
 
-    private SmartSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.util.Iterator<T> iterator();//  iterator()
 
-    @kotlin.jvm.JvmStatic
-    @org.jetbrains.annotations.NotNull
-    public static final <T> SmartSet<T> create() { /* compiled code */ }
+  private  SmartSet();//  .ctor()
 
-    @kotlin.jvm.JvmStatic
-    @org.jetbrains.annotations.NotNull
-    public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull java.util.Collection<? extends T> set) { /* compiled code */ }
+  public boolean add(T);//  add(T)
 
-    public static final class Companion {
-        @kotlin.jvm.JvmStatic
-        @org.jetbrains.annotations.NotNull
-        public final <T> SmartSet<T> create() { /* compiled code */ }
+  public int getSize();//  getSize()
 
-        @kotlin.jvm.JvmStatic
-        @org.jetbrains.annotations.NotNull
-        public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull java.util.Collection<? extends T> set) { /* compiled code */ }
+  public void clear();//  clear()
 
-        private Companion() { /* compiled code */ }
-    }
-}
+  public void setSize(int);//  setSize(int)
+
+
+public static final class Companion /* SmartSet.Companion*/ {
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final <T> SmartSet<T> create();// <T>  create()
+
+  @kotlin.jvm.JvmStatic()
+  @org.jetbrains.annotations.NotNull()
+  public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T>  create(java.util.Collection<? extends T>)
+
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java
index 4e30aafdcd9..3643b1afce8 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java
@@ -1,7 +1,8 @@
-public final class Inheritor implements p.I, p.I2 {
-    public final void f() { /* compiled code */ }
+public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
+  public  Inheritor();//  .ctor()
 
-    public void g() { /* compiled code */ }
+  public final void f();//  f()
+
+  public void g();//  g()
 
-    public Inheritor() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java b/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java
index 9a6100bdbb1..9bdc012efa2 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java
@@ -1,7 +1,8 @@
-public final class C extends p.A {
-    public int getAp$light_idea_test_case() { /* compiled code */ }
+public final class C /* p.C*/ extends p.A {
+  public  C();//  .ctor()
 
-    public int af$light_idea_test_case() { /* compiled code */ }
+  public int af();//  af$light_idea_test_case()
 
-    public C() { /* compiled code */ }
-}
+  public int getAp();//  getAp$light_idea_test_case()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java b/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java
index ae9fa670ff1..f29d8bfa5c2 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java
@@ -1,13 +1,14 @@
-public final class C extends p.A implements p.I {
-    private final int ip;
+public final class C /* p.C*/ extends p.A implements p.I {
+  private final int ip;
 
-    public int getAp$light_idea_test_case() { /* compiled code */ }
+  public  C();//  .ctor()
 
-    public int af$light_idea_test_case() { /* compiled code */ }
+  public int <no name provided>$light_idea_test_case();//  <no name provided>$light_idea_test_case()
 
-    public int getIp$light_idea_test_case() { /* compiled code */ }
+  public int af$light_idea_test_case();//  af$light_idea_test_case()
 
-    public int $$<no name provided>$light_idea_test_case /* Real name is '<no name provided>$light_idea_test_case' */() { /* compiled code */ }
+  public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
+
+  public int getIp$light_idea_test_case();//  getIp$light_idea_test_case()
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java b/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java
index 1c094ab39c0..e51eef0f375 100644
--- a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java
+++ b/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java
@@ -1,7 +1,8 @@
-public final class C extends p.A {
-    protected int getAp() { /* compiled code */ }
+public final class C /* p.C*/ extends p.A {
+  protected int af();//  af()
 
-    protected int af() { /* compiled code */ }
+  protected int getAp();//  getAp()
 
-    public C() { /* compiled code */ }
-}
+  public  C();//  .ctor()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
index 0ef75ff2caa..4727cba5cd5 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
@@ -1,72 +1,85 @@
-public final class Class {
-    @org.jetbrains.annotations.Nullable
-    private final java.lang.String nullableVal;
-    @org.jetbrains.annotations.Nullable
-    private java.lang.String nullableVar;
-    @org.jetbrains.annotations.NotNull
-    private final java.lang.String notNullVal;
-    @org.jetbrains.annotations.NotNull
-    private java.lang.String notNullVar;
-    private final java.lang.String privateNN;
-    private final java.lang.String privateN;
+public final class Class /* Class*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String notNullVal;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  private java.lang.String notNullVar;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String nullableVal;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNullWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private java.lang.String nullableVar;
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNullWithN() { /* compiled code */ }
+  private final java.lang.String privateN;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullableWithN() { /* compiled code */ }
+  private final java.lang.String privateNN;
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullableWithNN() { /* compiled code */ }
+  public java.lang.String lateInitVar;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNotNullValWithGet();//  getNotNullValWithGet()
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNotNullVarWithGetSet();//  getNotNullVarWithGetSet()
 
-    public final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableValWithGet();//  getNullableValWithGet()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVarWithGetSet();//  getNullableVarWithGetSet()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String notNullWithN();//  notNullWithN()
 
-    public final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullableWithNN();//  nullableWithNN()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getLateInitVar();//  getLateInitVar()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVarWithGetSet(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVal();//  getNullableVal()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullableVar();//  getNullableVar()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String nullableWithN();//  nullableWithN()
+
+  @org.jetbrains.annotations.Nullable()
+  public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVarWithGetSet(java.lang.String)
+
+  public  Class();//  .ctor()
+
+  public final void setLateInitVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setLateInitVar(java.lang.String)
+
+  public final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    public Class() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
index 472a21861cf..5d4ba5eff8c 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
@@ -34,4 +34,6 @@ class Class {
 
     private val privateNN: String = { "" }()
     private val privateN: String? = { "" }()
+
+    lateinit var lateInitVar: String
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
index d91f90240ab..f1b8563a0ee 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
@@ -1,16 +1,19 @@
-public final class ClassObjectField {
-    @org.jetbrains.annotations.Nullable
-    private static final java.lang.String x;
-    private static final java.lang.String y;
-    @org.jetbrains.annotations.NotNull
-    public static final ClassObjectField.Companion Companion;
+public final class ClassObjectField /* ClassObjectField*/ {
+  @org.jetbrains.annotations.NotNull()
+  public static final ClassObjectField.Companion Companion;
 
-    public ClassObjectField() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static final java.lang.String x;
 
-    public static final class Companion {
-        @org.jetbrains.annotations.Nullable
-        public final java.lang.String getX() { /* compiled code */ }
+  private static final java.lang.String y;
 
-        private Companion() { /* compiled code */ }
-    }
-}
\ No newline at end of file
+  public  ClassObjectField();//  .ctor()
+
+
+public static final class Companion /* ClassObjectField.Companion*/ {
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getX();//  getX()
+
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
index da69321750f..6e5a7539b6a 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
@@ -1,3 +1,4 @@
-public final class ClassWithConstructor {
-    public ClassWithConstructor(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
+public final class ClassWithConstructor /* ClassWithConstructor*/ {
+  public  ClassWithConstructor(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String)
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
index 753a9a6beb2..de6f9e75be4 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
@@ -1,14 +1,16 @@
-public final class ClassWithConstructorAndProperties {
-    @org.jetbrains.annotations.Nullable
-    private final java.lang.String nullable;
-    @org.jetbrains.annotations.NotNull
-    private final java.lang.String notNull;
+public final class ClassWithConstructorAndProperties /* ClassWithConstructorAndProperties*/ {
+  @org.jetbrains.annotations.NotNull()
+  private final java.lang.String notNull;
 
-    @org.jetbrains.annotations.Nullable
-    public final java.lang.String getNullable() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private final java.lang.String nullable;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getNotNull() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getNotNull();//  getNotNull()
+
+  @org.jetbrains.annotations.Nullable()
+  public final java.lang.String getNullable();//  getNullable()
+
+  public  ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String, java.lang.String)
 
-    public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
index 07a2a1ef988..8380d0aaf40 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
@@ -1,72 +1,78 @@
-public final class FileFacadeKt {
-    @org.jetbrains.annotations.Nullable
-    private static final java.lang.String nullableVal;
-    @org.jetbrains.annotations.Nullable
-    private static java.lang.String nullableVar;
-    @org.jetbrains.annotations.NotNull
-    private static final java.lang.String notNullVal;
-    @org.jetbrains.annotations.NotNull
-    private static java.lang.String notNullVar;
-    private static final java.lang.String privateNn;
-    private static final java.lang.String privateN;
+public final class FileFacadeKt /* FileFacadeKt*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static final java.lang.String notNullVal;
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String notNullVar;
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static final java.lang.String nullableVal;
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNullWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  private static java.lang.String nullableVar;
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNullWithN() { /* compiled code */ }
+  private static final java.lang.String privateN;
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullableWithN() { /* compiled code */ }
+  private static final java.lang.String privateNn;
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullableWithNN() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNotNullValWithGet();//  getNotNullValWithGet()
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNotNullVarWithGetSet();//  getNotNullVarWithGetSet()
 
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableValWithGet();//  getNullableValWithGet()
 
-    public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVarWithGetSet();//  getNullableVarWithGetSet()
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVal() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String notNullWithN();//  notNullWithN()
 
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVar() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullableWithNN();//  nullableWithNN()
 
-    public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.Nullable
-    public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableValWithGet() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVarWithGetSet(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVal();//  getNullableVal()
 
-    @org.jetbrains.annotations.NotNull
-    public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String getNullableVar();//  getNullableVar()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
+
+  @org.jetbrains.annotations.Nullable()
+  public static final java.lang.String nullableWithN();//  nullableWithN()
+
+  @org.jetbrains.annotations.Nullable()
+  public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVarWithGetSet(java.lang.String)
+
+  private static final java.lang.String privateFun(java.lang.String, java.lang.String);//  privateFun(java.lang.String, java.lang.String)
+
+  public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    private static final java.lang.String privateFun(java.lang.String a, java.lang.String b) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
index 9b7934b7715..fc8d14ff400 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
@@ -1,12 +1,13 @@
-public interface Generic <N, NN> {
-    N a(N n);
+public abstract interface Generic /* Generic*/<N, NN>  {
+  @org.jetbrains.annotations.NotNull()
+  public abstract NN b(@org.jetbrains.annotations.NotNull() NN);//  b(NN)
 
-    @org.jetbrains.annotations.NotNull
-    NN b(@org.jetbrains.annotations.NotNull NN nn);
+  @org.jetbrains.annotations.Nullable()
+  public abstract N a1(@org.jetbrains.annotations.Nullable() N);//  a1(N)
 
-    @org.jetbrains.annotations.Nullable
-    N a1(@org.jetbrains.annotations.Nullable N n);
+  @org.jetbrains.annotations.Nullable()
+  public abstract NN b1(@org.jetbrains.annotations.Nullable() NN);//  b1(NN)
+
+  public abstract N a(N);//  a(N)
 
-    @org.jetbrains.annotations.Nullable
-    NN b1(@org.jetbrains.annotations.Nullable NN nn);
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
index dd63e82a630..d8164bd4d13 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
@@ -1,11 +1,12 @@
-public final class C implements Tr {
-    private final int v;
+public final class C /* C*/ implements Tr {
+  private final int v;
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.Integer foo() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.Integer foo();//  foo()
 
-    @org.jetbrains.annotations.NotNull
-    public java.lang.Integer getV() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public java.lang.Integer getV();//  getV()
+
+  public  C();//  .ctor()
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java
index b3915cdfa59..75acf5b479f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java
@@ -1,15 +1,16 @@
-public final class C {
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.NotNull java.lang.String o3, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+public final class C /* C*/ {
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String, java.lang.String)
 
-    @kotlin.jvm.JvmOverloads
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
+  @kotlin.jvm.JvmOverloads()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);//  foo(java.lang.String, java.lang.String)
+
+  public  C();//  .ctor()
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java
index 6e22a24a788..ac28bcdcf6f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java
@@ -1,4 +1,5 @@
-public final class NullableUnitReturnKt {
-    @org.jetbrains.annotations.Nullable
-    public static final kotlin.Unit foo() { /* compiled code */ }
+public final class NullableUnitReturnKt /* NullableUnitReturnKt*/ {
+  @org.jetbrains.annotations.Nullable()
+  public static final kotlin.Unit foo();//  foo()
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java
index ff086422eb7..6dc348da2b5 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java
@@ -1,5 +1,6 @@
-public final class C implements Base {
-    public void foo() { /* compiled code */ }
+public final class C /* C*/ implements Base {
+  public  C();//  .ctor()
+
+  public void foo();//  foo()
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java
index 8a3b52538db..2cc07ffc667 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java
@@ -1,11 +1,12 @@
-public final class PlatformTypes {
-    public final java.lang.String simplyPlatform() { /* compiled code */ }
+public final class PlatformTypes /* PlatformTypes*/ {
+  @org.jetbrains.annotations.NotNull()
+  public final java.util.List<java.lang.String> bothNotNull();//  bothNotNull()
 
-    @org.jetbrains.annotations.Nullable
-    public final java.util.List<java.lang.String> bothNullable() { /* compiled code */ }
+  @org.jetbrains.annotations.Nullable()
+  public final java.util.List<java.lang.String> bothNullable();//  bothNullable()
 
-    @org.jetbrains.annotations.NotNull
-    public final java.util.List<java.lang.String> bothNotNull() { /* compiled code */ }
+  public  PlatformTypes();//  .ctor()
 
-    public PlatformTypes() { /* compiled code */ }
-}
+  public final java.lang.String simplyPlatform();//  simplyPlatform()
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
index a5f1fcd8a74..7eb6159112f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
@@ -1,43 +1,44 @@
-public interface Primitives {
-    int $$int /* Real name is 'int' */(int i);
+public abstract interface Primitives /* Primitives*/ {
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Boolean getNullableBool();//  getNullableBool()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Boolean getNullableBool();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Byte getNullableByte();//  getNullableByte()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Byte getNullableByte();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Character getNullableChar();//  getNullableChar()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Short getNullableShort();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Double getNullableDouble();//  getNullableDouble()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Character getNullableChar();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Float getNullableFloat();//  getNullableFloat()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Integer getNullableInt();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Integer getNullableInt();//  getNullableInt()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Long getNullableLong();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Long getNullableLong();//  getNullableLong()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Float getNullableFloat();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.Short getNullableShort();//  getNullableShort()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.Double getNullableDouble();
+  public abstract boolean getBool();//  getBool()
 
-    boolean getBool();
+  public abstract byte getByte();//  getByte()
 
-    byte getByte();
+  public abstract char getChar();//  getChar()
 
-    short getShort();
+  public abstract double getDouble();//  getDouble()
 
-    char getChar();
+  public abstract float getFloat();//  getFloat()
 
-    int getInt();
+  public abstract int getInt();//  getInt()
 
-    long getLong();
+  public abstract int int(int);//  int(int)
 
-    float getFloat();
+  public abstract long getLong();//  getLong()
+
+  public abstract short getShort();//  getShort()
 
-    double getDouble();
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
index 2066732fe31..44c96e7a93a 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
@@ -1,11 +1,12 @@
-public final class PrivateInClass {
-    private final java.lang.String getNn() { /* compiled code */ }
+public final class PrivateInClass /* PrivateInClass*/ {
+  private  PrivateInClass(java.lang.String);//  .ctor(java.lang.String)
 
-    private final void setNn(java.lang.String value) { /* compiled code */ }
+  private final java.lang.String bar(java.lang.String, java.lang.String);//  bar(java.lang.String, java.lang.String)
 
-    private final java.lang.String getN() { /* compiled code */ }
+  private final java.lang.String getN();//  getN()
 
-    private final java.lang.String bar(java.lang.String a, java.lang.String b) { /* compiled code */ }
+  private final java.lang.String getNn();//  getNn()
 
-    private PrivateInClass(java.lang.String g) { /* compiled code */ }
-}
+  private final void setNn(java.lang.String);//  setNn(java.lang.String)
+
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java
index 84cf3a2178e..e39a05cab92 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java
@@ -1,11 +1,12 @@
-public final class Synthetic {
-    private final void foo() { /* compiled code */ }
+public final class Synthetic /* Synthetic*/ {
+  private final void foo();//  foo()
 
-    public Synthetic() { /* compiled code */ }
+  public  Synthetic();//  .ctor()
 
-    public final class Inner {
-        public final void test() { /* compiled code */ }
 
-        public Inner() { /* compiled code */ }
-    }
-}
+public final class Inner /* Synthetic.Inner*/ {
+  public  Inner();//  .ctor()
+
+  public final void test();//  test()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
index 85ed890a70d..c8780a425fe 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
@@ -1,37 +1,38 @@
-public interface Trait {
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String p);
+public abstract interface Trait /* Trait*/ {
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String notNullWithN();//  notNullWithN()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String p);
+  @org.jetbrains.annotations.NotNull()
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullableWithNN();//  nullableWithNN()
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNullWithNN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String getNotNullVal();//  getNotNullVal()
 
-    @org.jetbrains.annotations.Nullable
-    @org.jetbrains.annotations.NotNull
-    java.lang.String notNullWithN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String getNotNullVar();//  getNotNullVar()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullableWithN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);//  notNull(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    @org.jetbrains.annotations.Nullable
-    java.lang.String nullableWithNN();
+  @org.jetbrains.annotations.NotNull()
+  public abstract java.lang.String notNullWithNN();//  notNullWithNN()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String getNullableVal();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String getNullableVal();//  getNullableVal()
 
-    @org.jetbrains.annotations.Nullable
-    java.lang.String getNullableVar();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String getNullableVar();//  getNullableVar()
 
-    void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p);
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);//  nullable(java.lang.String)
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String getNotNullVal();
+  @org.jetbrains.annotations.Nullable()
+  public abstract java.lang.String nullableWithN();//  nullableWithN()
 
-    @org.jetbrains.annotations.NotNull
-    java.lang.String getNotNullVar();
+  public abstract void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);//  setNotNullVar(java.lang.String)
+
+  public abstract void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);//  setNullableVar(java.lang.String)
 
-    void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt
index 0e92ad9a8af..b9d1c860a91 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt
@@ -10,7 +10,7 @@ interface Trait {
     @NotNull fun notNullWithNN(): String
     @Nullable fun notNullWithN(): String
 
-    @Nullable fun nullableWithN(): String?
+    @Nullable fun `nullableWithN`(): String?
     @NotNull fun nullableWithNN(): String?
 
     val nullableVal: String?
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
index f033e4e824e..fd6a36d30e3 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
@@ -1,5 +1,6 @@
-public final class C implements Base<kotlin.Unit> {
-    public void foo(@org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
+public final class C /* C*/ implements Base<kotlin.Unit> {
+  public  C();//  .ctor()
+
+  public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);//  foo(kotlin.Unit)
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
index dbddc2628d6..3b05104abcf 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
@@ -1,3 +1,4 @@
-public final class UnitParameterKt {
-    public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
+public final class UnitParameterKt /* UnitParameterKt*/ {
+  public static final void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);//  foo(kotlin.Unit)
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
index 743eb8a6ca3..79679e25201 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
@@ -1,3 +1,4 @@
-public final class VoidReturnKt {
-    public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ }
+public final class VoidReturnKt /* VoidReturnKt*/ {
+  public static final void foo(@org.jetbrains.annotations.NotNull() java.lang.String);//  foo(java.lang.String)
+
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/object/SimpleObject.java
index b44dd9e142e..846db2cc8e0 100644
--- a/compiler/testData/asJava/lightClasses/object/SimpleObject.java
+++ b/compiler/testData/asJava/lightClasses/object/SimpleObject.java
@@ -1,21 +1,26 @@
-public final class A {
-    private static final int c;
-    @org.jetbrains.annotations.NotNull
-    private static java.lang.String v;
-    public static final int cc = 1;
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String cv = "A";
-    @org.jetbrains.annotations.NotNull
-    public static final pack.A INSTANCE;
+public final class A /* pack.A*/ {
+  @org.jetbrains.annotations.NotNull()
+  private static java.lang.String v;
 
-    public final int getC() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String cv = "A" /* initializer type: java.lang.String */ /* constant value A */;
 
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String getV() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final pack.A INSTANCE;
 
-    public final void setV(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+  private static final int c;
 
-    public final int f() { /* compiled code */ }
+  public static final int cc = 1 /* initializer type: int */ /* constant value 1 */;
+
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String getV();//  getV()
+
+  private  A();//  .ctor()
+
+  public final int f();//  f()
+
+  public final int getC();//  getC()
+
+  public final void setV(@org.jetbrains.annotations.NotNull() java.lang.String);//  setV(java.lang.String)
 
-    private A() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
index b30ed59519f..6f49f641808 100644
--- a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
+++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
@@ -1,13 +1,15 @@
-public final class C {
-    @kotlin.jvm.JvmField
-    @org.jetbrains.annotations.NotNull
-    public static final java.lang.String foo;
-    @org.jetbrains.annotations.NotNull
-    public static final C.Companion Companion;
+public final class C /* C*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public static final java.lang.String foo;
 
-    public C() { /* compiled code */ }
+  @org.jetbrains.annotations.NotNull()
+  public static final C.Companion Companion;
 
-    public static final class Companion {
-        private Companion() { /* compiled code */ }
-    }
-}
\ No newline at end of file
+  public  C();//  .ctor()
+
+
+public static final class Companion /* C.Companion*/ {
+  private  Companion();//  .ctor()
+
+}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.java b/compiler/testData/asJava/lightClasses/publicField/Simple.java
index 706bf671576..68ce61d31e3 100644
--- a/compiler/testData/asJava/lightClasses/publicField/Simple.java
+++ b/compiler/testData/asJava/lightClasses/publicField/Simple.java
@@ -1,7 +1,8 @@
-public final class C {
-    @kotlin.jvm.JvmField
-    @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo;
+public final class C /* C*/ {
+  @kotlin.jvm.JvmField()
+  @org.jetbrains.annotations.NotNull()
+  public final java.lang.String foo;
+
+  public  C();//  .ctor()
 
-    public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/script/HelloWorld.java b/compiler/testData/asJava/lightClasses/script/HelloWorld.java
index a653d218be8..1b0b1af7276 100644
--- a/compiler/testData/asJava/lightClasses/script/HelloWorld.java
+++ b/compiler/testData/asJava/lightClasses/script/HelloWorld.java
@@ -1,5 +1,6 @@
-public class HelloWorld extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
-    public static final void main(java.lang.String[] p) { /* compiled code */ }
+public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  HelloWorld(java.lang.String[]);//  .ctor(java.lang.String[])
+
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
-    public HelloWorld(java.lang.String[] p) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/script/InnerClasses.java
index bd9c476c0ea..05b0ee4bdfc 100644
--- a/compiler/testData/asJava/lightClasses/script/InnerClasses.java
+++ b/compiler/testData/asJava/lightClasses/script/InnerClasses.java
@@ -1,24 +1,26 @@
-public class InnerClasses extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
-    public static final void main(java.lang.String[] p) { /* compiled code */ }
+public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  InnerClasses(java.lang.String[]);//  .ctor(java.lang.String[])
 
-    public InnerClasses(java.lang.String[] p) { /* compiled code */ }
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
-    public static final class Bar {
-        private final int b;
-        private final int a;
 
-        public final int getB() { /* compiled code */ }
+public static final class Bar /* InnerClasses.Bar*/ {
+  private final int a;
 
-        public final int getAPlusB() { /* compiled code */ }
+  private final int b;
 
-        public final int getA() { /* compiled code */ }
+  public  Bar(int);//  .ctor(int)
 
-        public Bar(int a) { /* compiled code */ }
+  public final int getA();//  getA()
 
-        public static final class Baz {
-            public final void doSomething() { /* compiled code */ }
+  public final int getAPlusB();//  getAPlusB()
 
-            public Baz() { /* compiled code */ }
-        }
-    }
-}
+  public final int getB();//  getB()
+
+
+public static final class Baz /* InnerClasses.Bar.Baz*/ {
+  public  Baz();//  .ctor()
+
+  public final void doSomething();//  doSomething()
+
+}}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/script/ide/HelloWorld.java b/compiler/testData/asJava/script/ide/HelloWorld.java
index cc01b0f9167..d9e31420975 100644
--- a/compiler/testData/asJava/script/ide/HelloWorld.java
+++ b/compiler/testData/asJava/script/ide/HelloWorld.java
@@ -1,5 +1,6 @@
-public class HelloWorld {
-    public static final void main(java.lang.String[] p) { /* compiled code */ }
+public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  HelloWorld();//  .ctor()
+
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
-    public HelloWorld() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/script/ide/InnerClasses.java b/compiler/testData/asJava/script/ide/InnerClasses.java
index 5c50f1ca54a..0064ceca6df 100644
--- a/compiler/testData/asJava/script/ide/InnerClasses.java
+++ b/compiler/testData/asJava/script/ide/InnerClasses.java
@@ -1,24 +1,26 @@
-public class InnerClasses {
-    public static final void main(java.lang.String[] p) { /* compiled code */ }
+public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  InnerClasses();//  .ctor()
 
-    public InnerClasses() { /* compiled code */ }
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
-    public static final class Bar {
-        private final int b;
-        private final int a;
 
-        public final int getB() { /* compiled code */ }
+public static final class Bar /* InnerClasses.Bar*/ {
+  private final int a;
 
-        public final int getAPlusB() { /* compiled code */ }
+  private final int b;
 
-        public final int getA() { /* compiled code */ }
+  public  Bar(int);//  .ctor(int)
 
-        public Bar(int a) { /* compiled code */ }
+  public final int getA();//  getA()
 
-        public static final class Baz {
-            public final void doSomething() { /* compiled code */ }
+  public final int getAPlusB();//  getAPlusB()
 
-            public Baz() { /* compiled code */ }
-        }
-    }
-}
+  public final int getB();//  getB()
+
+
+public static final class Baz /* InnerClasses.Bar.Baz*/ {
+  public  Baz();//  .ctor()
+
+  public final void doSomething();//  doSomething()
+
+}}}
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java b/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java
index b326da8653b..7c15fdbd770 100644
--- a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java
+++ b/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java
@@ -5,7 +5,6 @@ public abstract @interface Anno /* Anno*/ {
 public final class TestClass /* TestClass*/ {
   private int hello;
 
-  @null()
   public  TestClass(int);//  .ctor(int)
 
   public final int getHello();//  getHello()
diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java b/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java
index 06ccaab02b4..a700d9ed24a 100644
--- a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java
+++ b/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java
@@ -1,34 +1,28 @@
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface SimpleAnn /* SimpleAnn*/ {
-  @null()
   public abstract java.lang.String value();//  value()
 
 }
 
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Ann /* Ann*/ {
-  @null()
   public abstract SimpleAnn[] t();//  t()
 
-  @null()
+  public abstract int x();//  x()
+
   public abstract java.lang.Class<?> z();//  z()
 
-  @null()
   public abstract java.lang.Class<?>[] e();//  e()
 
-  @null()
   public abstract java.lang.String y();//  y()
 
-  @null()
   public abstract kotlin.DeprecationLevel depr();//  depr()
 
-  public abstract int x();//  x()
-
 }
 
 public abstract interface Base /* Base*/ {
-  @Ann(x = 1, y = "134", z = String::class, e = {Int::class, Double::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")})
-  public abstract void foo(@Ann(x = 2, y = "324", z = Ann::class, e = {Byte::class, Base::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(java.lang.String)
+  @Ann(x = 1, y = "134", z = String::class, e = {Int::class, Double::class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")})
+  public abstract void foo(@Ann(x = 2, y = "324", z = Ann::class, e = {Byte::class, Base::class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(java.lang.String)
 
 }
 
@@ -36,7 +30,6 @@ public final class Derived /* Derived*/ implements Base {
   @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="243"), @SimpleAnn(value="4324")})
   public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);//  foo(java.lang.String)
 
-  @null()
   public  Derived(@org.jetbrains.annotations.NotNull() Base);//  .ctor(Base)
 
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java b/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java
index 59ed1799f75..2f12236d8f8 100644
--- a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java
+++ b/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java
@@ -1,5 +1,4 @@
 public final class Foo /* c.b.a.Foo*/ {
-  @null()
   public  Foo();//  .ctor()
 
   public final void bar();//  bar()
@@ -7,9 +6,10 @@ public final class Foo /* c.b.a.Foo*/ {
 }
 
 public static final class A$B /* null*/ {
-  @null()
   public  A$B();//  .ctor()
 
+
+
   class $$$$$$$ ...
 
     class C$D ...
@@ -17,21 +17,19 @@ public static final class A$B /* null*/ {
   }
 
 public final class C$D /* null*/ {
-  @null()
   public  C$D();//  .ctor()
 
 }
 
 public final class $$$$$$$ /* null*/ {
-  @null()
   public  $$$$$$$();//  .ctor()
 
+
   class G$G$ ...
 
   }
 
 public final class G$G$ /* null*/ {
-  @null()
   public  G$G$();//  .ctor()
 
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java b/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java
index 0fb2d7c7ecc..6553e0edb46 100644
--- a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java
+++ b/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java
@@ -1,7 +1,6 @@
 public final class Prop /* Prop*/ {
   private final java.lang.Object someProp;
 
-  @null()
   public  Prop();//  .ctor()
 
 }
@@ -12,16 +11,16 @@ final class null /* null*/ {
 }
 
 final class C /* C*/ {
-  private final int y;
-
+  @org.jetbrains.annotations.NotNull()
   private final kotlin.jvm.functions.Function0<java.lang.Object> initChild;
 
-  @null()
-  public  C(int);//  .ctor(int)
+  private final int y;
 
   @org.jetbrains.annotations.NotNull()
   public final kotlin.jvm.functions.Function0<java.lang.Object> getInitChild();//  getInitChild()
 
+  public  C(int);//  .ctor(int)
+
   public final int getY();//  getY()
 
 }
@@ -35,17 +34,17 @@ final class null /* null*/ {
 }
 
 public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
+  @org.jetbrains.annotations.NotNull()
   private final java.lang.Runnable x;
 
-  @null()
-  public  ValidPublicSupertype();//  .ctor()
-
   @org.jetbrains.annotations.NotNull()
   public final java.lang.Runnable bar();//  bar()
 
   @org.jetbrains.annotations.NotNull()
   public final java.lang.Runnable getX();//  getX()
 
+  public  ValidPublicSupertype();//  .ctor()
+
 }
 
 final class null /* null*/ implements java.lang.Runnable {
@@ -66,17 +65,17 @@ public abstract interface I /* I*/ {
 }
 
 public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ {
+  @org.jetbrains.annotations.NotNull()
   private final java.lang.Runnable x;
 
-  @null()
-  public  InvalidPublicSupertype();//  .ctor()
-
   @org.jetbrains.annotations.NotNull()
   public final java.lang.Runnable bar();//  bar()
 
   @org.jetbrains.annotations.NotNull()
   public final java.lang.Runnable getX();//  getX()
 
+  public  InvalidPublicSupertype();//  .ctor()
+
 }
 
 final class null /* null*/ implements I, java.lang.Runnable {
diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.java b/compiler/testData/asJava/ultraLightClasses/inlineClasses.java
index c01353737d3..b0260f362bf 100644
--- a/compiler/testData/asJava/ultraLightClasses/inlineClasses.java
+++ b/compiler/testData/asJava/ultraLightClasses/inlineClasses.java
@@ -9,7 +9,6 @@ public enum Foo /* Foo*/ {
 }
 
 public final class InlinedDelegate /* InlinedDelegate*/<T>  {
-  @null()
   public final T getNode();//  getNode()
 
 }
diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java
index 1e066c7028b..935e1b848e2 100644
--- a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java
+++ b/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java
@@ -1,5 +1,4 @@
 public final class X /* X*/ {
-  @null()
   public  X();//  .ctor()
 
   public final int getW();//  getW()
diff --git a/compiler/testData/asJava/ultraLightClasses/localClassDerived.java b/compiler/testData/asJava/ultraLightClasses/localClassDerived.java
index 4ae5e470c31..9244cd1d7ca 100644
--- a/compiler/testData/asJava/ultraLightClasses/localClassDerived.java
+++ b/compiler/testData/asJava/ultraLightClasses/localClassDerived.java
@@ -1,5 +1,4 @@
 public final class Boo /* Boo*/ {
-  @null()
   public  Boo();//  .ctor()
 
   public final void fooBar();//  fooBar()
@@ -7,13 +6,11 @@ public final class Boo /* Boo*/ {
 }
 
 public static final class LocalClassBase /* null*/ {
-  @null()
   public  LocalClassBase();//  .ctor()
 
 }
 
 public static final class LocalClassDerived /* null*/ extends LocalClassBase {
-  @null()
   public  LocalClassDerived();//  .ctor()
 
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightClasses/properties.kt b/compiler/testData/asJava/ultraLightClasses/properties.kt
index f64f76df32b..2bff3f7785c 100644
--- a/compiler/testData/asJava/ultraLightClasses/properties.kt
+++ b/compiler/testData/asJava/ultraLightClasses/properties.kt
@@ -91,9 +91,6 @@ class MyProperty<T> {
 class Modifiers {
   @delegate:Transient
   val plainField: Int = 1
-
-  @delegate:Transient
-  val lazy by lazy { 1 }
 }
 
 interface A {
diff --git a/compiler/testData/asJava/ultraLightFacades/properties.kt b/compiler/testData/asJava/ultraLightFacades/properties.kt
index 3be03924587..3702c98e299 100644
--- a/compiler/testData/asJava/ultraLightFacades/properties.kt
+++ b/compiler/testData/asJava/ultraLightFacades/properties.kt
@@ -61,9 +61,6 @@ operator fun setValue(t: T, p: KProperty<*>, i: Int) {}
 @delegate:Transient
 val plainField: Int = 1
 
-@delegate:Transient
-val lazy by lazy { 1 }
-
 public var int1: Int
 	private set
 	protected get
diff --git a/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java b/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java
index 973567c1190..a0bcb47a306 100644
--- a/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java
+++ b/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java
@@ -1,4 +1,4 @@
-public class FunsPropsAndFields /* FunsPropsAndFields*/ {
+public class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
   @kotlin.jvm.JvmField()
   public final int testField;
 
@@ -6,18 +6,17 @@ public class FunsPropsAndFields /* FunsPropsAndFields*/ {
 
   private int testPropVar;
 
-  @null()
-  public  FunsPropsAndFields(@null() java.lang.String[]);//  .ctor(java.lang.String[])
-
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String testFun(int);//  testFun(int)
 
+  public  FunsPropsAndFields(java.lang.String[]);//  .ctor(java.lang.String[])
+
   public final int getTestPropVal();//  getTestPropVal()
 
   public final int getTestPropVar();//  getTestPropVar()
 
   public final void setTestPropVar(int);//  setTestPropVar(int)
 
-  public static final void main(@null() java.lang.String[]);//  main(java.lang.String[])
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightScripts/HelloWorld.java b/compiler/testData/asJava/ultraLightScripts/HelloWorld.java
index 93a54b37436..1b0b1af7276 100644
--- a/compiler/testData/asJava/ultraLightScripts/HelloWorld.java
+++ b/compiler/testData/asJava/ultraLightScripts/HelloWorld.java
@@ -1,7 +1,6 @@
-public class HelloWorld /* HelloWorld*/ {
-  @null()
-  public  HelloWorld(@null() java.lang.String[]);//  .ctor(java.lang.String[])
+public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  HelloWorld(java.lang.String[]);//  .ctor(java.lang.String[])
 
-  public static final void main(@null() java.lang.String[]);//  main(java.lang.String[])
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/ultraLightScripts/InnerClasses.java b/compiler/testData/asJava/ultraLightScripts/InnerClasses.java
index b0d7b7b774c..bbd12d76700 100644
--- a/compiler/testData/asJava/ultraLightScripts/InnerClasses.java
+++ b/compiler/testData/asJava/ultraLightScripts/InnerClasses.java
@@ -1,8 +1,7 @@
-public class InnerClasses /* InnerClasses*/ {
-  @null()
-  public  InnerClasses(@null() java.lang.String[]);//  .ctor(java.lang.String[])
+public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  public  InnerClasses(java.lang.String[]);//  .ctor(java.lang.String[])
 
-  public static final void main(@null() java.lang.String[]);//  main(java.lang.String[])
+  public static final void main(java.lang.String[]);//  main(java.lang.String[])
 
 
   class Bar ...
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
index dad28138876..c8b6202b956 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiClass
 import com.intellij.psi.impl.compiled.ClsElementImpl
 import junit.framework.TestCase
+import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
@@ -22,7 +23,7 @@ object LightClassTestCommon {
         expectedFile: File,
         testDataFile: File,
         findLightClass: (String) -> PsiClass?,
-        normalizeText: (String) -> String
+        normalizeText: (String) -> String,
     ) {
         val text = FileUtil.loadFile(testDataFile, true)
         val matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text)
@@ -40,14 +41,7 @@ object LightClassTestCommon {
             return NOT_GENERATED_DIRECTIVE
         }
         TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KtLightClass)
-
-        val delegate = (lightClass as KtLightClass).clsDelegate
-        TestCase.assertTrue("Not a CLS element: $delegate", delegate is ClsElementImpl)
-
-        val buffer = StringBuilder()
-        (delegate as ClsElementImpl).appendMirrorText(0, buffer)
-
-        return normalizeText(buffer.toString())
+        return normalizeText(lightClass.renderClass(renderInner = true))
     }
 
     // Actual text for light class is generated with ClsElementImpl.appendMirrorText() that can find empty DefaultImpl inner class in stubs
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt
new file mode 100644
index 00000000000..dc053132870
--- /dev/null
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.asJava
+
+import com.intellij.psi.*
+import com.intellij.psi.util.MethodSignature
+import org.jetbrains.kotlin.asJava.elements.KtLightNullabilityAnnotation
+import org.jetbrains.kotlin.asJava.elements.KtLightPsiArrayInitializerMemberValue
+import org.jetbrains.kotlin.asJava.elements.KtLightPsiLiteral
+import org.jetbrains.kotlin.load.kotlin.NON_EXISTENT_CLASS_NAME
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.Name
+
+object PsiClassRenderer {
+    private fun PsiType.renderType() = getCanonicalText(true)
+
+    private fun PsiReferenceList?.renderRefList(keyword: String, sortReferences: Boolean = true): String {
+        if (this == null) return ""
+
+        val references = referencedTypes
+        if (references.isEmpty()) return ""
+
+        val referencesTypes = references.map { it.renderType() }.toTypedArray()
+
+        if (sortReferences) referencesTypes.sort()
+
+        return " " + keyword + " " + referencesTypes.joinToString()
+    }
+
+    private fun PsiVariable.renderVar(): String {
+        var result = this.renderModifiers(type) + type.renderType() + " " + name
+        if (this is PsiParameter && this.isVarArgs) {
+            result += " /* vararg */"
+        }
+
+        if (hasInitializer()) {
+            result += " = ${initializer?.text} /* initializer type: ${initializer?.type?.renderType()} */"
+        }
+
+        computeConstantValue()?.let { result += " /* constant value $it */" }
+
+        return result
+    }
+
+    private fun Array<PsiTypeParameter>.renderTypeParams() =
+        if (isEmpty()) ""
+        else "<" + joinToString {
+            val bounds =
+                if (it.extendsListTypes.isNotEmpty())
+                    " extends " + it.extendsListTypes.joinToString(" & ", transform = { it.renderType() })
+                else ""
+            it.name!! + bounds
+        } + "> "
+
+    private fun KtLightPsiLiteral.renderKtLightPsiLiteral(): String =
+        (value as? Pair<*, *>)?.let {
+            val classId = it.first as? ClassId
+            val name = it.second as? Name
+            if (classId != null && name != null) "${classId.asSingleFqName()}.${name.asString()}" else null
+        } ?: text
+
+    private fun PsiAnnotationMemberValue.renderAnnotationMemberValue(): String = when (this) {
+        is KtLightPsiArrayInitializerMemberValue -> "{${initializers.joinToString { it.renderAnnotationMemberValue() }}}"
+        is PsiAnnotation -> renderAnnotation()
+        is KtLightPsiLiteral -> renderKtLightPsiLiteral()
+        else -> text
+    }
+
+    private fun PsiMethod.renderMethod() =
+        renderModifiers(returnType) +
+                (if (isVarArgs) "/* vararg */ " else "") +
+                typeParameters.renderTypeParams() +
+                (returnType?.renderType() ?: "") + " " +
+                name +
+                "(" + parameterList.parameters.joinToString { it.renderModifiers(it.type) + it.type.renderType() } + ")" +
+                (this as? PsiAnnotationMethod)?.defaultValue?.let { " default " + it.renderAnnotationMemberValue() }.orEmpty() +
+                throwsList.referencedTypes.let { thrownTypes ->
+                    if (thrownTypes.isEmpty()) ""
+                    else " throws " + thrownTypes.joinToString { it.renderType() }
+                } +
+                ";" +
+                "// ${getSignature(PsiSubstitutor.EMPTY).renderSignature()}"
+
+    private fun MethodSignature.renderSignature(): String {
+        val typeParams = typeParameters.renderTypeParams()
+        val paramTypes = parameterTypes.joinToString(prefix = "(", postfix = ")") { it.renderType() }
+        val name = if (isConstructor) ".ctor" else name
+        return "$typeParams $name$paramTypes"
+    }
+
+    private fun PsiEnumConstant.renderEnumConstant(renderInner: Boolean): String {
+        val initializingClass = initializingClass ?: return name
+
+        return buildString {
+            appendLine("$name {")
+            append(initializingClass.renderMembers(renderInner))
+            append("}")
+        }
+    }
+
+    fun PsiClass.renderClass(renderInner: Boolean = false): String {
+        val classWord = when {
+            isAnnotationType -> "@interface"
+            isInterface -> "interface"
+            isEnum -> "enum"
+            else -> "class"
+        }
+
+        return buildString {
+            append(renderModifiers())
+            append("$classWord ")
+            append("$name /* $qualifiedName*/")
+            append(typeParameters.renderTypeParams())
+            append(extendsList.renderRefList("extends"))
+            append(implementsList.renderRefList("implements"))
+            appendLine(" {")
+
+            if (isEnum) {
+                append(
+                    fields
+                        .filterIsInstance<PsiEnumConstant>()
+                        .joinToString(",\n") { it.renderEnumConstant(renderInner) }.prependDefaultIndent()
+                )
+                append(";\n\n")
+            }
+
+            append(renderMembers(renderInner))
+
+            append("}")
+        }
+    }
+
+    private fun PsiClass.renderMembers(renderInner: Boolean): String {
+        return buildString {
+            appendSorted(
+                fields
+                    .filterNot { it is PsiEnumConstant }
+                    .map { it.renderVar().prependDefaultIndent() + ";\n\n" }
+            )
+
+            appendSorted(
+                methods
+                    .map { it.renderMethod().prependDefaultIndent() + "\n\n" }
+            )
+
+            appendSorted(
+                innerClasses.map {
+                    appendLine()
+                    if (renderInner)
+                        it.renderClass(renderInner)
+                    else
+                        "class ${it.name} ...\n\n".prependDefaultIndent()
+                }
+            )
+        }
+    }
+
+    private fun StringBuilder.appendSorted(list: List<String>) {
+        append(list.sorted().joinToString(""))
+    }
+
+    private fun String.prependDefaultIndent() = prependIndent("  ")
+
+    private fun PsiAnnotation.renderAnnotation(): String {
+
+        if (qualifiedName == "kotlin.Metadata") return ""
+
+        val renderedAttributes = parameterList.attributes.map {
+            val attributeValue = it.value?.renderAnnotationMemberValue() ?: "?"
+
+            val isAnnotationQualifiedName =
+                (qualifiedName?.startsWith("java.lang.annotation.") == true || qualifiedName?.startsWith("kotlin.annotation.") == true)
+
+            val name = if (it.name == null && isAnnotationQualifiedName) "value" else it.name
+
+
+            if (name != null) "$name = $attributeValue" else attributeValue
+        }
+
+        val renderedAttributesString = renderedAttributes.joinToString()
+        if (qualifiedName == null && renderedAttributesString.isEmpty()) {
+            return ""
+        }
+        return "@$qualifiedName(${renderedAttributes.joinToString()})"
+    }
+
+
+    private fun PsiModifierListOwner.renderModifiers(typeIfApplicable: PsiType? = null): String {
+        val annotationsBuffer = mutableListOf<String>()
+        var nullableIsRendered = false
+        var notNullIsRendered = false
+
+        for (annotation in annotations) {
+            if (annotation is KtLightNullabilityAnnotation<*> && skipRenderingNullability(typeIfApplicable)) {
+                continue
+            }
+
+            if (annotation.qualifiedName == "org.jetbrains.annotations.Nullable") {
+                if (nullableIsRendered) continue
+                nullableIsRendered = true
+            }
+
+            if (annotation.qualifiedName == "org.jetbrains.annotations.NotNull") {
+                if (notNullIsRendered) continue
+                notNullIsRendered = true
+            }
+
+            val renderedAnnotation = annotation.renderAnnotation()
+            if (renderedAnnotation.isNotEmpty()) {
+                annotationsBuffer.add(
+                    renderedAnnotation + (if (this is PsiParameter) " " else "\n")
+                )
+            }
+        }
+        annotationsBuffer.sort()
+
+        val resultBuffer = StringBuffer(annotationsBuffer.joinToString(separator = ""))
+        for (modifier in PsiModifier.MODIFIERS.filter(::hasModifierProperty)) {
+            if (modifier == PsiModifier.DEFAULT) {
+                resultBuffer.append(PsiModifier.ABSTRACT).append(" ")
+            } else if (modifier != PsiModifier.FINAL || !(this is PsiClass && this.isEnum)) {
+                resultBuffer.append(modifier).append(" ")
+            }
+        }
+        return resultBuffer.toString()
+    }
+
+    private val NON_EXISTENT_QUALIFIED_CLASS_NAME = NON_EXISTENT_CLASS_NAME.replace("/", ".")
+
+    private fun isPrimitiveOrNonExisting(typeIfApplicable: PsiType?): Boolean {
+        if (typeIfApplicable is PsiPrimitiveType) return true
+        if (typeIfApplicable?.getCanonicalText(false) == NON_EXISTENT_QUALIFIED_CLASS_NAME) return true
+
+        return typeIfApplicable is PsiPrimitiveType
+    }
+
+    private fun PsiModifierListOwner.skipRenderingNullability(typeIfApplicable: PsiType?) =
+        isPrimitiveOrNonExisting(typeIfApplicable)// || isPrivateOrParameterInPrivateMethod()
+
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
index 08ba470514c..9dbafd8c571 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
@@ -121,7 +121,7 @@ class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() {
         myFixture.testHighlighting("Autowired.java", "AnnotatedClass.kt")
 
         val annotations = myFixture.findClass("AnnotatedClass").fields.single()
-            .expectAnnotations(2).single { it.qualifiedName == "Autowired" }
+            .expectAnnotations(1).single { it.qualifiedName == "Autowired" }
         val annotationAttributeVal = annotations.findAttributeValue("required") as PsiElement
         assertTextRangeAndValue("true", true, annotationAttributeVal)
     }
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
index 11950671565..c4277a4a995 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.asJava.classes
 
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
+import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.idea.perf.UltraLightChecker
 import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkDescriptorsLeak
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
diff --git a/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
index 52de3198a1e..b1690b74d8f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/perf/UltraLightChecker.kt
@@ -10,25 +10,21 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Conditions
 import com.intellij.openapi.util.Disposer
-import com.intellij.psi.*
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.SyntaxTraverser
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.util.MethodSignature
 import com.intellij.testFramework.UsefulTestCase
 import com.intellij.util.PairProcessor
 import com.intellij.util.ref.DebugReflectionUtil
 import junit.framework.TestCase
 import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
+import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
 import org.jetbrains.kotlin.asJava.classes.*
-import org.jetbrains.kotlin.asJava.elements.KtLightNullabilityAnnotation
-import org.jetbrains.kotlin.asJava.elements.KtLightPsiArrayInitializerMemberValue
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.j2k.getContainingClass
-import org.jetbrains.kotlin.load.kotlin.NON_EXISTENT_CLASS_NAME
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
@@ -131,188 +127,6 @@ object UltraLightChecker {
         }
     }
 
-    private fun PsiAnnotation.renderAnnotation(): String {
-
-        val renderedAttributes = parameterList.attributes.map {
-            val attributeValue = it.value?.renderAnnotationMemberValue() ?: "?"
-
-            val name = when {
-                it.name === null && qualifiedName?.startsWith("java.lang.annotation.") == true -> "value"
-                else -> it.name
-            }
-
-            if (name !== null) "$name = $attributeValue" else attributeValue
-        }
-        return "@$qualifiedName(${renderedAttributes.joinToString()})"
-    }
-
-
-    private fun PsiModifierListOwner.renderModifiers(typeIfApplicable: PsiType? = null): String {
-        val annotationsBuffer = mutableListOf<String>()
-        for (annotation in annotations) {
-            if (annotation is KtLightNullabilityAnnotation<*> && skipRenderingNullability(typeIfApplicable)) {
-                continue
-            }
-
-            annotationsBuffer.add(
-                annotation.renderAnnotation() + (if (this is PsiParameter) " " else "\n")
-            )
-        }
-        annotationsBuffer.sort()
-
-        val resultBuffer = StringBuffer(annotationsBuffer.joinToString(separator = ""))
-        for (modifier in PsiModifier.MODIFIERS.filter(::hasModifierProperty)) {
-            resultBuffer.append(modifier).append(" ")
-        }
-        return resultBuffer.toString()
-    }
-
-    private fun PsiModifierListOwner.skipRenderingNullability(typeIfApplicable: PsiType?) =
-        isPrimitiveOrNonExisting(typeIfApplicable) || isPrivateOrParameterInPrivateMethod()
-
-    private val NON_EXISTENT_QUALIFIED_CLASS_NAME = NON_EXISTENT_CLASS_NAME.replace("/", ".")
-
-    private fun isPrimitiveOrNonExisting(typeIfApplicable: PsiType?): Boolean {
-        if (typeIfApplicable is PsiPrimitiveType) return true
-        if (typeIfApplicable?.getCanonicalText(false) == NON_EXISTENT_QUALIFIED_CLASS_NAME) return true
-
-        return typeIfApplicable is PsiPrimitiveType
-    }
-
-    private fun PsiType.renderType() = getCanonicalText(true)
-
-    private fun PsiReferenceList?.renderRefList(keyword: String, sortReferences: Boolean = true): String {
-        if (this == null) return ""
-
-        val references = referencedTypes
-        if (references.isEmpty()) return ""
-
-        val referencesTypes = references.map { it.renderType() }.toTypedArray()
-
-        if (sortReferences) referencesTypes.sort()
-
-        return " " + keyword + " " + referencesTypes.joinToString()
-    }
-
-    private fun PsiVariable.renderVar(): String {
-        var result = this.renderModifiers(type) + type.renderType() + " " + name
-        if (this is PsiParameter && this.isVarArgs) {
-            result += " /* vararg */"
-        }
-
-        if (hasInitializer()) {
-            result += " = ${initializer?.text} /* initializer type: ${initializer?.type?.renderType()} */"
-        }
-
-        computeConstantValue()?.let { result += " /* constant value $it */" }
-
-        return result
-    }
-
-    private fun Array<PsiTypeParameter>.renderTypeParams() =
-        if (isEmpty()) ""
-        else "<" + joinToString {
-            val bounds =
-                if (it.extendsListTypes.isNotEmpty())
-                    " extends " + it.extendsListTypes.joinToString(" & ", transform = { it.renderType() })
-                else ""
-            it.name!! + bounds
-        } + "> "
-
-    private fun PsiAnnotationMemberValue.renderAnnotationMemberValue(): String = when (this) {
-        is KtLightPsiArrayInitializerMemberValue -> "{${initializers.joinToString { it.renderAnnotationMemberValue() }}}"
-        is PsiAnnotation -> renderAnnotation()
-        else -> text
-    }
-
-    private fun PsiMethod.renderMethod() =
-        renderModifiers(returnType) +
-                (if (isVarArgs) "/* vararg */ " else "") +
-                typeParameters.renderTypeParams() +
-                (returnType?.renderType() ?: "") + " " +
-                name +
-                "(" + parameterList.parameters.joinToString { it.renderModifiers(it.type) + it.type.renderType() } + ")" +
-                (this as? PsiAnnotationMethod)?.defaultValue?.let { " default " + it.renderAnnotationMemberValue() }.orEmpty() +
-                throwsList.referencedTypes.let { thrownTypes ->
-                    if (thrownTypes.isEmpty()) ""
-                    else " throws " + thrownTypes.joinToString { it.renderType() }
-                } +
-                ";" +
-                "// ${getSignature(PsiSubstitutor.EMPTY).renderSignature()}"
-
-    private fun MethodSignature.renderSignature(): String {
-        val typeParams = typeParameters.renderTypeParams()
-        val paramTypes = parameterTypes.joinToString(prefix = "(", postfix = ")") { it.renderType() }
-        val name = if (isConstructor) ".ctor" else name
-        return "$typeParams $name$paramTypes"
-    }
-
-    private fun PsiEnumConstant.renderEnumConstant(): String {
-        val initializingClass = initializingClass ?: return name
-
-        return buildString {
-            appendLine("$name {")
-            append(initializingClass.renderMembers())
-            append("}")
-        }
-    }
-
-    fun PsiClass.renderClass(): String {
-        val classWord = when {
-            isAnnotationType -> "@interface"
-            isInterface -> "interface"
-            isEnum -> "enum"
-            else -> "class"
-        }
-
-        return buildString {
-            append(renderModifiers())
-            append("$classWord ")
-            append("$name /* $qualifiedName*/")
-            append(typeParameters.renderTypeParams())
-            append(extendsList.renderRefList("extends"))
-            append(implementsList.renderRefList("implements"))
-            appendLine(" {")
-
-            if (isEnum) {
-                append(
-                    fields
-                        .filterIsInstance<PsiEnumConstant>()
-                        .joinToString(",\n") { it.renderEnumConstant() }.prependDefaultIndent()
-                )
-                append(";\n\n")
-            }
-
-            append(renderMembers())
-            append("}")
-        }
-    }
-
-    private fun PsiClass.renderMembers(): String {
-        return buildString {
-            appendSorted(
-                fields
-                    .filterNot { it is PsiEnumConstant }
-                    .map { it.renderVar().prependDefaultIndent() + ";\n\n" }
-            )
-
-            appendSorted(
-                methods
-                    .map { it.renderMethod().prependDefaultIndent() + "\n\n" }
-            )
-
-            appendSorted(
-                innerClasses.map { "class ${it.name} ...\n\n".prependDefaultIndent() }
-            )
-        }
-    }
-
-    private fun StringBuilder.appendSorted(list: List<String>) {
-        append(list.sorted().joinToString(""))
-    }
-
-    private fun String.prependDefaultIndent() = prependIndent("  ")
-
     private fun checkDescriptorLeakOnElement(element: PsiElement) {
         DebugReflectionUtil.walkObjects(
             10,
diff --git a/plugins/uast-kotlin/testData/Anonymous.log.txt b/plugins/uast-kotlin/testData/Anonymous.log.txt
index 811864d741d..295a6fc2dea 100644
--- a/plugins/uast-kotlin/testData/Anonymous.log.txt
+++ b/plugins/uast-kotlin/testData/Anonymous.log.txt
@@ -10,7 +10,7 @@ UFile (package = )
                             UClass (name = null)
                                 UMethod (name = run)
                                     UBlockExpression
-                                UMethod (name = AnonymousKt$foo$runnable$1)
+                                UMethod (name = )
                 UQualifiedReferenceExpression
                     USimpleNameReferenceExpression (identifier = runnable)
                     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
@@ -39,7 +39,7 @@ UFile (package = )
                                     UBlockExpression
                                 UMethod (name = run)
                                     UBlockExpression
-                                UMethod (name = AnonymousKt$foo$closeableRunnable$1)
+                                UMethod (name = )
                 UDeclarationsExpression
                     ULocalVariable (name = runnableIs)
                         UObjectLiteralExpression
@@ -50,7 +50,7 @@ UFile (package = )
                                             ULiteralExpression (value = 0)
                                 UMethod (name = run)
                                     UBlockExpression
-                                UMethod (name = AnonymousKt$foo$runnableIs$1)
+                                UMethod (name = )
         UMethod (name = withErr)
             UBlockExpression
                 UDeclarationsExpression
diff --git a/plugins/uast-kotlin/testData/Anonymous.resolved.txt b/plugins/uast-kotlin/testData/Anonymous.resolved.txt
index 01e2ea21450..c5c9185398f 100644
--- a/plugins/uast-kotlin/testData/Anonymous.resolved.txt
+++ b/plugins/uast-kotlin/testData/Anonymous.resolved.txt
@@ -10,9 +10,9 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = io
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = InputStream) -> PsiClass:InputStream: InputStream
     ULocalVariable (name = runnable) -> UObjectLiteralExpression -> null:
     UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-    UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:run: run
+    UBlockExpression -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:run: run
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = runnable) -> LightVariableBuilder:runnable: runnable
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtLightMethodImpl:run) -> USimpleNameReferenceExpression (identifier = run) -> KtLightMethodImpl:run: run
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:run) -> USimpleNameReferenceExpression (identifier = run) -> KtUltraLightMethodForSourceDeclaration:run: run
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
     UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:run: run
diff --git a/plugins/uast-kotlin/testData/ClassAnnotation.resolved.txt b/plugins/uast-kotlin/testData/ClassAnnotation.resolved.txt
index a876ad46419..cd0f944e051 100644
--- a/plugins/uast-kotlin/testData/ClassAnnotation.resolved.txt
+++ b/plugins/uast-kotlin/testData/ClassAnnotation.resolved.txt
@@ -1,6 +1,6 @@
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Test) -> null: null
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtLightClassImpl:annotation class MyAnnotation(val text: String): MyAnnotation
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtLightClassImpl:annotation class MyAnnotation(val text: String): MyAnnotation
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtLightClassImpl:annotation class MyAnnotation(val text: String): MyAnnotation
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtLightClassImpl:annotation class MyAnnotation(val text: String): MyAnnotation
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtUltraLightClass:annotation class MyAnnotation(val text: String): MyAnnotation
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtUltraLightClass:annotation class MyAnnotation(val text: String): MyAnnotation
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtUltraLightClass:annotation class MyAnnotation(val text: String): MyAnnotation
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> KtUltraLightClass:annotation class MyAnnotation(val text: String): MyAnnotation
diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt
index 49ab9ed547b..360f0670c5a 100644
--- a/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt
+++ b/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt
@@ -37,13 +37,3 @@ UFile (package = )
         UMethod (name = Derived)
             UParameter (name = b)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-        UMethod (name = print)
-        UMethod (name = getLength)
-        UMethod (name = get)
-            UParameter (name = index)
-                UAnnotation (fqName = null)
-        UMethod (name = subSequence)
-            UParameter (name = startIndex)
-                UAnnotation (fqName = null)
-            UParameter (name = endIndex)
-                UAnnotation (fqName = null)
diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt
index 1d753e995ed..360f0670c5a 100644
--- a/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt
+++ b/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt
@@ -37,12 +37,3 @@ UFile (package = )
         UMethod (name = Derived)
             UParameter (name = b)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-        UMethod (name = getLength)
-        UMethod (name = get)
-            UParameter (name = index)
-                UAnnotation (fqName = null)
-        UMethod (name = subSequence)
-            UParameter (name = startIndex)
-                UAnnotation (fqName = null)
-            UParameter (name = endIndex)
-                UAnnotation (fqName = null)
diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.render-ide.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.render-ide.txt
index 345e16e2fc1..f5e3585dfff 100644
--- a/plugins/uast-kotlin/testData/ConstructorDelegate.render-ide.txt
+++ b/plugins/uast-kotlin/testData/ConstructorDelegate.render-ide.txt
@@ -19,8 +19,4 @@ public final class BaseImpl : Base {
 
 public final class Derived : Base, java.lang.CharSequence {
     public fun Derived(@org.jetbrains.annotations.NotNull b: Base) = UastEmptyExpression
-    public fun print() : void = UastEmptyExpression
-    public fun getLength() : int = UastEmptyExpression
-    public fun get(@null index: int) : char = UastEmptyExpression
-    public fun subSequence(@null startIndex: int, @null endIndex: int) : java.lang.CharSequence = UastEmptyExpression
 }
diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.render.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.render.txt
index 4609aaaf924..f5e3585dfff 100644
--- a/plugins/uast-kotlin/testData/ConstructorDelegate.render.txt
+++ b/plugins/uast-kotlin/testData/ConstructorDelegate.render.txt
@@ -19,7 +19,4 @@ public final class BaseImpl : Base {
 
 public final class Derived : Base, java.lang.CharSequence {
     public fun Derived(@org.jetbrains.annotations.NotNull b: Base) = UastEmptyExpression
-    public fun getLength() : int = UastEmptyExpression
-    public fun get(@null index: int) : char = UastEmptyExpression
-    public fun subSequence(@null startIndex: int, @null endIndex: int) : java.lang.CharSequence = UastEmptyExpression
 }
diff --git a/plugins/uast-kotlin/testData/Constructors.log.txt b/plugins/uast-kotlin/testData/Constructors.log.txt
index 5d57b94b092..84fc9fc8821 100644
--- a/plugins/uast-kotlin/testData/Constructors.log.txt
+++ b/plugins/uast-kotlin/testData/Constructors.log.txt
@@ -90,7 +90,7 @@ UFile (package = )
             UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = getA)
         UMethod (name = setA)
-            UParameter (name = p)
+            UParameter (name = a)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = AWithSecondary)
             UParameter (name = i)
@@ -121,7 +121,7 @@ UFile (package = )
             UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = getA)
         UMethod (name = setA)
-            UParameter (name = p)
+            UParameter (name = a)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = AWithSecondaryInit)
             UParameter (name = i)
diff --git a/plugins/uast-kotlin/testData/Constructors.render.txt b/plugins/uast-kotlin/testData/Constructors.render.txt
index 8e1c3c133f8..08fbd4652bc 100644
--- a/plugins/uast-kotlin/testData/Constructors.render.txt
+++ b/plugins/uast-kotlin/testData/Constructors.render.txt
@@ -50,7 +50,7 @@ public final class AOnlyInit {
 public final class AWithSecondary {
     @org.jetbrains.annotations.NotNull public var a: java.lang.String
     public final fun getA() : java.lang.String = UastEmptyExpression
-    public final fun setA(@org.jetbrains.annotations.NotNull p: java.lang.String) : void = UastEmptyExpression
+    public final fun setA(@org.jetbrains.annotations.NotNull a: java.lang.String) : void = UastEmptyExpression
     public fun AWithSecondary(@org.jetbrains.annotations.NotNull i: int) {
         <init>()
         a = i.toString()
@@ -64,7 +64,7 @@ public final class AWithSecondary {
 public final class AWithSecondaryInit {
     @org.jetbrains.annotations.NotNull public var a: java.lang.String
     public final fun getA() : java.lang.String = UastEmptyExpression
-    public final fun setA(@org.jetbrains.annotations.NotNull p: java.lang.String) : void = UastEmptyExpression
+    public final fun setA(@org.jetbrains.annotations.NotNull a: java.lang.String) : void = UastEmptyExpression
     public fun AWithSecondaryInit(@org.jetbrains.annotations.NotNull i: int) {
         <init>()
         {
diff --git a/plugins/uast-kotlin/testData/Constructors.resolved.txt b/plugins/uast-kotlin/testData/Constructors.resolved.txt
index 151191af691..f3e23cc4e44 100644
--- a/plugins/uast-kotlin/testData/Constructors.resolved.txt
+++ b/plugins/uast-kotlin/testData/Constructors.resolved.txt
@@ -1,22 +1,22 @@
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtLightMethodImpl:A:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtLightMethodImpl:A) -> UQualifiedReferenceExpression -> null: null
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtUltraLightMethodForSourceDeclaration:A:
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtUltraLightMethodForSourceDeclaration:A) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtLightMethodImpl:AWithInit:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtLightMethodImpl:AWithInit) -> UQualifiedReferenceExpression -> null: null
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtUltraLightMethodForSourceDeclaration:AWithInit:
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtUltraLightMethodForSourceDeclaration:AWithInit) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtLightMethodImpl:AWith2Init:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtLightMethodImpl:AWith2Init) -> UQualifiedReferenceExpression -> null: null
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> KtUltraLightMethodForSourceDeclaration:AWith2Init:
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtUltraLightMethodForSourceDeclaration:AWith2Init) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
@@ -24,28 +24,28 @@ UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolve
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtLightMethodImpl:setA: setA
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtUltraLightMethodForSourceDeclaration:setA: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtLightMethodImpl:setA: setA
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtUltraLightMethodForSourceDeclaration:setA: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Light Parameter: s
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtLightMethodImpl:setA: setA
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtUltraLightMethodForSourceDeclaration:setA: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtLightMethodImpl:setA: setA
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtUltraLightMethodForSourceDeclaration:setA: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Light Parameter: s
     UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
@@ -55,7 +55,7 @@ UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:toString) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> KtLightFieldForSourceDeclaration:a: a
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Light Parameter: i
diff --git a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt b/plugins/uast-kotlin/testData/EnumValueMembers.log.txt
index 5c76f6d87a9..bd07a46ab5d 100644
--- a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt
+++ b/plugins/uast-kotlin/testData/EnumValueMembers.log.txt
@@ -1,17 +1,17 @@
 UFile (package = )
     UClass (name = Style)
+        UField (name = value)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UEnumConstant (name = SHEET)
             UAnnotation (fqName = null)
             USimpleNameReferenceExpression (identifier = Style)
             ULiteralExpression (value = "foo")
-            UClass (name = null)
+            UClass (name = SHEET)
                 UMethod (name = getExitAnimation)
                     UBlockExpression
                         UReturnExpression
                             ULiteralExpression (value = "bar")
                 UMethod (name = SHEET)
-        UField (name = value)
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = getExitAnimation)
         UMethod (name = getValue)
         UMethod (name = Style)
diff --git a/plugins/uast-kotlin/testData/EnumValueMembers.render.txt b/plugins/uast-kotlin/testData/EnumValueMembers.render.txt
index 9a7e79f82c4..0b9be77a0f3 100644
--- a/plugins/uast-kotlin/testData/EnumValueMembers.render.txt
+++ b/plugins/uast-kotlin/testData/EnumValueMembers.render.txt
@@ -1,11 +1,11 @@
 public enum Style {
+    @org.jetbrains.annotations.NotNull private final var value: java.lang.String
     @null SHEET("foo") {
         public fun getExitAnimation() : java.lang.String {
             return "bar"
         }
         fun SHEET() = UastEmptyExpression
     }
-    @org.jetbrains.annotations.NotNull private final var value: java.lang.String
     public abstract fun getExitAnimation() : java.lang.String = UastEmptyExpression
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression
diff --git a/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt b/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt
index 71229cd080b..130f197f532 100644
--- a/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt
+++ b/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt
@@ -1,5 +1,7 @@
 UFile (package = )
     UClass (name = Style)
+        UField (name = value)
+            UAnnotation (fqName = org.jetbrains.annotations.Nullable)
         UEnumConstant (name = SYSTEM)
             UAnnotation (fqName = null)
             USimpleNameReferenceExpression (identifier = Style)
@@ -16,8 +18,6 @@ UFile (package = )
             UAnnotation (fqName = null)
             USimpleNameReferenceExpression (identifier = Style)
             ULiteralExpression (value = null)
-        UField (name = value)
-            UAnnotation (fqName = org.jetbrains.annotations.Nullable)
         UMethod (name = getValue)
         UMethod (name = Style)
             UParameter (name = value)
diff --git a/plugins/uast-kotlin/testData/EnumValuesConstructors.render.txt b/plugins/uast-kotlin/testData/EnumValuesConstructors.render.txt
index 1db9d1eb354..04517caf5b1 100644
--- a/plugins/uast-kotlin/testData/EnumValuesConstructors.render.txt
+++ b/plugins/uast-kotlin/testData/EnumValuesConstructors.render.txt
@@ -1,9 +1,9 @@
 public enum Style {
+    @org.jetbrains.annotations.Nullable private final var value: java.lang.String
     @null SYSTEM("system")
     @null USER("user")
     @null INTERNAL("internal")
     @null UNKNOWN(null)
-    @org.jetbrains.annotations.Nullable private final var value: java.lang.String
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression
 }
diff --git a/plugins/uast-kotlin/testData/LocalDeclarations.log.txt b/plugins/uast-kotlin/testData/LocalDeclarations.log.txt
index 989f2dba02c..872c844b6d7 100644
--- a/plugins/uast-kotlin/testData/LocalDeclarations.log.txt
+++ b/plugins/uast-kotlin/testData/LocalDeclarations.log.txt
@@ -4,7 +4,7 @@ UFile (package = )
             UBlockExpression
                 UDeclarationsExpression
                     UClass (name = Local)
-                        UMethod (name = LocalDeclarationsKt$foo$Local)
+                        UMethod (name = Local)
                 UDeclarationsExpression
                     UVariable (name = bar)
                         ULambdaExpression
diff --git a/plugins/uast-kotlin/testData/LocalDeclarations.render.txt b/plugins/uast-kotlin/testData/LocalDeclarations.render.txt
index 87f9fa57e78..d3d9c9d6c92 100644
--- a/plugins/uast-kotlin/testData/LocalDeclarations.render.txt
+++ b/plugins/uast-kotlin/testData/LocalDeclarations.render.txt
@@ -1,7 +1,7 @@
 public final class LocalDeclarationsKt {
     public static final fun foo() : boolean {
         public static final class Local {
-            public fun LocalDeclarationsKt$foo$Local() = UastEmptyExpression
+            public fun Local() = UastEmptyExpression
         }
         var bar: <ErrorType> = fun () {
                 return <init>()
diff --git a/plugins/uast-kotlin/testData/LocalDeclarations.resolved.txt b/plugins/uast-kotlin/testData/LocalDeclarations.resolved.txt
index 169ba294d2f..c49596cfafd 100644
--- a/plugins/uast-kotlin/testData/LocalDeclarations.resolved.txt
+++ b/plugins/uast-kotlin/testData/LocalDeclarations.resolved.txt
@@ -1,8 +1,8 @@
 UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to LightMethodBuilder:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtLightClassForLocalDeclaration:class Local: Local
-        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to LightMethodBuilder:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtLightClassForLocalDeclaration:class Local: Local
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtUltraLightClassForLocalDeclaration:class Local: Local
+        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtUltraLightClassForLocalDeclaration:class Local: Local
     UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
     UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to LightMethodBuilder:bar) -> USimpleNameReferenceExpression (identifier = bar) -> LightVariableBuilder:bar: bar
     UBinaryExpression (operator = ==) -> USimpleNameReferenceExpression (identifier = ==) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to LightMethodBuilder:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtLightClassForLocalDeclaration:class Local: Local
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:Local) -> USimpleNameReferenceExpression (identifier = Local) -> KtUltraLightClassForLocalDeclaration:class Local: Local
diff --git a/plugins/uast-kotlin/testData/LocalDeclarations.types.txt b/plugins/uast-kotlin/testData/LocalDeclarations.types.txt
index da0925862ae..4c8a21df8c3 100644
--- a/plugins/uast-kotlin/testData/LocalDeclarations.types.txt
+++ b/plugins/uast-kotlin/testData/LocalDeclarations.types.txt
@@ -4,7 +4,7 @@ UFile (package = ) [public final class LocalDeclarationsKt {...]
             UBlockExpression [{...}] : PsiType:Void
                 UDeclarationsExpression [public static final class Local {...}]
                     UClass (name = Local) [public static final class Local {...}]
-                        UMethod (name = LocalDeclarationsKt$foo$Local) [public fun LocalDeclarationsKt$foo$Local() = UastEmptyExpression]
+                        UMethod (name = Local) [public fun Local() = UastEmptyExpression]
                 UDeclarationsExpression [var bar: <ErrorType> = fun () {...}]
                     UVariable (name = bar) [var bar: <ErrorType> = fun () {...}]
                         ULambdaExpression [fun () {...}]
diff --git a/plugins/uast-kotlin/testData/LocalDeclarations.values.txt b/plugins/uast-kotlin/testData/LocalDeclarations.values.txt
index 10c4499fdce..51263ce227c 100644
--- a/plugins/uast-kotlin/testData/LocalDeclarations.values.txt
+++ b/plugins/uast-kotlin/testData/LocalDeclarations.values.txt
@@ -4,7 +4,7 @@ UFile (package = ) [public final class LocalDeclarationsKt {...]
             UBlockExpression [{...}] = Nothing
                 UDeclarationsExpression [public static final class Local {...}] = Undetermined
                     UClass (name = Local) [public static final class Local {...}]
-                        UMethod (name = LocalDeclarationsKt$foo$Local) [public fun LocalDeclarationsKt$foo$Local() = UastEmptyExpression]
+                        UMethod (name = Local) [public fun Local() = UastEmptyExpression]
                 UDeclarationsExpression [var bar: <ErrorType> = fun () {...}] = Undetermined
                     UVariable (name = bar) [var bar: <ErrorType> = fun () {...}]
                         ULambdaExpression [fun () {...}] = Undetermined
diff --git a/plugins/uast-kotlin/testData/MethodReference.kt b/plugins/uast-kotlin/testData/MethodReference.kt
index b38c238b72e..d9c52267a9e 100644
--- a/plugins/uast-kotlin/testData/MethodReference.kt
+++ b/plugins/uast-kotlin/testData/MethodReference.kt
@@ -6,4 +6,4 @@ class Foo {
 val x = Foo::bar
 
 // REF:Foo::bar
-// RESULT:KtLightMethodImpl:bar
+// RESULT:KtUltraLightMethodForSourceDeclaration:bar
diff --git a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.log.txt b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.log.txt
index 796aeecb8c7..0eada479127 100644
--- a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.log.txt
+++ b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.log.txt
@@ -9,8 +9,8 @@ UFile (package = )
             UAnnotation (fqName = org.jetbrains.annotations.NotNull)
         UMethod (name = getBar)
         UMethod (name = setBar)
-            UParameter (name = p)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = bar)
+                UAnnotation (fqName = null)
         UMethod (name = Test1)
             UParameter (name = bar)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
@@ -23,9 +23,9 @@ UFile (package = )
             UAnnotation (fqName = MyAnnotation)
         UMethod (name = setBar)
             UAnnotation (fqName = MyAnnotation2)
-            UParameter (name = p)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = bar)
                 UAnnotation (fqName = MyAnnotation3)
+                UAnnotation (fqName = null)
         UMethod (name = Test2)
             UParameter (name = bar)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt
index 5f93a65c995..b87a33358c6 100644
--- a/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt
+++ b/plugins/uast-kotlin/testData/ParameterPropertyWithAnnotation.render.txt
@@ -16,7 +16,7 @@ public abstract annotation MyAnnotation5 {
 public final class Test1 {
     @org.jetbrains.annotations.NotNull private var bar: int
     public final fun getBar() : int = UastEmptyExpression
-    public final fun setBar(@org.jetbrains.annotations.NotNull p: int) : void = UastEmptyExpression
+    public final fun setBar(@null bar: int) : void = UastEmptyExpression
     public fun Test1(@org.jetbrains.annotations.NotNull @MyAnnotation bar: int) = UastEmptyExpression
 }
 
@@ -25,6 +25,6 @@ public final class Test2 {
     @MyAnnotation
     public final fun getBar() : int = UastEmptyExpression
     @MyAnnotation2
-    public final fun setBar(@org.jetbrains.annotations.NotNull @MyAnnotation3 p: int) : void = UastEmptyExpression
+    public final fun setBar(@MyAnnotation3 @null bar: int) : void = UastEmptyExpression
     public fun Test2(@org.jetbrains.annotations.NotNull bar: int) = UastEmptyExpression
 }
diff --git a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt b/plugins/uast-kotlin/testData/ParametersDisorder.log.txt
index 274e9db8d9f..6e1661d9791 100644
--- a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt
+++ b/plugins/uast-kotlin/testData/ParametersDisorder.log.txt
@@ -144,7 +144,7 @@ UFile (package = )
                     ULiteralExpression (value = 1)
                     ULiteralExpression (value = "foo")
                     UClass (name = null)
-                        UMethod (name = ParametersDisorderKt$objectLiteral$1)
+                        UMethod (name = )
     UClass (name = A)
         UMethod (name = with2Receivers)
             UParameter (name = $this$with2Receivers)
diff --git a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt
index 2617618a649..c2d823ff0e4 100644
--- a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt
+++ b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt
@@ -8,5 +8,5 @@ UFile (package = )
                 UReturnExpression
                     USimpleNameReferenceExpression (identifier = field)
         UMethod (name = setWithoutSetter)
-            UParameter (name = p)
+            UParameter (name = withoutSetter)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.render.txt b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.render.txt
index 65d0b8b02bb..5cf1fa4a062 100644
--- a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.render.txt
+++ b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.render.txt
@@ -3,5 +3,5 @@ public final class PropertyInitializerWithoutSetterKt {
     public static final fun getWithoutSetter() : java.lang.String {
         return field
     }
-    public static final fun setWithoutSetter(@org.jetbrains.annotations.NotNull p: java.lang.String) : void = UastEmptyExpression
+    public static final fun setWithoutSetter(@org.jetbrains.annotations.NotNull withoutSetter: java.lang.String) : void = UastEmptyExpression
 }
diff --git a/plugins/uast-kotlin/testData/PropertyReferences.resolved.txt b/plugins/uast-kotlin/testData/PropertyReferences.resolved.txt
index 251d48973ea..ef88891ba12 100644
--- a/plugins/uast-kotlin/testData/PropertyReferences.resolved.txt
+++ b/plugins/uast-kotlin/testData/PropertyReferences.resolved.txt
@@ -1,38 +1,38 @@
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = init) -> Light Parameter: init
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
 UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    ULocalVariable (name = result) -> USimpleNameReferenceExpression (identifier = privateProp) -> KtLightFieldForSourceDeclaration:privateProp: privateProp
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = privateProp) -> KtLightFieldForSourceDeclaration:privateProp: privateProp
+    ULocalVariable (name = result) -> USimpleNameReferenceExpression (identifier = privateProp) -> LightVariableBuilder:privateProp: privateProp
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = privateProp) -> LightVariableBuilder:privateProp: privateProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = x) -> Light Parameter: x
-    UReturnExpression -> USimpleNameReferenceExpression (identifier = privateProp) -> KtLightFieldForSourceDeclaration:privateProp: privateProp
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtLightMethodImpl:A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightMethodImpl:A: A
+    UReturnExpression -> USimpleNameReferenceExpression (identifier = privateProp) -> LightVariableBuilder:privateProp: privateProp
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to KtUltraLightMethodForSourceDeclaration:A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightMethodForSourceDeclaration:A: A
     UPrefixExpression (operator = -) -> USimpleNameReferenceExpression (identifier = -) -> null: null
-    UPrefixExpression (operator = -) -> UQualifiedReferenceExpression -> KtLightMethodImpl:getMutableProp: getMutableProp
+    UPrefixExpression (operator = -) -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:getMutableProp: getMutableProp
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:getMutableProp: getMutableProp
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:getMutableProp: getMutableProp
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBinaryExpression (operator = +=) -> UQualifiedReferenceExpression -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UBinaryExpression (operator = +=) -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = +=) -> null: null
     UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = x) -> LightVariableBuilder:x: x
     UPrefixExpression (operator = ++) -> USimpleNameReferenceExpression (identifier = ++) -> null: null
-    UPrefixExpression (operator = ++) -> UQualifiedReferenceExpression -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UPrefixExpression (operator = ++) -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
-    UPostfixExpression (operator = --) -> UQualifiedReferenceExpression -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
+    UPostfixExpression (operator = --) -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> LightVariableBuilder:a: a
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UPostfixExpression (operator = --) -> USimpleNameReferenceExpression (identifier = --) -> null: null
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:class A(init: Int) {
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:class A(init: Int) {
     private var privateProp = 0 // accesses should be field accesses
     var mutableProp: Int
     init {
@@ -46,13 +46,13 @@ UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifie
     }
 }: A
     UPrefixExpression (operator = -) -> USimpleNameReferenceExpression (identifier = -) -> null: null
-    UPrefixExpression (operator = -) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:getMutableProp: getMutableProp
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UPrefixExpression (operator = -) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:getMutableProp: getMutableProp
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = +=) -> null: null
     UBinaryExpression (operator = +=) -> USimpleNameReferenceExpression (identifier = x) -> LightVariableBuilder:x: x
     UPrefixExpression (operator = ++) -> USimpleNameReferenceExpression (identifier = ++) -> null: null
-    UPrefixExpression (operator = ++) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
-    UPostfixExpression (operator = --) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtLightMethodImpl:setMutableProp: setMutableProp
+    UPrefixExpression (operator = ++) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
+    UPostfixExpression (operator = --) -> USimpleNameReferenceExpression (identifier = mutableProp) -> KtUltraLightMethodForSourceDeclaration:setMutableProp: setMutableProp
     UPostfixExpression (operator = --) -> USimpleNameReferenceExpression (identifier = --) -> null: null
diff --git a/plugins/uast-kotlin/testData/Resolve.resolved.txt b/plugins/uast-kotlin/testData/Resolve.resolved.txt
index f069f386baf..805a15c9f50 100644
--- a/plugins/uast-kotlin/testData/Resolve.resolved.txt
+++ b/plugins/uast-kotlin/testData/Resolve.resolved.txt
@@ -1,22 +1,22 @@
-UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:foo: foo
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtLightMethodImpl:A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:open class A {
+UBlockExpression -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:foo: foo
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtLightMethodImpl:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtLightMethodImpl:foo: foo
-    UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:inlineFoo: inlineFoo
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtLightMethodImpl:A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:open class A {
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtUltraLightMethodForSourceDeclaration:foo: foo
+    UBlockExpression -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:inlineFoo: inlineFoo
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtLightMethodImpl:inlineFoo) -> USimpleNameReferenceExpression (identifier = inlineFoo) -> KtLightMethodImpl:inlineFoo: inlineFoo
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:inlineFoo) -> USimpleNameReferenceExpression (identifier = inlineFoo) -> KtUltraLightMethodForSourceDeclaration:inlineFoo: inlineFoo
     UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:forEach: forEach
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtLightMethodImpl:A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:open class A {
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
@@ -64,28 +64,28 @@ UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:foo: foo
     UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
     UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to PsiMethod:IntRange) -> USimpleNameReferenceExpression (identifier = IntRange) -> PsiClass:IntRange: IntRange
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:open class A {
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
-    UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:foo: foo
+UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
+    UBlockExpression -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:foo: foo
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = t) -> Light Parameter: t
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtLightMethodImpl:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtLightMethodImpl:foo: foo
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtUltraLightMethodForSourceDeclaration:foo: foo
 UTypeReferenceExpression (name = java.util.List<? extends A>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtLightClassImpl:open class A {
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> KtUltraLightClass:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
+UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
     UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:isEmpty: isEmpty
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = listT) -> Light Parameter: listT
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:isEmpty) -> USimpleNameReferenceExpression (identifier = isEmpty) -> PsiMethod:isEmpty: isEmpty
     UForEachExpression -> USimpleNameReferenceExpression (identifier = listT) -> Light Parameter: listT
-        UBlockExpression -> UQualifiedReferenceExpression -> KtLightMethodImpl:foo: foo
+        UBlockExpression -> UQualifiedReferenceExpression -> KtUltraLightMethodForSourceDeclaration:foo: foo
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtLightMethodImpl:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtLightMethodImpl:foo: foo
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to KtUltraLightMethodForSourceDeclaration:foo) -> USimpleNameReferenceExpression (identifier = foo) -> KtUltraLightMethodForSourceDeclaration:foo: foo
diff --git a/plugins/uast-kotlin/testData/SimpleScript.log.txt b/plugins/uast-kotlin/testData/SimpleScript.log.txt
index 31ca1199adc..0f0091170ea 100644
--- a/plugins/uast-kotlin/testData/SimpleScript.log.txt
+++ b/plugins/uast-kotlin/testData/SimpleScript.log.txt
@@ -1,22 +1,7 @@
 UFile (package = )
     UClass (name = SimpleScript)
-        UMethod (name = getBarOrNull)
-            UParameter (name = flag)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    UIfExpression
-                        USimpleNameReferenceExpression (identifier = flag)
-                        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
-                            UIdentifier (Identifier (Bar))
-                            USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Bar)
-                            ULiteralExpression (value = 42)
-                        ULiteralExpression (value = null)
-        UMethod (name = main)
-            UParameter (name = p)
-                UAnnotation (fqName = null)
         UMethod (name = SimpleScript)
-            UParameter (name = p)
+            UParameter (name = args)
                 UAnnotation (fqName = null)
             UBlockExpression
                 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
@@ -31,12 +16,27 @@ UFile (package = )
                     UIdentifier (Identifier (println))
                     USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
                     ULiteralExpression (value = "Goodbye World!")
+        UMethod (name = main)
+            UParameter (name = args)
+                UAnnotation (fqName = null)
+        UMethod (name = getBarOrNull)
+            UParameter (name = flag)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    UIfExpression
+                        USimpleNameReferenceExpression (identifier = flag)
+                        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
+                            UIdentifier (Identifier (Bar))
+                            USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Bar)
+                            ULiteralExpression (value = 42)
+                        ULiteralExpression (value = null)
         UClass (name = Bar)
+            UField (name = a)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
             UField (name = b)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
                 ULiteralExpression (value = 0)
-            UField (name = a)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
             UMethod (name = getB)
             UMethod (name = getAPlusB)
                 UBlockExpression
diff --git a/plugins/uast-kotlin/testData/SimpleScript.render.txt b/plugins/uast-kotlin/testData/SimpleScript.render.txt
index e31b3d4a69d..ccabcdd5868 100644
--- a/plugins/uast-kotlin/testData/SimpleScript.render.txt
+++ b/plugins/uast-kotlin/testData/SimpleScript.render.txt
@@ -1,16 +1,16 @@
 public class SimpleScript {
-    public final fun getBarOrNull(@org.jetbrains.annotations.NotNull flag: boolean) : SimpleScript.Bar {
-        return if (flag) <init>(42) else null
-    }
-    public static final fun main(@null p: java.lang.String[]) : void = UastEmptyExpression
-    public fun SimpleScript(@null p: java.lang.String[]) {
+    public fun SimpleScript(@null args: java.lang.String[]) {
         println("Hello World!")
         getBarOrNull(true)
         println("Goodbye World!")
     }
+    public static final fun main(@null args: java.lang.String[]) : void = UastEmptyExpression
+    public final fun getBarOrNull(@org.jetbrains.annotations.NotNull flag: boolean) : SimpleScript.Bar {
+        return if (flag) <init>(42) else null
+    }
     public static final class Bar {
-        @org.jetbrains.annotations.NotNull private final var b: int = 0
         @org.jetbrains.annotations.NotNull private final var a: int
+        @org.jetbrains.annotations.NotNull private final var b: int = 0
         public final fun getB() : int = UastEmptyExpression
         public final fun getAPlusB() : int {
             return a + b
diff --git a/plugins/uast-kotlin/testData/SuperCalls.log.txt b/plugins/uast-kotlin/testData/SuperCalls.log.txt
index 24ae64283c8..b85474c2da2 100644
--- a/plugins/uast-kotlin/testData/SuperCalls.log.txt
+++ b/plugins/uast-kotlin/testData/SuperCalls.log.txt
@@ -13,8 +13,8 @@ UFile (package = )
                                 UObjectLiteralExpression
                                     ULiteralExpression (value = "inner literal")
                                     UClass (name = null)
-                                        UMethod (name = SuperCallsKt$anon$1$bar$1)
-                    UMethod (name = SuperCallsKt$anon$1)
+                                        UMethod (name = )
+                    UMethod (name = )
                     UClass (name = InnerClass)
                         UMethod (name = InnerClass)
                             UBlockExpression
diff --git a/plugins/uast-kotlin/testData/Suspend.log.txt b/plugins/uast-kotlin/testData/Suspend.log.txt
index dca56074c1b..d291425dddf 100644
--- a/plugins/uast-kotlin/testData/Suspend.log.txt
+++ b/plugins/uast-kotlin/testData/Suspend.log.txt
@@ -1,7 +1,7 @@
 UFile (package = test.pkg)
     UClass (name = SuspendKt)
         UMethod (name = top)
-            UParameter (name = p)
+            UParameter (name = $completion)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
             UBlockExpression
                 UReturnExpression
@@ -14,7 +14,7 @@ UFile (package = test.pkg)
                             USimpleNameReferenceExpression (identifier = inner, resolvesTo = null)
     UClass (name = Context)
         UMethod (name = inner)
-            UParameter (name = p)
+            UParameter (name = $completion)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
             UBlockExpression
                 UReturnExpression
diff --git a/plugins/uast-kotlin/testData/Suspend.render.txt b/plugins/uast-kotlin/testData/Suspend.render.txt
index 974b4d51199..6c4d4265fb0 100644
--- a/plugins/uast-kotlin/testData/Suspend.render.txt
+++ b/plugins/uast-kotlin/testData/Suspend.render.txt
@@ -1,13 +1,13 @@
 package test.pkg
 
 public final class SuspendKt {
-    public static final fun top(@org.jetbrains.annotations.NotNull p: kotlin.coroutines.Continuation<? super java.lang.Integer>) : java.lang.Object {
+    public static final fun top(@org.jetbrains.annotations.NotNull $completion: kotlin.coroutines.Continuation<? super java.lang.Integer>) : java.lang.Object {
         return <init>().inner()
     }
 }
 
 public final class Context {
-    public final fun inner(@org.jetbrains.annotations.NotNull p: kotlin.coroutines.Continuation<? super java.lang.Integer>) : java.lang.Object {
+    public final fun inner(@org.jetbrains.annotations.NotNull $completion: kotlin.coroutines.Continuation<? super java.lang.Integer>) : java.lang.Object {
         return suspendPrivate()
     }
     public fun Context() = UastEmptyExpression
diff --git a/plugins/uast-kotlin/testData/TypeReferences.resolved.txt b/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
index 9ba7cd5928d..a8e10a696ab 100644
--- a/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
+++ b/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
@@ -8,13 +8,13 @@ UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpres
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
+UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
     ULocalVariable (name = a) -> USimpleNameReferenceExpression (identifier = arg) -> Light Parameter: arg
-    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
+    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
     ULocalVariable (name = var708e23eb) -> USimpleNameReferenceExpression (identifier = arg) -> Light Parameter: arg
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
+    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = at) -> LightVariableBuilder:at: at
     UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
@@ -31,8 +31,8 @@ UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifie
     UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = ListOfLists) -> PsiClass:List: List
     UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends T>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
     UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> KotlinLightTypeParameter:T: T
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to KtLightMethodImpl:parameterizedFoo) -> USimpleNameReferenceExpression (identifier = parameterizedFoo) -> KtLightMethodImpl:parameterizedFoo: parameterizedFoo
+    UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to KtUltraLightMethodForSourceDeclaration:parameterizedFoo) -> USimpleNameReferenceExpression (identifier = parameterizedFoo) -> KtUltraLightMethodForSourceDeclaration:parameterizedFoo: parameterizedFoo
     UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
     UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:emptyList) -> USimpleNameReferenceExpression (identifier = emptyList) -> PsiMethod:emptyList: emptyList
diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt
index 9f26da67cc3..6e2ea159de7 100644
--- a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt
+++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt
@@ -37,4 +37,4 @@ UFile (package = )
                                                             UIdentifier (Identifier (UnsupportedOperationException))
                                                             USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsupportedOperationException)
                                                             ULiteralExpression (value = "")
-                                            UMethod (name = Model$1$1)
+                                            UMethod (name = )
diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
index bb35552aaff..91932fd4320 100644
--- a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
+++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
@@ -37,4 +37,4 @@ UFile (package = ) [public abstract interface Callback {...]
                                                             UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))]
                                                             USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsupportedOperationException) [<init>] : PsiType:UnsupportedOperationException
                                                             ULiteralExpression (value = "") [""] : PsiType:String
-                                            UMethod (name = Model$1$1) [fun Model$1$1() = UastEmptyExpression]
+                                            UMethod (name = ) [private fun () = UastEmptyExpression]
diff --git a/plugins/uast-kotlin/tests/KotlinUastAlternativesTest.kt b/plugins/uast-kotlin/tests/KotlinUastAlternativesTest.kt
index 5e3a01be524..c6efba2d58e 100644
--- a/plugins/uast-kotlin/tests/KotlinUastAlternativesTest.kt
+++ b/plugins/uast-kotlin/tests/KotlinUastAlternativesTest.kt
@@ -34,7 +34,7 @@ class KotlinUastAlternativesTest : AbstractKotlinUastTest() {
             plugin.convertToAlternatives<UElement>(ktProperty, arrayOf(UMethod::class.java, UField::class.java)).let {
                 assertEquals(
                     "public final fun getWritebleProp() : int = UastEmptyExpression, " +
-                            "public final fun setWritebleProp(@null p: int) : void = UastEmptyExpression, " +
+                            "public final fun setWritebleProp(@null writebleProp: int) : void = UastEmptyExpression, " +
                             "@org.jetbrains.annotations.NotNull private var writebleProp: int = 0",
                     it.joinToString(transform = UElement::asRenderString)
                 )
@@ -44,7 +44,7 @@ class KotlinUastAlternativesTest : AbstractKotlinUastTest() {
                 assertEquals(
                     "@org.jetbrains.annotations.NotNull private var writebleProp: int = 0, " +
                             "public final fun getWritebleProp() : int = UastEmptyExpression, " +
-                            "public final fun setWritebleProp(@null p: int) : void = UastEmptyExpression",
+                            "public final fun setWritebleProp(@null writebleProp: int) : void = UastEmptyExpression",
                     it.joinToString(transform = UElement::asRenderString)
                 )
             }
@@ -53,7 +53,7 @@ class KotlinUastAlternativesTest : AbstractKotlinUastTest() {
                 assertEquals(
                     "@org.jetbrains.annotations.NotNull private var writebleProp: int = 0, " +
                             "public final fun getWritebleProp() : int = UastEmptyExpression, " +
-                            "public final fun setWritebleProp(@null p: int) : void = UastEmptyExpression",
+                            "public final fun setWritebleProp(@null writebleProp: int) : void = UastEmptyExpression",
                     it.joinToString(transform = UElement::asRenderString)
                 )
             }
diff --git a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt
index 36dcfcf7145..d466db80105 100644
--- a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt
+++ b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt
@@ -600,10 +600,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
             assertEquals("USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Local)", classReference.asLogString())
             val localClass = classReference.resolve().toUElement() ?: kfail("uelement expected")
             assertEquals("UClass (name = Local)", localClass.asLogString())
-            assertEquals(localClass, localFunctionResolved.toUElement())
             val localPrimaryConstructor = localFunctionResolved.toUElementOfType<UMethod>() ?: kfail("constructor expected")
             assertTrue(localPrimaryConstructor.isConstructor)
-            assertEquals(localClass, localPrimaryConstructor.uastParent)
+            assertEquals(localClass.javaPsi, localPrimaryConstructor.javaPsi.cast<PsiMethod>().containingClass)
         }
     }
 
diff --git a/tests/mute-common.csv b/tests/mute-common.csv
index f995fa1a5cc..0e9d9b944c7 100644
--- a/tests/mute-common.csv
+++ b/tests/mute-common.csv
@@ -51,7 +51,6 @@ org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLa
 org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.StepOver.testStepOverInlinedLambdaStdlib, fails after advancing bootstrap KT-37879,,
 org.jetbrains.kotlin.incremental.IncrementalJsKlibCompilerRunnerTestGenerated.ClassHierarchyAffected.testMethodRemoved, full fledged FO in klib required,,
 org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.ConvertToAnonymousObject.testHasConcreateMember2, Unprocessed,,
-org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.MakePrivateAndOverrideMember.testSetter, Unprocessed,,
 org.jetbrains.uast.test.kotlin.KotlinUastTypesTest.testEa101715, Unprocessed,,
 org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.CreateFromUsage.CreateFunction.Invoke.testLambdaArgument, Unprocessed,,
 org.jetbrains.kotlin.idea.decompiler.navigation.NavigateJavaToLibrarySourceTestGenerated.testClassAndConstuctors, Unprocessed,,
@@ -77,4 +76,11 @@ org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.test
 org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages,,, FLAKY
 org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryMemberFunctionUsages,,, FLAKY
 org.jetbrains.kotlin.daemon.CompilerDaemonTest.testParallelDaemonStart,,,
-org.jetbrains.kotlin.idea.repl.IdeReplExecutionTest.testOnePlusOne,,, FLAKY
\ No newline at end of file
+org.jetbrains.kotlin.idea.repl.IdeReplExecutionTest.testOnePlusOne,,, FLAKY
+org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.MakePrivateAndOverrideMember.testSetter, Unprocessed,,
+org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.testAnnotatedPropertyWithSites, Unprocessed,,
+org.jetbrains.kotlin.asJava.classes.UltraLightClassSanityTestGenerated.testAnnotatedPropertyWithSites, Unprocessed,,
+org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.Facades.testSingleJvmClassName, Invalid behavior of old lightclasses in common tests,,
+org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationErrors.testActualTypeAliasCustomJvmPackageName, Invalid behavior of old lightclasses in common tests,,
+org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationErrors.testJvmPackageName, Invalid behavior of old lightclasses in common tests,,
+org.jetbrains.uast.test.kotlin.SimpleKotlinRenderLogTest.testReceiverFun, Analysing of facade annotation with receiver site is broken (connected with KT-40403),,
\ No newline at end of file