diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
index 8cf4cceb1e4..4e065f4714b 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
@@ -25,8 +25,8 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
     }
 
     @Test
-    @TestMetadata("exceptionFromInterpreter_ir.kt")
-    public void testExceptionFromInterpreter_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.kt");
+    @TestMetadata("exceptionFromInterpreter.kt")
+    public void testExceptionFromInterpreter() throws Exception {
+        runTest("compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt");
     }
 }
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
index 108b1fb45f9..de3ad894dcb 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
@@ -25,15 +25,15 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
     }
 
     @Test
-    @TestMetadata("indirectInlineCycle_ir.kt")
-    public void testIndirectInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.kt");
+    @TestMetadata("indirectInlineCycle.kt")
+    public void testIndirectInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt");
     }
 
     @Test
-    @TestMetadata("inlineCycle_ir.kt")
-    public void testInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.kt");
+    @TestMetadata("inlineCycle.kt")
+    public void testInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt");
     }
 
     @Test
@@ -49,9 +49,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
     }
 
     @Test
-    @TestMetadata("multipleBigArityFunsImplemented_ir.kt")
-    public void testMultipleBigArityFunsImplemented_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.kt");
+    @TestMetadata("multipleBigArityFunsImplemented.kt")
+    public void testMultipleBigArityFunsImplemented() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt");
     }
 
     @Test
@@ -67,9 +67,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
     }
 
     @Test
-    @TestMetadata("suspendInlineCycle_ir.kt")
-    public void testSuspendInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.kt");
+    @TestMetadata("suspendInlineCycle.kt")
+    public void testSuspendInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt");
     }
 
     @Nested
@@ -139,15 +139,15 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("defaultFunction_ir.kt")
-            public void testDefaultFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.kt");
+            @TestMetadata("defaultFunction.kt")
+            public void testDefaultFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt");
             }
 
             @Test
-            @TestMetadata("delegatedFunctionOverriddenByProperty_ir.kt")
-            public void testDelegatedFunctionOverriddenByProperty_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.kt");
+            @TestMetadata("delegatedFunctionOverriddenByProperty.kt")
+            public void testDelegatedFunctionOverriddenByProperty() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt");
             }
 
             @Test
@@ -157,9 +157,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("overridesNothing_ir.kt")
-            public void testOverridesNothing_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.kt");
+            @TestMetadata("overridesNothing.kt")
+            public void testOverridesNothing() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt");
             }
 
             @Test
@@ -168,6 +168,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
             }
 
+            @Test
+            @TestMetadata("traitFunctionOverriddenByProperty.kt")
+            public void testTraitFunctionOverriddenByProperty() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt");
+            }
+
             @Test
             @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt")
             public void testTraitFunctionOverriddenByPropertyNoImpl() throws Exception {
@@ -175,9 +181,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("traitFunctionOverriddenByProperty_ir.kt")
-            public void testTraitFunctionOverriddenByProperty_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.kt");
+            @TestMetadata("traitPropertyOverriddenByFunction.kt")
+            public void testTraitPropertyOverriddenByFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt");
             }
 
             @Test
@@ -185,12 +191,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt");
             }
-
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunction_ir.kt")
-            public void testTraitPropertyOverriddenByFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.kt");
-            }
         }
 
         @Nested
@@ -203,21 +203,21 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("class_ir.kt")
-            public void testClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.kt");
+            @TestMetadata("class.kt")
+            public void testClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt");
             }
 
             @Test
-            @TestMetadata("fakeOverrideTrait_ir.kt")
-            public void testFakeOverrideTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.kt");
+            @TestMetadata("fakeOverrideTrait.kt")
+            public void testFakeOverrideTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt");
             }
 
             @Test
-            @TestMetadata("trait_ir.kt")
-            public void testTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.kt");
+            @TestMetadata("trait.kt")
+            public void testTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt");
             }
         }
 
@@ -231,9 +231,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("clashFromInterfaceAndSuperClass_ir.kt")
-            public void testClashFromInterfaceAndSuperClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.kt");
+            @TestMetadata("clashFromInterfaceAndSuperClass.kt")
+            public void testClashFromInterfaceAndSuperClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt");
             }
 
             @Test
@@ -273,9 +273,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("inheritFromTwoTraits_ir.kt")
-            public void testInheritFromTwoTraits_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.kt");
+            @TestMetadata("inheritFromTwoTraits.kt")
+            public void testInheritFromTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt");
             }
 
             @Test
@@ -291,15 +291,15 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("superTraitAndDelegationToTraitImpl_ir.kt")
-            public void testSuperTraitAndDelegationToTraitImpl_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.kt");
+            @TestMetadata("superTraitAndDelegationToTraitImpl.kt")
+            public void testSuperTraitAndDelegationToTraitImpl() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt");
             }
 
             @Test
-            @TestMetadata("twoTraitsAndOwnFunction_ir.kt")
-            public void testTwoTraitsAndOwnFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.kt");
+            @TestMetadata("twoTraitsAndOwnFunction.kt")
+            public void testTwoTraitsAndOwnFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt");
             }
 
             @Test
@@ -349,9 +349,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("waitNotifyGetClass_ir.kt")
-            public void testWaitNotifyGetClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.kt");
+            @TestMetadata("waitNotifyGetClass.kt")
+            public void testWaitNotifyGetClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt");
             }
         }
 
@@ -467,9 +467,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("trait_ir.kt")
-            public void testTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.kt");
+            @TestMetadata("trait.kt")
+            public void testTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt");
             }
         }
 
@@ -498,6 +498,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
             }
 
+            @Test
+            @TestMetadata("classObject.kt")
+            public void testClassObject() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt");
+            }
+
             @Test
             @TestMetadata("classObjectCopiedField.kt")
             public void testClassObjectCopiedField() throws Exception {
@@ -505,15 +511,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("classObjectCopiedFieldObject_ir.kt")
-            public void testClassObjectCopiedFieldObject_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.kt");
-            }
-
-            @Test
-            @TestMetadata("classObject_ir.kt")
-            public void testClassObject_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.kt");
+            @TestMetadata("classObjectCopiedFieldObject.kt")
+            public void testClassObjectCopiedFieldObject() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt");
             }
 
             @Test
@@ -523,15 +523,15 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("defaults_ir.kt")
-            public void testDefaults_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.kt");
+            @TestMetadata("defaults.kt")
+            public void testDefaults() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt");
             }
 
             @Test
-            @TestMetadata("delegationBy_ir.kt")
-            public void testDelegationBy_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.kt");
+            @TestMetadata("delegationBy.kt")
+            public void testDelegationBy() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt");
             }
 
             @Test
@@ -541,21 +541,21 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("innerClassField_ir.kt")
-            public void testInnerClassField_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.kt");
+            @TestMetadata("innerClassField.kt")
+            public void testInnerClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt");
             }
 
             @Test
-            @TestMetadata("instance_ir.kt")
-            public void testInstance_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.kt");
+            @TestMetadata("instance.kt")
+            public void testInstance() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt");
             }
 
             @Test
-            @TestMetadata("propertyMetadataCache_ir.kt")
-            public void testPropertyMetadataCache_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.kt");
+            @TestMetadata("propertyMetadataCache.kt")
+            public void testPropertyMetadataCache() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt");
             }
         }
 
@@ -631,9 +631,9 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("defaultVsNonDefault_ir.kt")
-            public void testDefaultVsNonDefault_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.kt");
+            @TestMetadata("defaultVsNonDefault.kt")
+            public void testDefaultVsNonDefault() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt");
             }
 
             @Test
@@ -643,27 +643,27 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("oneTrait_ir.kt")
-            public void testOneTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.kt");
+            @TestMetadata("oneTrait.kt")
+            public void testOneTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt");
             }
 
             @Test
-            @TestMetadata("traitFunctionOverriddenByPropertyInTrait_ir.kt")
-            public void testTraitFunctionOverriddenByPropertyInTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.kt");
+            @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt")
+            public void testTraitFunctionOverriddenByPropertyInTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt");
             }
 
             @Test
-            @TestMetadata("traitPropertyOverriddenByFunctionInTrait_ir.kt")
-            public void testTraitPropertyOverriddenByFunctionInTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.kt");
+            @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt")
+            public void testTraitPropertyOverriddenByFunctionInTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt");
             }
 
             @Test
-            @TestMetadata("twoTraits_ir.kt")
-            public void testTwoTraits_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.kt");
+            @TestMetadata("twoTraits.kt")
+            public void testTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt");
             }
         }
 
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt
new file mode 100644
index 00000000000..7e3fd27cb87
--- /dev/null
+++ b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt
@@ -0,0 +1,5 @@
+/exceptionFromInterpreter.kt:6:26: error: Cannot evaluate constant expression: / by zero
+
+/exceptionFromInterpreter.kt:7:26: warning: Constant expression will throw an exception at runtime: / by zero
+
+/exceptionFromInterpreter.kt:8:39: error: Cannot evaluate constant expression: marginPrefix must be non-blank string.
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.fir.diag.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.fir.diag.txt
new file mode 100644
index 00000000000..91cb8a9ba42
--- /dev/null
+++ b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.fir.diag.txt
@@ -0,0 +1,5 @@
+/exceptionFromInterpreter.kt:(174,179): warning: Division by zero
+
+/exceptionFromInterpreter.kt:(205,210): warning: Division by zero
+
+/exceptionFromInterpreter.kt:(243,264): error: Const 'val' initializer should be a constant value
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.kt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt
similarity index 100%
rename from compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.kt
rename to compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt
similarity index 100%
rename from compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.txt
rename to compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.diag.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.diag.txt
deleted file mode 100644
index 5f481b12115..00000000000
--- a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.diag.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/exceptionFromInterpreter_ir.kt:6:26: error: Cannot evaluate constant expression: / by zero
-
-/exceptionFromInterpreter_ir.kt:7:26: warning: Constant expression will throw an exception at runtime: / by zero
-
-/exceptionFromInterpreter_ir.kt:8:39: error: Cannot evaluate constant expression: marginPrefix must be non-blank string.
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.fir.diag.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.fir.diag.txt
deleted file mode 100644
index 81e59dbe360..00000000000
--- a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter_ir.fir.diag.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/exceptionFromInterpreter_ir.kt:(174,179): warning: Division by zero
-
-/exceptionFromInterpreter_ir.kt:(205,210): warning: Division by zero
-
-/exceptionFromInterpreter_ir.kt:(243,264): error: Const 'val' initializer should be a constant value
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.fir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.fir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.fir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.fir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt
new file mode 100644
index 00000000000..4c7cc9d7f16
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt
@@ -0,0 +1,3 @@
+/indirectInlineCycle.kt:6:24: error: The 'inlineFun2' invocation is a part of inline cycle
+
+/indirectInlineCycle.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.diag.txt
deleted file mode 100644
index 470f3ba8e86..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.diag.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-/indirectInlineCycle_ir.kt:6:24: error: The 'inlineFun2' invocation is a part of inline cycle
-
-/indirectInlineCycle_ir.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt
new file mode 100644
index 00000000000..f6436d9fae0
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt
@@ -0,0 +1,3 @@
+/inlineCycle.kt:6:5: error: The 'inlineFun2' invocation is a part of inline cycle
+
+/inlineCycle.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.diag.txt
deleted file mode 100644
index 6c9de85d6c2..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.diag.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-/inlineCycle_ir.kt:6:5: error: The 'inlineFun2' invocation is a part of inline cycle
-
-/inlineCycle_ir.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt
new file mode 100644
index 00000000000..3fa81644df5
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt
@@ -0,0 +1,3 @@
+/suspendInlineCycle.kt:6:5: error: The 'inlineFun2' invocation is a part of inline cycle
+
+/suspendInlineCycle.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.txt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.txt
rename to compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.txt
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.diag.txt
deleted file mode 100644
index 696f64fbcd2..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.diag.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-/suspendInlineCycle_ir.kt:6:5: error: The 'inlineFun2' invocation is a part of inline cycle
-
-/suspendInlineCycle_ir.kt:11:5: error: The 'inlineFun1' invocation is a part of inline cycle
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
index bd70035e425..84c15562b79 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
@@ -26,15 +26,15 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
     }
 
     @Test
-    @TestMetadata("indirectInlineCycle_ir.kt")
-    public void testIndirectInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.kt");
+    @TestMetadata("indirectInlineCycle.kt")
+    public void testIndirectInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt");
     }
 
     @Test
-    @TestMetadata("inlineCycle_ir.kt")
-    public void testInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle_ir.kt");
+    @TestMetadata("inlineCycle.kt")
+    public void testInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt");
     }
 
     @Test
@@ -50,9 +50,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
     }
 
     @Test
-    @TestMetadata("multipleBigArityFunsImplemented_ir.kt")
-    public void testMultipleBigArityFunsImplemented_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented_ir.kt");
+    @TestMetadata("multipleBigArityFunsImplemented.kt")
+    public void testMultipleBigArityFunsImplemented() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt");
     }
 
     @Test
@@ -68,9 +68,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
     }
 
     @Test
-    @TestMetadata("suspendInlineCycle_ir.kt")
-    public void testSuspendInlineCycle_ir() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle_ir.kt");
+    @TestMetadata("suspendInlineCycle.kt")
+    public void testSuspendInlineCycle() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt");
     }
 
     @Nested
@@ -140,15 +140,15 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("defaultFunction_ir.kt")
-            public void testDefaultFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.kt");
+            @TestMetadata("defaultFunction.kt")
+            public void testDefaultFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt");
             }
 
             @Test
-            @TestMetadata("delegatedFunctionOverriddenByProperty_ir.kt")
-            public void testDelegatedFunctionOverriddenByProperty_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.kt");
+            @TestMetadata("delegatedFunctionOverriddenByProperty.kt")
+            public void testDelegatedFunctionOverriddenByProperty() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt");
             }
 
             @Test
@@ -158,9 +158,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("overridesNothing_ir.kt")
-            public void testOverridesNothing_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing_ir.kt");
+            @TestMetadata("overridesNothing.kt")
+            public void testOverridesNothing() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt");
             }
 
             @Test
@@ -169,6 +169,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
             }
 
+            @Test
+            @TestMetadata("traitFunctionOverriddenByProperty.kt")
+            public void testTraitFunctionOverriddenByProperty() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt");
+            }
+
             @Test
             @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt")
             public void testTraitFunctionOverriddenByPropertyNoImpl() throws Exception {
@@ -176,9 +182,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("traitFunctionOverriddenByProperty_ir.kt")
-            public void testTraitFunctionOverriddenByProperty_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.kt");
+            @TestMetadata("traitPropertyOverriddenByFunction.kt")
+            public void testTraitPropertyOverriddenByFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt");
             }
 
             @Test
@@ -186,12 +192,6 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt");
             }
-
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunction_ir.kt")
-            public void testTraitPropertyOverriddenByFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.kt");
-            }
         }
 
         @Nested
@@ -204,21 +204,21 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("class_ir.kt")
-            public void testClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.kt");
+            @TestMetadata("class.kt")
+            public void testClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt");
             }
 
             @Test
-            @TestMetadata("fakeOverrideTrait_ir.kt")
-            public void testFakeOverrideTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.kt");
+            @TestMetadata("fakeOverrideTrait.kt")
+            public void testFakeOverrideTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt");
             }
 
             @Test
-            @TestMetadata("trait_ir.kt")
-            public void testTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.kt");
+            @TestMetadata("trait.kt")
+            public void testTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt");
             }
         }
 
@@ -232,9 +232,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("clashFromInterfaceAndSuperClass_ir.kt")
-            public void testClashFromInterfaceAndSuperClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.kt");
+            @TestMetadata("clashFromInterfaceAndSuperClass.kt")
+            public void testClashFromInterfaceAndSuperClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt");
             }
 
             @Test
@@ -274,9 +274,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("inheritFromTwoTraits_ir.kt")
-            public void testInheritFromTwoTraits_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.kt");
+            @TestMetadata("inheritFromTwoTraits.kt")
+            public void testInheritFromTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt");
             }
 
             @Test
@@ -292,15 +292,15 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("superTraitAndDelegationToTraitImpl_ir.kt")
-            public void testSuperTraitAndDelegationToTraitImpl_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.kt");
+            @TestMetadata("superTraitAndDelegationToTraitImpl.kt")
+            public void testSuperTraitAndDelegationToTraitImpl() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt");
             }
 
             @Test
-            @TestMetadata("twoTraitsAndOwnFunction_ir.kt")
-            public void testTwoTraitsAndOwnFunction_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.kt");
+            @TestMetadata("twoTraitsAndOwnFunction.kt")
+            public void testTwoTraitsAndOwnFunction() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt");
             }
 
             @Test
@@ -350,9 +350,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("waitNotifyGetClass_ir.kt")
-            public void testWaitNotifyGetClass_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.kt");
+            @TestMetadata("waitNotifyGetClass.kt")
+            public void testWaitNotifyGetClass() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt");
             }
         }
 
@@ -468,9 +468,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("trait_ir.kt")
-            public void testTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.kt");
+            @TestMetadata("trait.kt")
+            public void testTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt");
             }
         }
 
@@ -499,6 +499,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
             }
 
+            @Test
+            @TestMetadata("classObject.kt")
+            public void testClassObject() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt");
+            }
+
             @Test
             @TestMetadata("classObjectCopiedField.kt")
             public void testClassObjectCopiedField() throws Exception {
@@ -506,15 +512,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("classObjectCopiedFieldObject_ir.kt")
-            public void testClassObjectCopiedFieldObject_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.kt");
-            }
-
-            @Test
-            @TestMetadata("classObject_ir.kt")
-            public void testClassObject_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.kt");
+            @TestMetadata("classObjectCopiedFieldObject.kt")
+            public void testClassObjectCopiedFieldObject() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt");
             }
 
             @Test
@@ -524,15 +524,15 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("defaults_ir.kt")
-            public void testDefaults_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.kt");
+            @TestMetadata("defaults.kt")
+            public void testDefaults() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt");
             }
 
             @Test
-            @TestMetadata("delegationBy_ir.kt")
-            public void testDelegationBy_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.kt");
+            @TestMetadata("delegationBy.kt")
+            public void testDelegationBy() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt");
             }
 
             @Test
@@ -542,21 +542,21 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("innerClassField_ir.kt")
-            public void testInnerClassField_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.kt");
+            @TestMetadata("innerClassField.kt")
+            public void testInnerClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt");
             }
 
             @Test
-            @TestMetadata("instance_ir.kt")
-            public void testInstance_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.kt");
+            @TestMetadata("instance.kt")
+            public void testInstance() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt");
             }
 
             @Test
-            @TestMetadata("propertyMetadataCache_ir.kt")
-            public void testPropertyMetadataCache_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.kt");
+            @TestMetadata("propertyMetadataCache.kt")
+            public void testPropertyMetadataCache() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt");
             }
         }
 
@@ -632,9 +632,9 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("defaultVsNonDefault_ir.kt")
-            public void testDefaultVsNonDefault_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.kt");
+            @TestMetadata("defaultVsNonDefault.kt")
+            public void testDefaultVsNonDefault() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt");
             }
 
             @Test
@@ -644,27 +644,27 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
             }
 
             @Test
-            @TestMetadata("oneTrait_ir.kt")
-            public void testOneTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.kt");
+            @TestMetadata("oneTrait.kt")
+            public void testOneTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt");
             }
 
             @Test
-            @TestMetadata("traitFunctionOverriddenByPropertyInTrait_ir.kt")
-            public void testTraitFunctionOverriddenByPropertyInTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.kt");
+            @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt")
+            public void testTraitFunctionOverriddenByPropertyInTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt");
             }
 
             @Test
-            @TestMetadata("traitPropertyOverriddenByFunctionInTrait_ir.kt")
-            public void testTraitPropertyOverriddenByFunctionInTrait_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.kt");
+            @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt")
+            public void testTraitPropertyOverriddenByFunctionInTrait() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt");
             }
 
             @Test
-            @TestMetadata("twoTraits_ir.kt")
-            public void testTwoTraits_ir() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.kt");
+            @TestMetadata("twoTraits.kt")
+            public void testTwoTraits() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt");
             }
         }