diff --git a/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.kt b/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.kt
rename to compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.kt
diff --git a/compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt b/compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.txt
rename to compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.txt
diff --git a/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.kt b/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.kt
rename to compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.kt
diff --git a/compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt b/compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.txt
rename to compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.txt
diff --git a/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.kt b/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.kt
rename to compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.kt
diff --git a/compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt b/compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.txt
rename to compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.txt
diff --git a/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.kt b/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.kt
rename to compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.kt
diff --git a/compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt b/compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.txt
rename to compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.txt
diff --git a/compiler/testData/psi/annotation/onFile/single.kt b/compiler/testData/psi/annotation/onFileObsolete/single.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/single.kt
rename to compiler/testData/psi/annotation/onFileObsolete/single.kt
diff --git a/compiler/testData/psi/annotation/onFile/single.txt b/compiler/testData/psi/annotation/onFileObsolete/single.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/single.txt
rename to compiler/testData/psi/annotation/onFileObsolete/single.txt
diff --git a/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.kt b/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.kt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.kt
diff --git a/compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.txt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.txt
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackage.kt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutPackage.kt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutPackage.kt
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackage.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutPackage.txt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutPackage.txt
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.kt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.kt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.kt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.kt
diff --git a/compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt b/compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
similarity index 100%
rename from compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.txt
rename to compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
index 9d3d2f12348..486a2da6742 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
@@ -810,59 +810,59 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 }
             }
 
-            @TestMetadata("compiler/testData/psi/annotation/onFile")
+            @TestMetadata("compiler/testData/psi/annotation/onFileObsolete")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
-            public static class OnFile extends AbstractJetParsingTest {
-                public void testAllFilesPresentInOnFile() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/onFile"), Pattern.compile("^(.*)\\.kts?$"), true);
+            public static class OnFileObsolete extends AbstractJetParsingTest {
+                public void testAllFilesPresentInOnFileObsolete() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/onFileObsolete"), Pattern.compile("^(.*)\\.kts?$"), true);
                 }
 
                 @TestMetadata("fileAnnotationInWrongPlace.kt")
                 public void testFileAnnotationInWrongPlace() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/fileAnnotationInWrongPlace.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/fileAnnotationInWrongPlace.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("manyAnnotationBlocks.kt")
                 public void testManyAnnotationBlocks() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/manyAnnotationBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/manyAnnotationBlocks.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("manyInOneAnnotationBlock.kt")
                 public void testManyInOneAnnotationBlock() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/manyInOneAnnotationBlock.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/manyInOneAnnotationBlock.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("nonFIleAnnotationBeforePackage.kt")
                 public void testNonFIleAnnotationBeforePackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/nonFIleAnnotationBeforePackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/nonFIleAnnotationBeforePackage.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("single.kt")
                 public void testSingle() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/single.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/single.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("withoutFileAnnotationAndPackageDeclaration.kt")
                 public void testWithoutFileAnnotationAndPackageDeclaration() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/withoutFileAnnotationAndPackageDeclaration.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/withoutFileAnnotationAndPackageDeclaration.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("withoutPackage.kt")
                 public void testWithoutPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/withoutPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/withoutPackage.kt");
                     doParsingTest(fileName);
                 }
 
                 @TestMetadata("withoutPackageWithSimpleAnnotation.kt")
                 public void testWithoutPackageWithSimpleAnnotation() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFile/withoutPackageWithSimpleAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/onFileObsolete/withoutPackageWithSimpleAnnotation.kt");
                     doParsingTest(fileName);
                 }
             }