diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index 0cd7533eea7..2562903fe21 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -213,18 +213,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
         }
 
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
-        }
-
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
-        }
-
         @Test
         @TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
         public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
-        public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
-        }
-
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
-        public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
-        }
-
-        @Test
-        @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
-        public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
-        }
-
         @Test
         @TestMetadata("kt11167.kt")
         public void testKt11167() throws Exception {
@@ -11495,6 +11465,46 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
+        @TestDataPath("$PROJECT_ROOT")
+        public class FieldRename {
+            @Test
+            public void testAllFilesPresentInFieldRename() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
+            public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
+            public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
+            }
+
+            @Test
+            @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
+            public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/funInterface")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 285726b6180..4d520435c9f 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -213,18 +213,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
         }
 
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
-        }
-
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
-        }
-
         @Test
         @TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
         public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
-        public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
-        }
-
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
-        public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
-        }
-
-        @Test
-        @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
-        public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
-        }
-
         @Test
         @TestMetadata("kt11167.kt")
         public void testKt11167() throws Exception {
@@ -11501,6 +11471,46 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
+        @TestDataPath("$PROJECT_ROOT")
+        public class FieldRename {
+            @Test
+            public void testAllFilesPresentInFieldRename() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
+            public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
+            public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
+            }
+
+            @Test
+            @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
+            public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/funInterface")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index 3ba3e093265..2e4541c1b1a 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -213,18 +213,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
         }
 
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
-        }
-
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
-        }
-
         @Test
         @TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
         public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
-        public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
-        }
-
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
-        public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
-        }
-
-        @Test
-        @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
-        public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
-        }
-
         @Test
         @TestMetadata("kt11167.kt")
         public void testKt11167() throws Exception {
@@ -11495,6 +11465,46 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
+        @TestDataPath("$PROJECT_ROOT")
+        public class FieldRename {
+            @Test
+            public void testAllFilesPresentInFieldRename() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
+            public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
+            public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
+            }
+
+            @Test
+            @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
+            public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/funInterface")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.fir.kt b/compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.fir.kt
rename to compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.fir.kt
diff --git a/compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt b/compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt
rename to compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt
diff --git a/compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.txt b/compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.txt
rename to compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.txt
diff --git a/compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt b/compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt
rename to compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt
diff --git a/compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.txt b/compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.txt
rename to compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.txt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.fir.kt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.txt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.fir.kt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt
diff --git a/compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.txt b/compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.txt
rename to compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.txt
diff --git a/compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt b/compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.fir.kt
diff --git a/compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt b/compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt
rename to compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt
diff --git a/compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt b/compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt
rename to compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.txt
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 4e9388f1f00..7ae0452863b 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -213,18 +213,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt");
         }
 
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField.kt");
-        }
-
-        @Test
-        @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
-        public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/derivedClassPropertyShadowsBaseClassField13.kt");
-        }
-
         @Test
         @TestMetadata("derivedIntersectionPropertyShadowsBaseClassField.kt")
         public void testDerivedIntersectionPropertyShadowsBaseClassField() throws Exception {
@@ -411,24 +399,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
-        public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
-        }
-
-        @Test
-        @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
-        public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
-        }
-
-        @Test
-        @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
-        public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
-            runTest("compiler/testData/diagnostics/tests/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
-        }
-
         @Test
         @TestMetadata("kt11167.kt")
         public void testKt11167() throws Exception {
@@ -11501,6 +11471,46 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/fieldRename")
+        @TestDataPath("$PROJECT_ROOT")
+        public class FieldRename {
+            @Test
+            public void testAllFilesPresentInFieldRename() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/fieldRename"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField.kt");
+            }
+
+            @Test
+            @TestMetadata("derivedClassPropertyShadowsBaseClassField13.kt")
+            public void testDerivedClassPropertyShadowsBaseClassField13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/derivedClassPropertyShadowsBaseClassField13.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt")
+            public void testJavaFieldKotlinPropertyJavaFieldInPackagePrivate() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaFieldInPackagePrivate.kt");
+            }
+
+            @Test
+            @TestMetadata("javaFieldKotlinPropertyJavaPackagePrivateField.kt")
+            public void testJavaFieldKotlinPropertyJavaPackagePrivateField() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaFieldKotlinPropertyJavaPackagePrivateField.kt");
+            }
+
+            @Test
+            @TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyReference.kt")
+            public void testJavaProtectedFieldAndKotlinInvisiblePropertyReference() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/fieldRename/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/funInterface")
         @TestDataPath("$PROJECT_ROOT")