diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.descriptors.java
new file mode 100644
index 00000000000..0781f972bfc
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.descriptors.java
@@ -0,0 +1,7 @@
+public final class C /* p.C*/ extends p.A {
+  public  C();//  .ctor()
+
+  public int af$light_idea_test_case();//  af$light_idea_test_case()
+
+  public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.extra.kt
deleted file mode 100644
index d0b4cb44cda..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.extra.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package p
-
-abstract class A {
-    internal val ap: Int = 4
-    internal fun af(): Int
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java
deleted file mode 100644
index bf999216eb2..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public final class C /* p.C*/ extends A {
-  @java.lang.Override()
-  public int af();//  af()
-
-  public  C();//  .ctor()
-
-  public int getAp();//  getAp()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java
index 0781f972bfc..461956cd6fa 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java
@@ -1,7 +1,8 @@
 public final class C /* p.C*/ extends p.A {
-  public  C();//  .ctor()
-
+  @java.lang.Override()
   public int af$light_idea_test_case();//  af$light_idea_test_case()
 
+  public  C();//  .ctor()
+
   public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
 }
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt
index ff16ffbb609..e5d161c3f8f 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt
@@ -1,4 +1,6 @@
 // p.C
+// COMPILATION_ERRORS
+// FILE: C.kt
 package p
 
 class C : A() {
@@ -10,4 +12,10 @@ class C : A() {
     }
 }
 
-// COMPILATION_ERRORS
\ No newline at end of file
+// FILE: A.kt
+package p
+
+abstract class A {
+    internal val ap: Int = 4
+    internal fun af(): Int
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.descriptors.java
new file mode 100644
index 00000000000..bb3b8291cb6
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.descriptors.java
@@ -0,0 +1,13 @@
+public final class C /* p.C*/ extends p.A implements p.I {
+  private final int ip;
+
+  public  C();//  .ctor()
+
+  public int <no name provided>$light_idea_test_case();//  <no name provided>$light_idea_test_case()
+
+  public int af$light_idea_test_case();//  af$light_idea_test_case()
+
+  public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
+
+  public int getIp$light_idea_test_case();//  getIp$light_idea_test_case()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.extra.kt
deleted file mode 100644
index 2e6a979d5ac..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.extra.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package p
-
-abstract class A {
-    open internal val ap: Int = 4
-    abstract internal fun af(): Int
-}
-
-interface I {
-    internal val ip: Int
-    internal fun if(): Int
-}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java
deleted file mode 100644
index c7a9b8082b1..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java
+++ /dev/null
@@ -1,12 +0,0 @@
-public final class C /* p.C*/ extends A implements I {
-  private final int ip = 5 /* initializer type: int */;
-
-  @java.lang.Override()
-  public int af();//  af()
-
-  public  C();//  .ctor()
-
-  public int getAp();//  getAp()
-
-  public int getIp();//  getIp()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java
index bb3b8291cb6..ed1bed9b542 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java
@@ -1,12 +1,11 @@
 public final class C /* p.C*/ extends p.A implements p.I {
-  private final int ip;
+  private final int ip = 5 /* initializer type: int */;
+
+  @java.lang.Override()
+  public int af$light_idea_test_case();//  af$light_idea_test_case()
 
   public  C();//  .ctor()
 
-  public int <no name provided>$light_idea_test_case();//  <no name provided>$light_idea_test_case()
-
-  public int af$light_idea_test_case();//  af$light_idea_test_case()
-
   public int getAp$light_idea_test_case();//  getAp$light_idea_test_case()
 
   public int getIp$light_idea_test_case();//  getIp$light_idea_test_case()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt
index 0bfd23f9516..abe07d763d7 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt
@@ -1,4 +1,6 @@
 // p.C
+// COMPILATION_ERRORS
+// FILE: C.kt
 package p
 
 class C : A(), I {
@@ -13,4 +15,15 @@ class C : A(), I {
     override fun if() = 5
 }
 
-// COMPILATION_ERRORS
\ No newline at end of file
+// FILE: A.kt
+package p
+
+abstract class A {
+    open internal val ap: Int = 4
+    abstract internal fun af(): Int
+}
+
+interface I {
+    internal val ip: Int
+    internal fun if(): Int
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.descriptors.java
new file mode 100644
index 00000000000..956ea43eada
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.descriptors.java
@@ -0,0 +1,7 @@
+public final class C /* p.C*/ extends p.A {
+  protected int af();//  af()
+
+  protected int getAp();//  getAp()
+
+  public  C();//  .ctor()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.extra.kt
deleted file mode 100644
index 1cd15b97a9d..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.extra.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package p
-
-abstract class A {
-    protected val ap: Int = 4
-    abstract protected fun af(): Int
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java
deleted file mode 100644
index bf999216eb2..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public final class C /* p.C*/ extends A {
-  @java.lang.Override()
-  public int af();//  af()
-
-  public  C();//  .ctor()
-
-  public int getAp();//  getAp()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java
index 956ea43eada..dd8d55f1f9b 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java
@@ -1,4 +1,5 @@
 public final class C /* p.C*/ extends p.A {
+  @java.lang.Override()
   protected int af();//  af()
 
   protected int getAp();//  getAp()
diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt
index ff16ffbb609..93c0e8fd816 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt
@@ -1,4 +1,6 @@
 // p.C
+// COMPILATION_ERRORS
+// FILE: C.kt
 package p
 
 class C : A() {
@@ -10,4 +12,10 @@ class C : A() {
     }
 }
 
-// COMPILATION_ERRORS
\ No newline at end of file
+// FILE: A.kt
+package p
+
+abstract class A {
+    protected val ap: Int = 4
+    abstract protected fun af(): Int
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java
deleted file mode 100644
index 845adc0ccbb..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.fir.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public final class multifileFacade /* multifileFacade*/ {
-  public static final int x1 = 42 /* initializer type: int */ /* constant value 42 */;
-
-  public static final int foo();//  foo()
-
-  public static final int getX();//  getX()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java
index d0f1f846914..64f73808257 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.java
@@ -11,3 +11,17 @@ public final class multifileFacade /* multifileFacade*/ {
 
   public static final int getY();//  getY()
 }
+
+public final class multifileFacade /* multifileFacade*/ {
+  public static final int x1 = 42 /* initializer type: int */ /* constant value 42 */;
+
+  public static final int y1 = 42 /* initializer type: int */ /* constant value 42 */;
+
+  public static final int bar();//  bar()
+
+  public static final int foo();//  foo()
+
+  public static final int getX();//  getX()
+
+  public static final int getY();//  getY()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt
index 76bf845a2cc..cd598d1b378 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt
@@ -1,3 +1,4 @@
+// FILE: MultifileFacade.kt
 @file:JvmMultifileClass
 @file:JvmName("multifileFacade")
 
@@ -7,4 +8,14 @@ val x = 24
 
 private fun privateFoo(): Int = 3
 
-const val x1 = 42
\ No newline at end of file
+const val x1 = 42
+
+// FILE: SecondMultifileFacade.kt
+@file:JvmMultifileClass
+@file:JvmName("multifileFacade")
+
+fun bar() = 24
+
+val y = 24
+
+const val y1 = 42
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt.1 b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt.1
deleted file mode 100644
index 5fb5f6f3148..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.kt.1
+++ /dev/null
@@ -1,8 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("multifileFacade")
-
-fun bar() = 24
-
-val y = 24
-
-const val y1 = 42
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java
index 1407269d003..1ba76bd337c 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacade.lib.java
@@ -1,9 +1,15 @@
 public final class multifileFacade /* multifileFacade*/ {
   public static final int x1 = 42 /* initializer type: int */ /* constant value 42 */;
 
+  public static final int y1 = 42 /* initializer type: int */ /* constant value 42 */;
+
+  public static final int bar();//  bar()
+
   public static final int foo();//  foo()
 
   public static final int getX();//  getX()
+
+  public static final int getY();//  getY()
 }
 
 final class multifileFacade__MultifileFacadeKt /* multifileFacade__MultifileFacadeKt*/ {
@@ -15,3 +21,11 @@ final class multifileFacade__MultifileFacadeKt /* multifileFacade__MultifileFaca
 
   public static final int getX();//  getX()
 }
+
+final class multifileFacade__SecondMultifileFacadeKt /* multifileFacade__SecondMultifileFacadeKt*/ {
+  private static final int y;
+
+  public static final int bar();//  bar()
+
+  public static final int getY();//  getY()
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java
deleted file mode 100644
index 39848580665..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.fir.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public final class multifileFacade /* multifileFacade*/ {
-  public static final int foo();//  foo()
-}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt
index b013669ce71..85d18862c6d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt
@@ -1,6 +1,11 @@
+// FILE: MultifileFacadeJvmName.kt
 @file:JvmMultifileClass
 @file:JvmName("multifileFacade")
 
 fun foo() = 42
 
-// FIR_COMPARISON
\ No newline at end of file
+// FILE: OtherMultifileFacadeJvmName.kt
+@file:JvmMultifileClass
+@file:JvmName("otherMultifileFacade")
+
+fun bar() = 24
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt.1 b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt.1
deleted file mode 100644
index eb5a140c912..00000000000
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.kt.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("otherMultifileFacade")
-
-fun bar() = 24
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java
index 43007ffbfa3..c09cf0d366a 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/multifileFacadeJvmName.lib.java
@@ -5,3 +5,11 @@ public final class multifileFacade /* multifileFacade*/ {
 final class multifileFacade__MultifileFacadeJvmNameKt /* multifileFacade__MultifileFacadeJvmNameKt*/ {
   public static final int foo();//  foo()
 }
+
+public final class otherMultifileFacade /* otherMultifileFacade*/ {
+  public static final int bar();//  bar()
+}
+
+final class otherMultifileFacade__OtherMultifileFacadeJvmNameKt /* otherMultifileFacade__OtherMultifileFacadeJvmNameKt*/ {
+  public static final int bar();//  bar()
+}