diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
index c741084072e..16ec7abc990 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
@@ -213,7 +213,7 @@ public class CodegenBinding {
 
         sortedAnswer.sort(Comparator.comparing((KtFile file) -> {
             VirtualFile virtualFile = file.getVirtualFile();
-            assert virtualFile != null : "VirtualFile is null for JetFile: " + file.getName();
+            assert virtualFile != null : "VirtualFile is null for KtFile: " + file.getName();
             return virtualFile.getPath();
         }));
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
index 929cbafaf15..086700d90fb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
@@ -70,7 +70,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn
 
     @Override
     public String toString() {
-        return "JetFile: " + getName();
+        return "KtFile: " + getName();
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java
index 704a228e0a2..4e0ca00864e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java
@@ -81,7 +81,7 @@ public abstract class KtClassOrObjectInfo<E extends KtClassOrObject> implements
             KtFile jetFile = (KtFile) file;
             return jetFile.getPackageFqName();
         }
-        throw new IllegalArgumentException("Not in a JetFile: " + element);
+        throw new IllegalArgumentException("Not in a KtFile: " + element);
     }
 
     @NotNull
diff --git a/compiler/testData/parseCodeFragment/block/expressionOnTopLevel.txt b/compiler/testData/parseCodeFragment/block/expressionOnTopLevel.txt
index dcdaab41611..5989162feb8 100644
--- a/compiler/testData/parseCodeFragment/block/expressionOnTopLevel.txt
+++ b/compiler/testData/parseCodeFragment/block/expressionOnTopLevel.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')
diff --git a/compiler/testData/parseCodeFragment/block/imports.txt b/compiler/testData/parseCodeFragment/block/imports.txt
index 082206a2713..0d3b00d75bf 100644
--- a/compiler/testData/parseCodeFragment/block/imports.txt
+++ b/compiler/testData/parseCodeFragment/block/imports.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE
diff --git a/compiler/testData/parseCodeFragment/block/localFun.txt b/compiler/testData/parseCodeFragment/block/localFun.txt
index 504a2bfa8c4..eda1c69bc0f 100644
--- a/compiler/testData/parseCodeFragment/block/localFun.txt
+++ b/compiler/testData/parseCodeFragment/block/localFun.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     FUN
       PsiElement(fun)('fun')
diff --git a/compiler/testData/parseCodeFragment/block/oneLine.txt b/compiler/testData/parseCodeFragment/block/oneLine.txt
index ce4133f7838..874dd38e59d 100644
--- a/compiler/testData/parseCodeFragment/block/oneLine.txt
+++ b/compiler/testData/parseCodeFragment/block/oneLine.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')
diff --git a/compiler/testData/parseCodeFragment/block/oneStatement.txt b/compiler/testData/parseCodeFragment/block/oneStatement.txt
index f259cc71302..7dbded5d193 100644
--- a/compiler/testData/parseCodeFragment/block/oneStatement.txt
+++ b/compiler/testData/parseCodeFragment/block/oneStatement.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')
diff --git a/compiler/testData/parseCodeFragment/block/packageAndImport.txt b/compiler/testData/parseCodeFragment/block/packageAndImport.txt
index 922ecf82b87..500caae9dc0 100644
--- a/compiler/testData/parseCodeFragment/block/packageAndImport.txt
+++ b/compiler/testData/parseCodeFragment/block/packageAndImport.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE
diff --git a/compiler/testData/parseCodeFragment/block/packageDirective.txt b/compiler/testData/parseCodeFragment/block/packageDirective.txt
index 30ff66c7d63..86ed6fe6ca8 100644
--- a/compiler/testData/parseCodeFragment/block/packageDirective.txt
+++ b/compiler/testData/parseCodeFragment/block/packageDirective.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PsiErrorElement:Package directive and imports are forbidden in code fragments
       PACKAGE_DIRECTIVE
diff --git a/compiler/testData/parseCodeFragment/block/severalExpressions.txt b/compiler/testData/parseCodeFragment/block/severalExpressions.txt
index dc0c898a801..47ee2166e2e 100644
--- a/compiler/testData/parseCodeFragment/block/severalExpressions.txt
+++ b/compiler/testData/parseCodeFragment/block/severalExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     BINARY_EXPRESSION
       INTEGER_CONSTANT
diff --git a/compiler/testData/parseCodeFragment/block/severalStatements.txt b/compiler/testData/parseCodeFragment/block/severalStatements.txt
index a2416e68a2f..fa0019d7184 100644
--- a/compiler/testData/parseCodeFragment/block/severalStatements.txt
+++ b/compiler/testData/parseCodeFragment/block/severalStatements.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')
diff --git a/compiler/testData/parseCodeFragment/block/unexpectedSymbol.txt b/compiler/testData/parseCodeFragment/block/unexpectedSymbol.txt
index b428eebb354..e1dbb3efe56 100644
--- a/compiler/testData/parseCodeFragment/block/unexpectedSymbol.txt
+++ b/compiler/testData/parseCodeFragment/block/unexpectedSymbol.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BLOCK
     PROPERTY
       PsiElement(val)('val')
diff --git a/compiler/testData/parseCodeFragment/expression/error.txt b/compiler/testData/parseCodeFragment/expression/error.txt
index 7bd861f3abd..6ecd94f3e0f 100644
--- a/compiler/testData/parseCodeFragment/expression/error.txt
+++ b/compiler/testData/parseCodeFragment/expression/error.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BINARY_EXPRESSION
     INTEGER_CONSTANT
       PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/parseCodeFragment/expression/simple.txt b/compiler/testData/parseCodeFragment/expression/simple.txt
index 344db2d68a3..e5269e2e6a3 100644
--- a/compiler/testData/parseCodeFragment/expression/simple.txt
+++ b/compiler/testData/parseCodeFragment/expression/simple.txt
@@ -1,4 +1,4 @@
-JetFile: fragment.kt
+KtFile: fragment.kt
   BINARY_EXPRESSION
     INTEGER_CONSTANT
       PsiElement(INTEGER_LITERAL)('1')
diff --git a/compiler/testData/psi/AbsentInnerType.txt b/compiler/testData/psi/AbsentInnerType.txt
index 9aa103899c2..1c73426ce2b 100644
--- a/compiler/testData/psi/AbsentInnerType.txt
+++ b/compiler/testData/psi/AbsentInnerType.txt
@@ -1,4 +1,4 @@
-JetFile: AbsentInnerType.kt
+KtFile: AbsentInnerType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/AnonymousInitializer.txt b/compiler/testData/psi/AnonymousInitializer.txt
index dc68f8a6dcb..febff05cb9b 100644
--- a/compiler/testData/psi/AnonymousInitializer.txt
+++ b/compiler/testData/psi/AnonymousInitializer.txt
@@ -1,4 +1,4 @@
-JetFile: AnonymousInitializer.kt
+KtFile: AnonymousInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/AssertNotNull.txt b/compiler/testData/psi/AssertNotNull.txt
index a002e63ebef..ac310f6aba3 100644
--- a/compiler/testData/psi/AssertNotNull.txt
+++ b/compiler/testData/psi/AssertNotNull.txt
@@ -1,4 +1,4 @@
-JetFile: AssertNotNull.kt
+KtFile: AssertNotNull.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BabySteps.txt b/compiler/testData/psi/BabySteps.txt
index 7b14c75787c..63941d3d31f 100644
--- a/compiler/testData/psi/BabySteps.txt
+++ b/compiler/testData/psi/BabySteps.txt
@@ -1,4 +1,4 @@
-JetFile: BabySteps.kt
+KtFile: BabySteps.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/BabySteps_ERR.txt b/compiler/testData/psi/BabySteps_ERR.txt
index f605fd1e269..fc16ff01292 100644
--- a/compiler/testData/psi/BabySteps_ERR.txt
+++ b/compiler/testData/psi/BabySteps_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: BabySteps_ERR.kt
+KtFile: BabySteps_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/BackslashInString.txt b/compiler/testData/psi/BackslashInString.txt
index 74bbc8b335e..0902f977053 100644
--- a/compiler/testData/psi/BackslashInString.txt
+++ b/compiler/testData/psi/BackslashInString.txt
@@ -1,4 +1,4 @@
-JetFile: BackslashInString.kt
+KtFile: BackslashInString.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
index 921f7144f27..9388a0c3e3a 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile1.kt
+KtFile: BlockCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
index c1f9531922b..994cd3b0082 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile2.kt
+KtFile: BlockCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt
index 6f4e10519e9..3da9074f45a 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile3.kt
+KtFile: BlockCommentAtBeginningOfFile3.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt
index e6b9cf8a907..92b2f8721b7 100644
--- a/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt
+++ b/compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt
@@ -1,4 +1,4 @@
-JetFile: BlockCommentAtBeginningOfFile4.kt
+KtFile: BlockCommentAtBeginningOfFile4.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/BlockCommentUnmatchedClosing_ERR.txt b/compiler/testData/psi/BlockCommentUnmatchedClosing_ERR.txt
index f7c8eb23607..71c026dc297 100644
--- a/compiler/testData/psi/BlockCommentUnmatchedClosing_ERR.txt
+++ b/compiler/testData/psi/BlockCommentUnmatchedClosing_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: BlockCommentUnmatchedClosing_ERR.kt
+KtFile: BlockCommentUnmatchedClosing_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ByClauses.txt b/compiler/testData/psi/ByClauses.txt
index 946a8a2b6a9..bffb9b9db50 100644
--- a/compiler/testData/psi/ByClauses.txt
+++ b/compiler/testData/psi/ByClauses.txt
@@ -1,4 +1,4 @@
-JetFile: ByClauses.kt
+KtFile: ByClauses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CallWithManyClosures.txt b/compiler/testData/psi/CallWithManyClosures.txt
index 4735fd650ff..7cff8a5de64 100644
--- a/compiler/testData/psi/CallWithManyClosures.txt
+++ b/compiler/testData/psi/CallWithManyClosures.txt
@@ -1,4 +1,4 @@
-JetFile: CallWithManyClosures.kt
+KtFile: CallWithManyClosures.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CallsInWhen.txt b/compiler/testData/psi/CallsInWhen.txt
index 8110c9055be..a621ba254e5 100644
--- a/compiler/testData/psi/CallsInWhen.txt
+++ b/compiler/testData/psi/CallsInWhen.txt
@@ -1,4 +1,4 @@
-JetFile: CallsInWhen.kt
+KtFile: CallsInWhen.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CollectionLiterals.txt b/compiler/testData/psi/CollectionLiterals.txt
index 52960592fd5..f83dfd46cef 100644
--- a/compiler/testData/psi/CollectionLiterals.txt
+++ b/compiler/testData/psi/CollectionLiterals.txt
@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals.kt
+KtFile: CollectionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CollectionLiterals_ERR.txt b/compiler/testData/psi/CollectionLiterals_ERR.txt
index 4a29f75f529..19d289d2aa9 100644
--- a/compiler/testData/psi/CollectionLiterals_ERR.txt
+++ b/compiler/testData/psi/CollectionLiterals_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: CollectionLiterals_ERR.kt
+KtFile: CollectionLiterals_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CommentsBinding.txt b/compiler/testData/psi/CommentsBinding.txt
index e2ae566e2a9..19d5c91b038 100644
--- a/compiler/testData/psi/CommentsBinding.txt
+++ b/compiler/testData/psi/CommentsBinding.txt
@@ -1,4 +1,4 @@
-JetFile: CommentsBinding.kt
+KtFile: CommentsBinding.kt
   PsiComment(BLOCK_COMMENT)('/*\n * Copyright JetBrains s.r.o.\n */')
   PsiWhiteSpace('\n')
   PACKAGE_DIRECTIVE
diff --git a/compiler/testData/psi/CommentsBindingInLambda.txt b/compiler/testData/psi/CommentsBindingInLambda.txt
index 59f53d6e252..d78a8525abc 100644
--- a/compiler/testData/psi/CommentsBindingInLambda.txt
+++ b/compiler/testData/psi/CommentsBindingInLambda.txt
@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInLambda.kt
+KtFile: CommentsBindingInLambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/CommentsBindingInStatementBlock.txt b/compiler/testData/psi/CommentsBindingInStatementBlock.txt
index fbd8481703c..69676e6f661 100644
--- a/compiler/testData/psi/CommentsBindingInStatementBlock.txt
+++ b/compiler/testData/psi/CommentsBindingInStatementBlock.txt
@@ -1,4 +1,4 @@
-JetFile: CommentsBindingInStatementBlock.kt
+KtFile: CommentsBindingInStatementBlock.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Constructors.txt b/compiler/testData/psi/Constructors.txt
index cc4a646ac76..f7ff0e69baa 100644
--- a/compiler/testData/psi/Constructors.txt
+++ b/compiler/testData/psi/Constructors.txt
@@ -1,4 +1,4 @@
-JetFile: Constructors.kt
+KtFile: Constructors.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt
index 1505b80e288..e8d53b1393b 100644
--- a/compiler/testData/psi/ControlStructures.txt
+++ b/compiler/testData/psi/ControlStructures.txt
@@ -1,4 +1,4 @@
-JetFile: ControlStructures.kt
+KtFile: ControlStructures.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DefaultKeyword.txt b/compiler/testData/psi/DefaultKeyword.txt
index 3133228c96d..44cbd17eb2d 100644
--- a/compiler/testData/psi/DefaultKeyword.txt
+++ b/compiler/testData/psi/DefaultKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: DefaultKeyword.kt
+KtFile: DefaultKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DocCommentAfterFileAnnotations.txt b/compiler/testData/psi/DocCommentAfterFileAnnotations.txt
index 1d4e0cb0a91..44de8f36833 100644
--- a/compiler/testData/psi/DocCommentAfterFileAnnotations.txt
+++ b/compiler/testData/psi/DocCommentAfterFileAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentAfterFileAnnotations.kt
+KtFile: DocCommentAfterFileAnnotations.kt
   FILE_ANNOTATION_LIST
     ANNOTATION
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/DocCommentForFirstDeclaration.txt b/compiler/testData/psi/DocCommentForFirstDeclaration.txt
index 9a95c8cdf51..af8701b985e 100644
--- a/compiler/testData/psi/DocCommentForFirstDeclaration.txt
+++ b/compiler/testData/psi/DocCommentForFirstDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentForFirstDeclaration.kt
+KtFile: DocCommentForFirstDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt b/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt
index de584f22adf..0529671e062 100644
--- a/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt
+++ b/compiler/testData/psi/DocCommentOnPackageDirectiveLine.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentOnPackageDirectiveLine.kt
+KtFile: DocCommentOnPackageDirectiveLine.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/DocCommentsBinding.txt b/compiler/testData/psi/DocCommentsBinding.txt
index e4f9e8f5d14..30a34995f0b 100644
--- a/compiler/testData/psi/DocCommentsBinding.txt
+++ b/compiler/testData/psi/DocCommentsBinding.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentsBinding.kt
+KtFile: DocCommentsBinding.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DoubleColon.txt b/compiler/testData/psi/DoubleColon.txt
index 8688c3fecf5..85aac87d87b 100644
--- a/compiler/testData/psi/DoubleColon.txt
+++ b/compiler/testData/psi/DoubleColon.txt
@@ -1,4 +1,4 @@
-JetFile: DoubleColon.kt
+KtFile: DoubleColon.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DoubleColonWhitespaces.txt b/compiler/testData/psi/DoubleColonWhitespaces.txt
index c5251979fd5..6409ab1f419 100644
--- a/compiler/testData/psi/DoubleColonWhitespaces.txt
+++ b/compiler/testData/psi/DoubleColonWhitespaces.txt
@@ -1,4 +1,4 @@
-JetFile: DoubleColonWhitespaces.kt
+KtFile: DoubleColonWhitespaces.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DoubleColon_ERR.txt b/compiler/testData/psi/DoubleColon_ERR.txt
index 7a839dd4289..ed39825be88 100644
--- a/compiler/testData/psi/DoubleColon_ERR.txt
+++ b/compiler/testData/psi/DoubleColon_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: DoubleColon_ERR.kt
+KtFile: DoubleColon_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DuplicateAccessor.txt b/compiler/testData/psi/DuplicateAccessor.txt
index 1a5c0fc4889..6022ccb1d8f 100644
--- a/compiler/testData/psi/DuplicateAccessor.txt
+++ b/compiler/testData/psi/DuplicateAccessor.txt
@@ -1,4 +1,4 @@
-JetFile: DuplicateAccessor.kt
+KtFile: DuplicateAccessor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DynamicReceiver.txt b/compiler/testData/psi/DynamicReceiver.txt
index c9e4be3b49b..7e652b07025 100644
--- a/compiler/testData/psi/DynamicReceiver.txt
+++ b/compiler/testData/psi/DynamicReceiver.txt
@@ -1,4 +1,4 @@
-JetFile: DynamicReceiver.kt
+KtFile: DynamicReceiver.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DynamicSoftKeyword.txt b/compiler/testData/psi/DynamicSoftKeyword.txt
index 0175447e2cc..e0538a43aa8 100644
--- a/compiler/testData/psi/DynamicSoftKeyword.txt
+++ b/compiler/testData/psi/DynamicSoftKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: DynamicSoftKeyword.kt
+KtFile: DynamicSoftKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/DynamicTypes.txt b/compiler/testData/psi/DynamicTypes.txt
index 41a8494f3f9..42a426ccde9 100644
--- a/compiler/testData/psi/DynamicTypes.txt
+++ b/compiler/testData/psi/DynamicTypes.txt
@@ -1,4 +1,4 @@
-JetFile: DynamicTypes.kt
+KtFile: DynamicTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EOLsInComments.txt b/compiler/testData/psi/EOLsInComments.txt
index 5e9bc135c14..3eb7bf04555 100644
--- a/compiler/testData/psi/EOLsInComments.txt
+++ b/compiler/testData/psi/EOLsInComments.txt
@@ -1,4 +1,4 @@
-JetFile: EOLsInComments.kt
+KtFile: EOLsInComments.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EOLsOnRollback.txt b/compiler/testData/psi/EOLsOnRollback.txt
index 0bce5021b5d..95a95f63850 100644
--- a/compiler/testData/psi/EOLsOnRollback.txt
+++ b/compiler/testData/psi/EOLsOnRollback.txt
@@ -1,4 +1,4 @@
-JetFile: EOLsOnRollback.kt
+KtFile: EOLsOnRollback.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EmptyFile.txt b/compiler/testData/psi/EmptyFile.txt
index bb8cef2a12c..5af63e8ffcf 100644
--- a/compiler/testData/psi/EmptyFile.txt
+++ b/compiler/testData/psi/EmptyFile.txt
@@ -1,4 +1,4 @@
-JetFile: EmptyFile.kt
+KtFile: EmptyFile.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EmptyName.txt b/compiler/testData/psi/EmptyName.txt
index 8f6c51dc881..dbfc0be94eb 100644
--- a/compiler/testData/psi/EmptyName.txt
+++ b/compiler/testData/psi/EmptyName.txt
@@ -1,4 +1,4 @@
-JetFile: EmptyName.kt
+KtFile: EmptyName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumCommas.txt b/compiler/testData/psi/EnumCommas.txt
index a9c65488b09..8e99e2ce06c 100644
--- a/compiler/testData/psi/EnumCommas.txt
+++ b/compiler/testData/psi/EnumCommas.txt
@@ -1,4 +1,4 @@
-JetFile: EnumCommas.kt
+KtFile: EnumCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt b/compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt
index f01d3ef7c5d..4599a4bcebb 100644
--- a/compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt
+++ b/compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaAnnotatedMember.kt
+KtFile: EnumEntryCommaAnnotatedMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntryCommaInlineMember.txt b/compiler/testData/psi/EnumEntryCommaInlineMember.txt
index 55fcc1d91c9..fb8a7cb4aa6 100644
--- a/compiler/testData/psi/EnumEntryCommaInlineMember.txt
+++ b/compiler/testData/psi/EnumEntryCommaInlineMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaInlineMember.kt
+KtFile: EnumEntryCommaInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntryCommaMember.txt b/compiler/testData/psi/EnumEntryCommaMember.txt
index db8deea6389..cc8eee6507a 100644
--- a/compiler/testData/psi/EnumEntryCommaMember.txt
+++ b/compiler/testData/psi/EnumEntryCommaMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaMember.kt
+KtFile: EnumEntryCommaMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntryCommaPublicMember.txt b/compiler/testData/psi/EnumEntryCommaPublicMember.txt
index 94d1b1121f5..c5fbb1b7004 100644
--- a/compiler/testData/psi/EnumEntryCommaPublicMember.txt
+++ b/compiler/testData/psi/EnumEntryCommaPublicMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntryCommaPublicMember.kt
+KtFile: EnumEntryCommaPublicMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntrySemicolonInlineMember.txt b/compiler/testData/psi/EnumEntrySemicolonInlineMember.txt
index 18e8b015bc0..e57eac79f28 100644
--- a/compiler/testData/psi/EnumEntrySemicolonInlineMember.txt
+++ b/compiler/testData/psi/EnumEntrySemicolonInlineMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonInlineMember.kt
+KtFile: EnumEntrySemicolonInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntrySemicolonMember.txt b/compiler/testData/psi/EnumEntrySemicolonMember.txt
index 8129bc9a241..410b3486ed2 100644
--- a/compiler/testData/psi/EnumEntrySemicolonMember.txt
+++ b/compiler/testData/psi/EnumEntrySemicolonMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySemicolonMember.kt
+KtFile: EnumEntrySemicolonMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntrySpaceInlineMember.txt b/compiler/testData/psi/EnumEntrySpaceInlineMember.txt
index 9821366d00a..ae64a3a64ed 100644
--- a/compiler/testData/psi/EnumEntrySpaceInlineMember.txt
+++ b/compiler/testData/psi/EnumEntrySpaceInlineMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceInlineMember.kt
+KtFile: EnumEntrySpaceInlineMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntrySpaceMember.txt b/compiler/testData/psi/EnumEntrySpaceMember.txt
index 9854aa07c3b..87f3972760a 100644
--- a/compiler/testData/psi/EnumEntrySpaceMember.txt
+++ b/compiler/testData/psi/EnumEntrySpaceMember.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntrySpaceMember.kt
+KtFile: EnumEntrySpaceMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumEntryTwoCommas.txt b/compiler/testData/psi/EnumEntryTwoCommas.txt
index 88637c68643..c31991346a7 100644
--- a/compiler/testData/psi/EnumEntryTwoCommas.txt
+++ b/compiler/testData/psi/EnumEntryTwoCommas.txt
@@ -1,4 +1,4 @@
-JetFile: EnumEntryTwoCommas.kt
+KtFile: EnumEntryTwoCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumIn.txt b/compiler/testData/psi/EnumIn.txt
index 8d65a84c4b0..67a9bfb769e 100644
--- a/compiler/testData/psi/EnumIn.txt
+++ b/compiler/testData/psi/EnumIn.txt
@@ -1,4 +1,4 @@
-JetFile: EnumIn.kt
+KtFile: EnumIn.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumInline.txt b/compiler/testData/psi/EnumInline.txt
index 574b6e2af53..27e47e9aa72 100644
--- a/compiler/testData/psi/EnumInline.txt
+++ b/compiler/testData/psi/EnumInline.txt
@@ -1,4 +1,4 @@
-JetFile: EnumInline.kt
+KtFile: EnumInline.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumInlinePublic.txt b/compiler/testData/psi/EnumInlinePublic.txt
index e3268a0b2a3..87852a5d074 100644
--- a/compiler/testData/psi/EnumInlinePublic.txt
+++ b/compiler/testData/psi/EnumInlinePublic.txt
@@ -1,4 +1,4 @@
-JetFile: EnumInlinePublic.kt
+KtFile: EnumInlinePublic.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumMissingName.txt b/compiler/testData/psi/EnumMissingName.txt
index 1d913db7bd3..1f48e978bf1 100644
--- a/compiler/testData/psi/EnumMissingName.txt
+++ b/compiler/testData/psi/EnumMissingName.txt
@@ -1,4 +1,4 @@
-JetFile: EnumMissingName.kt
+KtFile: EnumMissingName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumOldConstructorSyntax.txt b/compiler/testData/psi/EnumOldConstructorSyntax.txt
index 06863e8549d..ca61e0a3ddb 100644
--- a/compiler/testData/psi/EnumOldConstructorSyntax.txt
+++ b/compiler/testData/psi/EnumOldConstructorSyntax.txt
@@ -1,4 +1,4 @@
-JetFile: EnumOldConstructorSyntax.kt
+KtFile: EnumOldConstructorSyntax.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumShortCommas.txt b/compiler/testData/psi/EnumShortCommas.txt
index 27068eb00ed..922a0ebad08 100644
--- a/compiler/testData/psi/EnumShortCommas.txt
+++ b/compiler/testData/psi/EnumShortCommas.txt
@@ -1,4 +1,4 @@
-JetFile: EnumShortCommas.kt
+KtFile: EnumShortCommas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumShortWithOverload.txt b/compiler/testData/psi/EnumShortWithOverload.txt
index 8d89128ee40..d558f8cbb34 100644
--- a/compiler/testData/psi/EnumShortWithOverload.txt
+++ b/compiler/testData/psi/EnumShortWithOverload.txt
@@ -1,4 +1,4 @@
-JetFile: EnumShortWithOverload.kt
+KtFile: EnumShortWithOverload.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/EnumWithAnnotationKeyword.txt b/compiler/testData/psi/EnumWithAnnotationKeyword.txt
index 9a62bcddae4..84aa9116be8 100644
--- a/compiler/testData/psi/EnumWithAnnotationKeyword.txt
+++ b/compiler/testData/psi/EnumWithAnnotationKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: EnumWithAnnotationKeyword.kt
+KtFile: EnumWithAnnotationKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Enums.txt b/compiler/testData/psi/Enums.txt
index b7d2fc0f741..9da828c9596 100644
--- a/compiler/testData/psi/Enums.txt
+++ b/compiler/testData/psi/Enums.txt
@@ -1,4 +1,4 @@
-JetFile: Enums.kt
+KtFile: Enums.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Expressions_ERR.txt b/compiler/testData/psi/Expressions_ERR.txt
index efc3e2cb165..ca69fe49fdf 100644
--- a/compiler/testData/psi/Expressions_ERR.txt
+++ b/compiler/testData/psi/Expressions_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: Expressions_ERR.kt
+KtFile: Expressions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ExtensionsWithQNReceiver.txt b/compiler/testData/psi/ExtensionsWithQNReceiver.txt
index 3b29ce471a8..844e2923983 100644
--- a/compiler/testData/psi/ExtensionsWithQNReceiver.txt
+++ b/compiler/testData/psi/ExtensionsWithQNReceiver.txt
@@ -1,4 +1,4 @@
-JetFile: ExtensionsWithQNReceiver.kt
+KtFile: ExtensionsWithQNReceiver.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FileStart_ERR.txt b/compiler/testData/psi/FileStart_ERR.txt
index b4c1f07c275..bc430fe2284 100644
--- a/compiler/testData/psi/FileStart_ERR.txt
+++ b/compiler/testData/psi/FileStart_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: FileStart_ERR.kt
+KtFile: FileStart_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FloatingPointLiteral.txt b/compiler/testData/psi/FloatingPointLiteral.txt
index 96379042e3a..18e66b252f6 100644
--- a/compiler/testData/psi/FloatingPointLiteral.txt
+++ b/compiler/testData/psi/FloatingPointLiteral.txt
@@ -1,4 +1,4 @@
-JetFile: FloatingPointLiteral.kt
+KtFile: FloatingPointLiteral.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ForWithMultiDecl.txt b/compiler/testData/psi/ForWithMultiDecl.txt
index 21ec5f530c2..5c5e227d175 100644
--- a/compiler/testData/psi/ForWithMultiDecl.txt
+++ b/compiler/testData/psi/ForWithMultiDecl.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithMultiDecl.kt
+KtFile: ForWithMultiDecl.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionCalls.txt b/compiler/testData/psi/FunctionCalls.txt
index a3575752d1f..6bbc7246052 100644
--- a/compiler/testData/psi/FunctionCalls.txt
+++ b/compiler/testData/psi/FunctionCalls.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionCalls.kt
+KtFile: FunctionCalls.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionExpressions.txt b/compiler/testData/psi/FunctionExpressions.txt
index f5a22383807..3eac49627c9 100644
--- a/compiler/testData/psi/FunctionExpressions.txt
+++ b/compiler/testData/psi/FunctionExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionExpressions.kt
+KtFile: FunctionExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionExpressions_ERR.txt b/compiler/testData/psi/FunctionExpressions_ERR.txt
index b8585134f24..a2f1b01c6b1 100644
--- a/compiler/testData/psi/FunctionExpressions_ERR.txt
+++ b/compiler/testData/psi/FunctionExpressions_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionExpressions_ERR.kt
+KtFile: FunctionExpressions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionLiterals.txt b/compiler/testData/psi/FunctionLiterals.txt
index a00ce7724f6..b914759aaac 100644
--- a/compiler/testData/psi/FunctionLiterals.txt
+++ b/compiler/testData/psi/FunctionLiterals.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionLiterals.kt
+KtFile: FunctionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionLiterals_ERR.txt b/compiler/testData/psi/FunctionLiterals_ERR.txt
index 5e328ebcf6a..82cc1f5af20 100644
--- a/compiler/testData/psi/FunctionLiterals_ERR.txt
+++ b/compiler/testData/psi/FunctionLiterals_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionLiterals_ERR.kt
+KtFile: FunctionLiterals_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionNoParameterList.txt b/compiler/testData/psi/FunctionNoParameterList.txt
index 21342578541..9d0d531b88c 100644
--- a/compiler/testData/psi/FunctionNoParameterList.txt
+++ b/compiler/testData/psi/FunctionNoParameterList.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionNoParameterList.kt
+KtFile: FunctionNoParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionTypes.txt b/compiler/testData/psi/FunctionTypes.txt
index eec73bb7ae7..48f50d9f82d 100644
--- a/compiler/testData/psi/FunctionTypes.txt
+++ b/compiler/testData/psi/FunctionTypes.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionTypes.kt
+KtFile: FunctionTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionTypes_ERR.txt b/compiler/testData/psi/FunctionTypes_ERR.txt
index 1d3bbdd61f1..45ca25f9c2f 100644
--- a/compiler/testData/psi/FunctionTypes_ERR.txt
+++ b/compiler/testData/psi/FunctionTypes_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionTypes_ERR.kt
+KtFile: FunctionTypes_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Functions.txt b/compiler/testData/psi/Functions.txt
index 1cffac5ab5b..5b5c99c3f6b 100644
--- a/compiler/testData/psi/Functions.txt
+++ b/compiler/testData/psi/Functions.txt
@@ -1,4 +1,4 @@
-JetFile: Functions.kt
+KtFile: Functions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionsWithoutName.txt b/compiler/testData/psi/FunctionsWithoutName.txt
index 5aec11fde37..c3250759f96 100644
--- a/compiler/testData/psi/FunctionsWithoutName.txt
+++ b/compiler/testData/psi/FunctionsWithoutName.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithoutName.kt
+KtFile: FunctionsWithoutName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/FunctionsWithoutName_ERR.txt b/compiler/testData/psi/FunctionsWithoutName_ERR.txt
index 2986206423b..50e7eedb86b 100644
--- a/compiler/testData/psi/FunctionsWithoutName_ERR.txt
+++ b/compiler/testData/psi/FunctionsWithoutName_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithoutName_ERR.kt
+KtFile: FunctionsWithoutName_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Functions_ERR.txt b/compiler/testData/psi/Functions_ERR.txt
index 6954e84f3ec..cbbae0b6dc0 100644
--- a/compiler/testData/psi/Functions_ERR.txt
+++ b/compiler/testData/psi/Functions_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: Functions_ERR.kt
+KtFile: Functions_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/HangOnLonelyModifier.txt b/compiler/testData/psi/HangOnLonelyModifier.txt
index b778a51735a..7d72d60e370 100644
--- a/compiler/testData/psi/HangOnLonelyModifier.txt
+++ b/compiler/testData/psi/HangOnLonelyModifier.txt
@@ -1,4 +1,4 @@
-JetFile: HangOnLonelyModifier.kt
+KtFile: HangOnLonelyModifier.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/IfWithPropery.txt b/compiler/testData/psi/IfWithPropery.txt
index 124df8170a7..5b1610f89d1 100644
--- a/compiler/testData/psi/IfWithPropery.txt
+++ b/compiler/testData/psi/IfWithPropery.txt
@@ -1,4 +1,4 @@
-JetFile: IfWithPropery.kt
+KtFile: IfWithPropery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ImportSoftKW.txt b/compiler/testData/psi/ImportSoftKW.txt
index 0350fc98d4a..3181f3ea4e0 100644
--- a/compiler/testData/psi/ImportSoftKW.txt
+++ b/compiler/testData/psi/ImportSoftKW.txt
@@ -1,4 +1,4 @@
-JetFile: ImportSoftKW.kt
+KtFile: ImportSoftKW.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Imports.txt b/compiler/testData/psi/Imports.txt
index 6a398c40f08..d1d0cb4eea8 100644
--- a/compiler/testData/psi/Imports.txt
+++ b/compiler/testData/psi/Imports.txt
@@ -1,4 +1,4 @@
-JetFile: Imports.kt
+KtFile: Imports.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/Imports_ERR.txt b/compiler/testData/psi/Imports_ERR.txt
index 93230f3a486..16ddb1a7648 100644
--- a/compiler/testData/psi/Imports_ERR.txt
+++ b/compiler/testData/psi/Imports_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: Imports_ERR.kt
+KtFile: Imports_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/IncompleteFunctionLiteral.txt b/compiler/testData/psi/IncompleteFunctionLiteral.txt
index b5660461c7e..eb5424a8a9b 100644
--- a/compiler/testData/psi/IncompleteFunctionLiteral.txt
+++ b/compiler/testData/psi/IncompleteFunctionLiteral.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteFunctionLiteral.kt
+KtFile: IncompleteFunctionLiteral.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Inner.txt b/compiler/testData/psi/Inner.txt
index 6413d722a19..1f8db014086 100644
--- a/compiler/testData/psi/Inner.txt
+++ b/compiler/testData/psi/Inner.txt
@@ -1,4 +1,4 @@
-JetFile: Inner.kt
+KtFile: Inner.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/IntegerLiteral.txt b/compiler/testData/psi/IntegerLiteral.txt
index dd97b767031..fbf0c014a1d 100644
--- a/compiler/testData/psi/IntegerLiteral.txt
+++ b/compiler/testData/psi/IntegerLiteral.txt
@@ -1,4 +1,4 @@
-JetFile: IntegerLiteral.kt
+KtFile: IntegerLiteral.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Interface.txt b/compiler/testData/psi/Interface.txt
index f6f52ee7917..87b8e2418fe 100644
--- a/compiler/testData/psi/Interface.txt
+++ b/compiler/testData/psi/Interface.txt
@@ -1,4 +1,4 @@
-JetFile: Interface.kt
+KtFile: Interface.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/InterfaceWithEnumKeyword.txt b/compiler/testData/psi/InterfaceWithEnumKeyword.txt
index 0044e879e17..b8b13673530 100644
--- a/compiler/testData/psi/InterfaceWithEnumKeyword.txt
+++ b/compiler/testData/psi/InterfaceWithEnumKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: InterfaceWithEnumKeyword.kt
+KtFile: InterfaceWithEnumKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Labels.txt b/compiler/testData/psi/Labels.txt
index 49969470ab1..0e1f624d48f 100644
--- a/compiler/testData/psi/Labels.txt
+++ b/compiler/testData/psi/Labels.txt
@@ -1,4 +1,4 @@
-JetFile: Labels.kt
+KtFile: Labels.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/LineCommentAfterFileAnnotations.txt b/compiler/testData/psi/LineCommentAfterFileAnnotations.txt
index 2e6c852b577..48c2cda4d42 100644
--- a/compiler/testData/psi/LineCommentAfterFileAnnotations.txt
+++ b/compiler/testData/psi/LineCommentAfterFileAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: LineCommentAfterFileAnnotations.kt
+KtFile: LineCommentAfterFileAnnotations.kt
   FILE_ANNOTATION_LIST
     ANNOTATION
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/LineCommentForFirstDeclaration.txt b/compiler/testData/psi/LineCommentForFirstDeclaration.txt
index 5a41d489b18..5695492546e 100644
--- a/compiler/testData/psi/LineCommentForFirstDeclaration.txt
+++ b/compiler/testData/psi/LineCommentForFirstDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: LineCommentForFirstDeclaration.kt
+KtFile: LineCommentForFirstDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/LineCommentsInBlock.txt b/compiler/testData/psi/LineCommentsInBlock.txt
index 89480845bb7..a9123f570c6 100644
--- a/compiler/testData/psi/LineCommentsInBlock.txt
+++ b/compiler/testData/psi/LineCommentsInBlock.txt
@@ -1,4 +1,4 @@
-JetFile: LineCommentsInBlock.kt
+KtFile: LineCommentsInBlock.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/LocalDeclarations.txt b/compiler/testData/psi/LocalDeclarations.txt
index 3382467bc34..f075a20b7a2 100644
--- a/compiler/testData/psi/LocalDeclarations.txt
+++ b/compiler/testData/psi/LocalDeclarations.txt
@@ -1,4 +1,4 @@
-JetFile: LocalDeclarations.kt
+KtFile: LocalDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/LongPackageName.txt b/compiler/testData/psi/LongPackageName.txt
index 1dc96857196..e6807910dbc 100644
--- a/compiler/testData/psi/LongPackageName.txt
+++ b/compiler/testData/psi/LongPackageName.txt
@@ -1,4 +1,4 @@
-JetFile: LongPackageName.kt
+KtFile: LongPackageName.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/ModifierAsSelector.txt b/compiler/testData/psi/ModifierAsSelector.txt
index 5072d702d94..db69c429ce4 100644
--- a/compiler/testData/psi/ModifierAsSelector.txt
+++ b/compiler/testData/psi/ModifierAsSelector.txt
@@ -1,4 +1,4 @@
-JetFile: ModifierAsSelector.kt
+KtFile: ModifierAsSelector.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/MultiVariableDeclarations.txt b/compiler/testData/psi/MultiVariableDeclarations.txt
index 1cf3b77b5ea..65ce1de451c 100644
--- a/compiler/testData/psi/MultiVariableDeclarations.txt
+++ b/compiler/testData/psi/MultiVariableDeclarations.txt
@@ -1,4 +1,4 @@
-JetFile: MultiVariableDeclarations.kt
+KtFile: MultiVariableDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NamedClassObject.txt b/compiler/testData/psi/NamedClassObject.txt
index a6c0af4731c..f86049b48a0 100644
--- a/compiler/testData/psi/NamedClassObject.txt
+++ b/compiler/testData/psi/NamedClassObject.txt
@@ -1,4 +1,4 @@
-JetFile: NamedClassObject.kt
+KtFile: NamedClassObject.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NestedComments.txt b/compiler/testData/psi/NestedComments.txt
index e169b172d73..222773c181f 100644
--- a/compiler/testData/psi/NestedComments.txt
+++ b/compiler/testData/psi/NestedComments.txt
@@ -1,4 +1,4 @@
-JetFile: NestedComments.kt
+KtFile: NestedComments.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NewLinesValidOperations.txt b/compiler/testData/psi/NewLinesValidOperations.txt
index a834a045ef5..61c25089e9c 100644
--- a/compiler/testData/psi/NewLinesValidOperations.txt
+++ b/compiler/testData/psi/NewLinesValidOperations.txt
@@ -1,4 +1,4 @@
-JetFile: NewLinesValidOperations.kt
+KtFile: NewLinesValidOperations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NewlinesInParentheses.txt b/compiler/testData/psi/NewlinesInParentheses.txt
index d7d3b5d5f2f..ed33ee0d158 100644
--- a/compiler/testData/psi/NewlinesInParentheses.txt
+++ b/compiler/testData/psi/NewlinesInParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: NewlinesInParentheses.kt
+KtFile: NewlinesInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NonTypeBeforeDotInBaseClass.txt b/compiler/testData/psi/NonTypeBeforeDotInBaseClass.txt
index 3b915e26ad8..59f9a63acb0 100644
--- a/compiler/testData/psi/NonTypeBeforeDotInBaseClass.txt
+++ b/compiler/testData/psi/NonTypeBeforeDotInBaseClass.txt
@@ -1,4 +1,4 @@
-JetFile: NonTypeBeforeDotInBaseClass.kt
+KtFile: NonTypeBeforeDotInBaseClass.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/NotIsAndNotIn.txt b/compiler/testData/psi/NotIsAndNotIn.txt
index fb1273b8417..a5e98b25e67 100644
--- a/compiler/testData/psi/NotIsAndNotIn.txt
+++ b/compiler/testData/psi/NotIsAndNotIn.txt
@@ -1,4 +1,4 @@
-JetFile: NotIsAndNotIn.kt
+KtFile: NotIsAndNotIn.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ObjectLiteralAsStatement.txt b/compiler/testData/psi/ObjectLiteralAsStatement.txt
index 61c6dcecc9d..bb0264cf408 100644
--- a/compiler/testData/psi/ObjectLiteralAsStatement.txt
+++ b/compiler/testData/psi/ObjectLiteralAsStatement.txt
@@ -1,4 +1,4 @@
-JetFile: ObjectLiteralAsStatement.kt
+KtFile: ObjectLiteralAsStatement.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ParameterNameMising.txt b/compiler/testData/psi/ParameterNameMising.txt
index cc3d96a7420..cb10837dd3d 100644
--- a/compiler/testData/psi/ParameterNameMising.txt
+++ b/compiler/testData/psi/ParameterNameMising.txt
@@ -1,4 +1,4 @@
-JetFile: ParameterNameMising.kt
+KtFile: ParameterNameMising.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ParameterType.txt b/compiler/testData/psi/ParameterType.txt
index fd9a0798bbc..1f4e3461e95 100644
--- a/compiler/testData/psi/ParameterType.txt
+++ b/compiler/testData/psi/ParameterType.txt
@@ -1,4 +1,4 @@
-JetFile: ParameterType.kt
+KtFile: ParameterType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/ParameterType_ERR.txt b/compiler/testData/psi/ParameterType_ERR.txt
index 552a302243d..e0dbea7918c 100644
--- a/compiler/testData/psi/ParameterType_ERR.txt
+++ b/compiler/testData/psi/ParameterType_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: ParameterType_ERR.kt
+KtFile: ParameterType_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Precedence.txt b/compiler/testData/psi/Precedence.txt
index 15f7452ad1d..4577216e457 100644
--- a/compiler/testData/psi/Precedence.txt
+++ b/compiler/testData/psi/Precedence.txt
@@ -1,4 +1,4 @@
-JetFile: Precedence.kt
+KtFile: Precedence.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
index 44b15cf9770..2c2be147b56 100644
--- a/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
+++ b/compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: PrimaryConstructorModifiers_ERR.kt
+KtFile: PrimaryConstructorModifiers_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Properties.txt b/compiler/testData/psi/Properties.txt
index 3d3080c992b..a0e6b8ff382 100644
--- a/compiler/testData/psi/Properties.txt
+++ b/compiler/testData/psi/Properties.txt
@@ -1,4 +1,4 @@
-JetFile: Properties.kt
+KtFile: Properties.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/PropertiesFollowedByInitializers.txt b/compiler/testData/psi/PropertiesFollowedByInitializers.txt
index 15752ef8b7e..7b459993db2 100644
--- a/compiler/testData/psi/PropertiesFollowedByInitializers.txt
+++ b/compiler/testData/psi/PropertiesFollowedByInitializers.txt
@@ -1,4 +1,4 @@
-JetFile: PropertiesFollowedByInitializers.kt
+KtFile: PropertiesFollowedByInitializers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Properties_ERR.txt b/compiler/testData/psi/Properties_ERR.txt
index f306fdc0117..d03bd2e1110 100644
--- a/compiler/testData/psi/Properties_ERR.txt
+++ b/compiler/testData/psi/Properties_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: Properties_ERR.kt
+KtFile: Properties_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/PropertyInvokes.txt b/compiler/testData/psi/PropertyInvokes.txt
index 75086ae595c..e44aa113823 100644
--- a/compiler/testData/psi/PropertyInvokes.txt
+++ b/compiler/testData/psi/PropertyInvokes.txt
@@ -1,4 +1,4 @@
-JetFile: PropertyInvokes.kt
+KtFile: PropertyInvokes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/QuotedIdentifiers.txt b/compiler/testData/psi/QuotedIdentifiers.txt
index 667b2ca480f..55f1b899c1f 100644
--- a/compiler/testData/psi/QuotedIdentifiers.txt
+++ b/compiler/testData/psi/QuotedIdentifiers.txt
@@ -1,4 +1,4 @@
-JetFile: QuotedIdentifiers.kt
+KtFile: QuotedIdentifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Reserved.txt b/compiler/testData/psi/Reserved.txt
index d329459695a..868ec7d9c25 100644
--- a/compiler/testData/psi/Reserved.txt
+++ b/compiler/testData/psi/Reserved.txt
@@ -1,4 +1,4 @@
-JetFile: Reserved.kt
+KtFile: Reserved.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/SemicolonAfterIf.txt b/compiler/testData/psi/SemicolonAfterIf.txt
index 415fbf5f1fb..f01a5689cb5 100644
--- a/compiler/testData/psi/SemicolonAfterIf.txt
+++ b/compiler/testData/psi/SemicolonAfterIf.txt
@@ -1,4 +1,4 @@
-JetFile: SemicolonAfterIf.kt
+KtFile: SemicolonAfterIf.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt
index fac6684590d..d298f71ef43 100644
--- a/compiler/testData/psi/SimpleClassMembers.txt
+++ b/compiler/testData/psi/SimpleClassMembers.txt
@@ -1,4 +1,4 @@
-JetFile: SimpleClassMembers.kt
+KtFile: SimpleClassMembers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.txt b/compiler/testData/psi/SimpleClassMembers_ERR.txt
index ec91a48a2fa..752a1a35797 100644
--- a/compiler/testData/psi/SimpleClassMembers_ERR.txt
+++ b/compiler/testData/psi/SimpleClassMembers_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: SimpleClassMembers_ERR.kt
+KtFile: SimpleClassMembers_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/SimpleExpressions.txt b/compiler/testData/psi/SimpleExpressions.txt
index 5def66b3ceb..29a8bc3c5e6 100644
--- a/compiler/testData/psi/SimpleExpressions.txt
+++ b/compiler/testData/psi/SimpleExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: SimpleExpressions.kt
+KtFile: SimpleExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/SimpleModifiers.txt b/compiler/testData/psi/SimpleModifiers.txt
index 946c5cbd249..cf02b61ae8b 100644
--- a/compiler/testData/psi/SimpleModifiers.txt
+++ b/compiler/testData/psi/SimpleModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: SimpleModifiers.kt
+KtFile: SimpleModifiers.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/SoftKeywords.txt b/compiler/testData/psi/SoftKeywords.txt
index bab24d4bf7a..6599122a888 100644
--- a/compiler/testData/psi/SoftKeywords.txt
+++ b/compiler/testData/psi/SoftKeywords.txt
@@ -1,4 +1,4 @@
-JetFile: SoftKeywords.kt
+KtFile: SoftKeywords.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt
index 570dd2d38af..05a59a3c8c2 100644
--- a/compiler/testData/psi/SoftKeywordsInTypeArguments.txt
+++ b/compiler/testData/psi/SoftKeywordsInTypeArguments.txt
@@ -1,4 +1,4 @@
-JetFile: SoftKeywordsInTypeArguments.kt
+KtFile: SoftKeywordsInTypeArguments.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/StringTemplates.txt b/compiler/testData/psi/StringTemplates.txt
index 2b638ec1c0a..218eea6d2cf 100644
--- a/compiler/testData/psi/StringTemplates.txt
+++ b/compiler/testData/psi/StringTemplates.txt
@@ -1,4 +1,4 @@
-JetFile: StringTemplates.kt
+KtFile: StringTemplates.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/Super.txt b/compiler/testData/psi/Super.txt
index c806e6d968e..f296caa8819 100644
--- a/compiler/testData/psi/Super.txt
+++ b/compiler/testData/psi/Super.txt
@@ -1,4 +1,4 @@
-JetFile: Super.kt
+KtFile: Super.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TraitConstructor.txt b/compiler/testData/psi/TraitConstructor.txt
index 93973edf299..6c9cef415ab 100644
--- a/compiler/testData/psi/TraitConstructor.txt
+++ b/compiler/testData/psi/TraitConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: TraitConstructor.kt
+KtFile: TraitConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TripleDot.txt b/compiler/testData/psi/TripleDot.txt
index 0d997aea8d7..b63f99f42e1 100644
--- a/compiler/testData/psi/TripleDot.txt
+++ b/compiler/testData/psi/TripleDot.txt
@@ -1,4 +1,4 @@
-JetFile: TripleDot.kt
+KtFile: TripleDot.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TryRecovery.txt b/compiler/testData/psi/TryRecovery.txt
index 779f81a509d..5f536e9aff0 100644
--- a/compiler/testData/psi/TryRecovery.txt
+++ b/compiler/testData/psi/TryRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: TryRecovery.kt
+KtFile: TryRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeAlias.txt b/compiler/testData/psi/TypeAlias.txt
index 0ce8a088b5d..f213702a9d3 100644
--- a/compiler/testData/psi/TypeAlias.txt
+++ b/compiler/testData/psi/TypeAlias.txt
@@ -1,4 +1,4 @@
-JetFile: TypeAlias.kt
+KtFile: TypeAlias.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/TypeAlias_ERR.txt b/compiler/testData/psi/TypeAlias_ERR.txt
index 3b1cff3e13a..de9fd1c608a 100644
--- a/compiler/testData/psi/TypeAlias_ERR.txt
+++ b/compiler/testData/psi/TypeAlias_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: TypeAlias_ERR.kt
+KtFile: TypeAlias_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeConstraints.txt b/compiler/testData/psi/TypeConstraints.txt
index 5b50c779f58..a6e511b218a 100644
--- a/compiler/testData/psi/TypeConstraints.txt
+++ b/compiler/testData/psi/TypeConstraints.txt
@@ -1,4 +1,4 @@
-JetFile: TypeConstraints.kt
+KtFile: TypeConstraints.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
index 3a6379018fd..3ff766de449 100644
--- a/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
+++ b/compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: TypeExpressionAmbiguities_ERR.kt
+KtFile: TypeExpressionAmbiguities_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeModifiers.txt b/compiler/testData/psi/TypeModifiers.txt
index 71fafa70579..ba942646775 100644
--- a/compiler/testData/psi/TypeModifiers.txt
+++ b/compiler/testData/psi/TypeModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: TypeModifiers.kt
+KtFile: TypeModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeModifiersParenthesized.txt b/compiler/testData/psi/TypeModifiersParenthesized.txt
index 0133b3d0952..703063ab16e 100644
--- a/compiler/testData/psi/TypeModifiersParenthesized.txt
+++ b/compiler/testData/psi/TypeModifiersParenthesized.txt
@@ -1,4 +1,4 @@
-JetFile: TypeModifiersParenthesized.kt
+KtFile: TypeModifiersParenthesized.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeModifiers_ERR.txt b/compiler/testData/psi/TypeModifiers_ERR.txt
index ec2f5ab0a69..3744e1b2388 100644
--- a/compiler/testData/psi/TypeModifiers_ERR.txt
+++ b/compiler/testData/psi/TypeModifiers_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: TypeModifiers_ERR.kt
+KtFile: TypeModifiers_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypeParametersBeforeName.txt b/compiler/testData/psi/TypeParametersBeforeName.txt
index e88415320a9..95bd1adc2fc 100644
--- a/compiler/testData/psi/TypeParametersBeforeName.txt
+++ b/compiler/testData/psi/TypeParametersBeforeName.txt
@@ -1,4 +1,4 @@
-JetFile: TypeParametersBeforeName.kt
+KtFile: TypeParametersBeforeName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/TypealiasIsKeyword.txt b/compiler/testData/psi/TypealiasIsKeyword.txt
index 5b062100c13..13e27895986 100644
--- a/compiler/testData/psi/TypealiasIsKeyword.txt
+++ b/compiler/testData/psi/TypealiasIsKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: TypealiasIsKeyword.kt
+KtFile: TypealiasIsKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/When.txt b/compiler/testData/psi/When.txt
index 86d07032ab6..42907d2f97a 100644
--- a/compiler/testData/psi/When.txt
+++ b/compiler/testData/psi/When.txt
@@ -1,4 +1,4 @@
-JetFile: When.kt
+KtFile: When.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/When_ERR.txt b/compiler/testData/psi/When_ERR.txt
index 802ab587ef4..651b329dda6 100644
--- a/compiler/testData/psi/When_ERR.txt
+++ b/compiler/testData/psi/When_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: When_ERR.kt
+KtFile: When_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/AnnotatedExpressions.txt b/compiler/testData/psi/annotation/AnnotatedExpressions.txt
index 3a348f8a1d1..8ff2dbd9a81 100644
--- a/compiler/testData/psi/annotation/AnnotatedExpressions.txt
+++ b/compiler/testData/psi/annotation/AnnotatedExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: AnnotatedExpressions.kt
+KtFile: AnnotatedExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/Annotations.txt b/compiler/testData/psi/annotation/Annotations.txt
index 449b7f94aaf..2f0e304ed11 100644
--- a/compiler/testData/psi/annotation/Annotations.txt
+++ b/compiler/testData/psi/annotation/Annotations.txt
@@ -1,4 +1,4 @@
-JetFile: Annotations.kt
+KtFile: Annotations.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt b/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
index ea7f93a08b3..5c60475c18c 100644
--- a/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
+++ b/compiler/testData/psi/annotation/AnnotationsOnPatterns.txt
@@ -1,4 +1,4 @@
-JetFile: AnnotationsOnPatterns.kt
+KtFile: AnnotationsOnPatterns.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/Annotations_ERR.txt b/compiler/testData/psi/annotation/Annotations_ERR.txt
index 913a0b2566e..f57477ed387 100644
--- a/compiler/testData/psi/annotation/Annotations_ERR.txt
+++ b/compiler/testData/psi/annotation/Annotations_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: Annotations_ERR.kt
+KtFile: Annotations_ERR.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/annotation/ShortAnnotations.txt b/compiler/testData/psi/annotation/ShortAnnotations.txt
index 3a320576bd8..57cf6781c33 100644
--- a/compiler/testData/psi/annotation/ShortAnnotations.txt
+++ b/compiler/testData/psi/annotation/ShortAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: ShortAnnotations.kt
+KtFile: ShortAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/annotationsOnNullableTypes.txt b/compiler/testData/psi/annotation/annotationsOnNullableTypes.txt
index 71612e60741..151808e1de4 100644
--- a/compiler/testData/psi/annotation/annotationsOnNullableTypes.txt
+++ b/compiler/testData/psi/annotation/annotationsOnNullableTypes.txt
@@ -1,4 +1,4 @@
-JetFile: annotationsOnNullableTypes.kt
+KtFile: annotationsOnNullableTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/annotationsOnParenthesizedTypes.txt b/compiler/testData/psi/annotation/annotationsOnParenthesizedTypes.txt
index 6a35da0e0e3..d3eaf0e63db 100644
--- a/compiler/testData/psi/annotation/annotationsOnParenthesizedTypes.txt
+++ b/compiler/testData/psi/annotation/annotationsOnParenthesizedTypes.txt
@@ -1,4 +1,4 @@
-JetFile: annotationsOnParenthesizedTypes.kt
+KtFile: annotationsOnParenthesizedTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/annotationAtFileStart.txt b/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
index 502fb08c75c..2c0f36ff69a 100644
--- a/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
+++ b/compiler/testData/psi/annotation/at/annotationAtFileStart.txt
@@ -1,4 +1,4 @@
-JetFile: annotationAtFileStart.kt
+KtFile: annotationAtFileStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt b/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
index 08926abc0a2..8a2d4f4080a 100644
--- a/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
+++ b/compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.txt
@@ -1,4 +1,4 @@
-JetFile: annotationValueArgumentsAmbiguity.kt
+KtFile: annotationValueArgumentsAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/blockLevelExpressions.txt b/compiler/testData/psi/annotation/at/blockLevelExpressions.txt
index 57ffc3962f9..181548ca45b 100644
--- a/compiler/testData/psi/annotation/at/blockLevelExpressions.txt
+++ b/compiler/testData/psi/annotation/at/blockLevelExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: blockLevelExpressions.kt
+KtFile: blockLevelExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/blockLevelExpressionsNoNewLine.txt b/compiler/testData/psi/annotation/at/blockLevelExpressionsNoNewLine.txt
index d6ff82e8daa..7ab5d90d3de 100644
--- a/compiler/testData/psi/annotation/at/blockLevelExpressionsNoNewLine.txt
+++ b/compiler/testData/psi/annotation/at/blockLevelExpressionsNoNewLine.txt
@@ -1,4 +1,4 @@
-JetFile: blockLevelExpressionsNoNewLine.kt
+KtFile: blockLevelExpressionsNoNewLine.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/danglingBlockLevelAnnotations.txt b/compiler/testData/psi/annotation/at/danglingBlockLevelAnnotations.txt
index 75e3d725366..e5d38756a93 100644
--- a/compiler/testData/psi/annotation/at/danglingBlockLevelAnnotations.txt
+++ b/compiler/testData/psi/annotation/at/danglingBlockLevelAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: danglingBlockLevelAnnotations.kt
+KtFile: danglingBlockLevelAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt b/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
index 92d23f4b57e..53ec1e3975b 100644
--- a/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
+++ b/compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt
@@ -1,4 +1,4 @@
-JetFile: declarationsJustAtTyped.kt
+KtFile: declarationsJustAtTyped.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/enumEntries.txt b/compiler/testData/psi/annotation/at/enumEntries.txt
index bf38095ac21..0ebd0b2a447 100644
--- a/compiler/testData/psi/annotation/at/enumEntries.txt
+++ b/compiler/testData/psi/annotation/at/enumEntries.txt
@@ -1,4 +1,4 @@
-JetFile: enumEntries.kt
+KtFile: enumEntries.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt b/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
index 77b2779ead7..472c27a74f4 100644
--- a/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
+++ b/compiler/testData/psi/annotation/at/expressionJustAtTyped.txt
@@ -1,4 +1,4 @@
-JetFile: expressionJustAtTyped.kt
+KtFile: expressionJustAtTyped.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/modifierAtFileStart.txt b/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
index 10a8e82fff7..8086bfe266f 100644
--- a/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
+++ b/compiler/testData/psi/annotation/at/modifierAtFileStart.txt
@@ -1,4 +1,4 @@
-JetFile: modifierAtFileStart.kt
+KtFile: modifierAtFileStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/primaryConstructor.txt b/compiler/testData/psi/annotation/at/primaryConstructor.txt
index dcca353daee..181ae7044bf 100644
--- a/compiler/testData/psi/annotation/at/primaryConstructor.txt
+++ b/compiler/testData/psi/annotation/at/primaryConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: primaryConstructor.kt
+KtFile: primaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/validDeclarations.txt b/compiler/testData/psi/annotation/at/validDeclarations.txt
index c6230ce7e13..30d63a37e91 100644
--- a/compiler/testData/psi/annotation/at/validDeclarations.txt
+++ b/compiler/testData/psi/annotation/at/validDeclarations.txt
@@ -1,4 +1,4 @@
-JetFile: validDeclarations.kt
+KtFile: validDeclarations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/at/validExpressions.txt b/compiler/testData/psi/annotation/at/validExpressions.txt
index c3dbe3ce8f2..abdd9081a20 100644
--- a/compiler/testData/psi/annotation/at/validExpressions.txt
+++ b/compiler/testData/psi/annotation/at/validExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: validExpressions.kt
+KtFile: validExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/forParameters.txt b/compiler/testData/psi/annotation/forParameters.txt
index 98e870dd3bf..498214ca0d2 100644
--- a/compiler/testData/psi/annotation/forParameters.txt
+++ b/compiler/testData/psi/annotation/forParameters.txt
@@ -1,4 +1,4 @@
-JetFile: forParameters.kt
+KtFile: forParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/lambda.txt b/compiler/testData/psi/annotation/lambda.txt
index 623ae24b30f..0202cebac11 100644
--- a/compiler/testData/psi/annotation/lambda.txt
+++ b/compiler/testData/psi/annotation/lambda.txt
@@ -1,4 +1,4 @@
-JetFile: lambda.kt
+KtFile: lambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/lambdaRecovery.txt b/compiler/testData/psi/annotation/lambdaRecovery.txt
index 4b8f9e9f659..dfc912c744b 100644
--- a/compiler/testData/psi/annotation/lambdaRecovery.txt
+++ b/compiler/testData/psi/annotation/lambdaRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: lambdaRecovery.kt
+KtFile: lambdaRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/list/basic.txt b/compiler/testData/psi/annotation/list/basic.txt
index 975667498b8..22c4a87e1df 100644
--- a/compiler/testData/psi/annotation/list/basic.txt
+++ b/compiler/testData/psi/annotation/list/basic.txt
@@ -1,4 +1,4 @@
-JetFile: basic.kt
+KtFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/list/recovery.txt b/compiler/testData/psi/annotation/list/recovery.txt
index c330a104d66..6f943a4436b 100644
--- a/compiler/testData/psi/annotation/list/recovery.txt
+++ b/compiler/testData/psi/annotation/list/recovery.txt
@@ -1,4 +1,4 @@
-JetFile: recovery.kt
+KtFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/modifiersMigration/newModifiers.txt b/compiler/testData/psi/annotation/modifiersMigration/newModifiers.txt
index 0921e3b6511..4f7789dbdff 100644
--- a/compiler/testData/psi/annotation/modifiersMigration/newModifiers.txt
+++ b/compiler/testData/psi/annotation/modifiersMigration/newModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: newModifiers.kt
+KtFile: newModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/modifiersMigration/oldUsages.txt b/compiler/testData/psi/annotation/modifiersMigration/oldUsages.txt
index a7cc49a7e3b..59076c15c1f 100644
--- a/compiler/testData/psi/annotation/modifiersMigration/oldUsages.txt
+++ b/compiler/testData/psi/annotation/modifiersMigration/oldUsages.txt
@@ -1,4 +1,4 @@
-JetFile: oldUsages.kt
+KtFile: oldUsages.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/multiDeclaration.txt b/compiler/testData/psi/annotation/multiDeclaration.txt
index e5b43ec4775..5c9c7a8e2b3 100644
--- a/compiler/testData/psi/annotation/multiDeclaration.txt
+++ b/compiler/testData/psi/annotation/multiDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: multiDeclaration.kt
+KtFile: multiDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/noParameterYet.txt b/compiler/testData/psi/annotation/noParameterYet.txt
index 662f125460a..7acda935b60 100644
--- a/compiler/testData/psi/annotation/noParameterYet.txt
+++ b/compiler/testData/psi/annotation/noParameterYet.txt
@@ -1,4 +1,4 @@
-JetFile: noParameterYet.kt
+KtFile: noParameterYet.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/oldAnnotationsRecovery.txt b/compiler/testData/psi/annotation/oldAnnotationsRecovery.txt
index d3da1f082a7..f69711ea26e 100644
--- a/compiler/testData/psi/annotation/oldAnnotationsRecovery.txt
+++ b/compiler/testData/psi/annotation/oldAnnotationsRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: oldAnnotationsRecovery.kt
+KtFile: oldAnnotationsRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/options/annotationAsArg.txt b/compiler/testData/psi/annotation/options/annotationAsArg.txt
index 4a9e7c9ab32..f76b938481b 100644
--- a/compiler/testData/psi/annotation/options/annotationAsArg.txt
+++ b/compiler/testData/psi/annotation/options/annotationAsArg.txt
@@ -1,4 +1,4 @@
-JetFile: annotationAsArg.kt
+KtFile: annotationAsArg.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/options/annotationAsArgComplex.txt b/compiler/testData/psi/annotation/options/annotationAsArgComplex.txt
index 6000806b13d..822b407c783 100644
--- a/compiler/testData/psi/annotation/options/annotationAsArgComplex.txt
+++ b/compiler/testData/psi/annotation/options/annotationAsArgComplex.txt
@@ -1,4 +1,4 @@
-JetFile: annotationAsArgComplex.kt
+KtFile: annotationAsArgComplex.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/options/java.txt b/compiler/testData/psi/annotation/options/java.txt
index 33b0a6efa98..00300633598 100644
--- a/compiler/testData/psi/annotation/options/java.txt
+++ b/compiler/testData/psi/annotation/options/java.txt
@@ -1,4 +1,4 @@
-JetFile: java.kt
+KtFile: java.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/options/local.txt b/compiler/testData/psi/annotation/options/local.txt
index 9a25e12b7be..cdff79f545e 100644
--- a/compiler/testData/psi/annotation/options/local.txt
+++ b/compiler/testData/psi/annotation/options/local.txt
@@ -1,4 +1,4 @@
-JetFile: local.kt
+KtFile: local.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onField/delegate.txt b/compiler/testData/psi/annotation/targeted/onField/delegate.txt
index 6631dfe181c..035a0ff2029 100644
--- a/compiler/testData/psi/annotation/targeted/onField/delegate.txt
+++ b/compiler/testData/psi/annotation/targeted/onField/delegate.txt
@@ -1,4 +1,4 @@
-JetFile: delegate.kt
+KtFile: delegate.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onField/fqName.txt b/compiler/testData/psi/annotation/targeted/onField/fqName.txt
index 42296829801..b63f61818b3 100644
--- a/compiler/testData/psi/annotation/targeted/onField/fqName.txt
+++ b/compiler/testData/psi/annotation/targeted/onField/fqName.txt
@@ -1,4 +1,4 @@
-JetFile: fqName.kt
+KtFile: fqName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onField/inWrongPlace.txt b/compiler/testData/psi/annotation/targeted/onField/inWrongPlace.txt
index 2c717e12448..5104b036525 100644
--- a/compiler/testData/psi/annotation/targeted/onField/inWrongPlace.txt
+++ b/compiler/testData/psi/annotation/targeted/onField/inWrongPlace.txt
@@ -1,4 +1,4 @@
-JetFile: inWrongPlace.kt
+KtFile: inWrongPlace.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.txt b/compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.txt
index 5d010911d9a..b187568180f 100644
--- a/compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.txt
+++ b/compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.txt
@@ -1,4 +1,4 @@
-JetFile: manyInOneAnnotationBlock.kt
+KtFile: manyInOneAnnotationBlock.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.txt b/compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.txt
index 8fc8caca74a..b2bc7aae41d 100644
--- a/compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.txt
+++ b/compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.txt
@@ -1,4 +1,4 @@
-JetFile: simpleFieldAnnotation.kt
+KtFile: simpleFieldAnnotation.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.txt b/compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.txt
index e1fa7f27f7f..7045f2c7d69 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.txt
@@ -1,4 +1,4 @@
-JetFile: fileAnnotationInWrongPlace.kt
+KtFile: fileAnnotationInWrongPlace.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.txt b/compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.txt
index 033e89e1524..18ead474116 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.txt
@@ -1,4 +1,4 @@
-JetFile: manyAnnotationBlocks.kt
+KtFile: manyAnnotationBlocks.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.txt b/compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.txt
index 7889e910cce..4b3091653ed 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.txt
@@ -1,4 +1,4 @@
-JetFile: manyInOneAnnotationBlock.kt
+KtFile: manyInOneAnnotationBlock.kt
   FILE_ANNOTATION_LIST
     ANNOTATION
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.txt b/compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.txt
index 5728eb2cb58..8a2f17b4ea6 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.txt
@@ -1,4 +1,4 @@
-JetFile: nonFIleAnnotationBeforePackage.kt
+KtFile: nonFIleAnnotationBeforePackage.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/single.txt b/compiler/testData/psi/annotation/targeted/onFile/single.txt
index b63873e0aaf..05a8f307952 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/single.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/single.txt
@@ -1,4 +1,4 @@
-JetFile: single.kt
+KtFile: single.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.txt b/compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.txt
index 1e38eddf395..2c4e7894662 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: withoutFileAnnotationAndPackageDeclaration.kt
+KtFile: withoutFileAnnotationAndPackageDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onFile/withoutPackage.txt b/compiler/testData/psi/annotation/targeted/onFile/withoutPackage.txt
index 0a598349cfe..262ed476de2 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/withoutPackage.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/withoutPackage.txt
@@ -1,4 +1,4 @@
-JetFile: withoutPackage.kt
+KtFile: withoutPackage.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.txt b/compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.txt
index 88cd24293b4..635bfa7df39 100644
--- a/compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.txt
+++ b/compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.txt
@@ -1,4 +1,4 @@
-JetFile: withoutPackageWithSimpleAnnotation.kt
+KtFile: withoutPackageWithSimpleAnnotation.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.txt b/compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.txt
index bf44de23a7c..d725c4bce66 100644
--- a/compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.txt
+++ b/compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.txt
@@ -1,4 +1,4 @@
-JetFile: inWrongPlace.kt
+KtFile: inWrongPlace.kt
   FILE_ANNOTATION_LIST
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.txt b/compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.txt
index 8ce379df85e..34d21d0a36a 100644
--- a/compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.txt
+++ b/compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.txt
@@ -1,4 +1,4 @@
-JetFile: simple.kt
+KtFile: simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.txt b/compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.txt
index 210ac863054..ba36faa9297 100644
--- a/compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.txt
+++ b/compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.txt
@@ -1,4 +1,4 @@
-JetFile: twoAnnotationLists.kt
+KtFile: twoAnnotationLists.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onParam/modifiers.txt b/compiler/testData/psi/annotation/targeted/onParam/modifiers.txt
index af6feb1fade..8cbf8b0fb8c 100644
--- a/compiler/testData/psi/annotation/targeted/onParam/modifiers.txt
+++ b/compiler/testData/psi/annotation/targeted/onParam/modifiers.txt
@@ -1,4 +1,4 @@
-JetFile: modifiers.kt
+KtFile: modifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onParam/recovery.txt b/compiler/testData/psi/annotation/targeted/onParam/recovery.txt
index 794733fbf06..607441c27a5 100644
--- a/compiler/testData/psi/annotation/targeted/onParam/recovery.txt
+++ b/compiler/testData/psi/annotation/targeted/onParam/recovery.txt
@@ -1,4 +1,4 @@
-JetFile: recovery.kt
+KtFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onParam/simple.txt b/compiler/testData/psi/annotation/targeted/onParam/simple.txt
index 067bbdbd092..164bd344fe0 100644
--- a/compiler/testData/psi/annotation/targeted/onParam/simple.txt
+++ b/compiler/testData/psi/annotation/targeted/onParam/simple.txt
@@ -1,4 +1,4 @@
-JetFile: simple.kt
+KtFile: simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/annotation/targeted/onParam/targetExpected.txt b/compiler/testData/psi/annotation/targeted/onParam/targetExpected.txt
index 1469ffe7d5a..d608207205b 100644
--- a/compiler/testData/psi/annotation/targeted/onParam/targetExpected.txt
+++ b/compiler/testData/psi/annotation/targeted/onParam/targetExpected.txt
@@ -1,4 +1,4 @@
-JetFile: targetExpected.kt
+KtFile: targetExpected.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/destructuringInLambdas.txt b/compiler/testData/psi/destructuringInLambdas.txt
index 67fdc228a7a..3a0e2157626 100644
--- a/compiler/testData/psi/destructuringInLambdas.txt
+++ b/compiler/testData/psi/destructuringInLambdas.txt
@@ -1,4 +1,4 @@
-JetFile: destructuringInLambdas.kt
+KtFile: destructuringInLambdas.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/destructuringInLambdas_ERR.txt b/compiler/testData/psi/destructuringInLambdas_ERR.txt
index 73e9bf4f7d5..da4f7eaf574 100644
--- a/compiler/testData/psi/destructuringInLambdas_ERR.txt
+++ b/compiler/testData/psi/destructuringInLambdas_ERR.txt
@@ -1,4 +1,4 @@
-JetFile: destructuringInLambdas_ERR.kt
+KtFile: destructuringInLambdas_ERR.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/AnonymousObjects.txt b/compiler/testData/psi/examples/AnonymousObjects.txt
index cc2dd449ab5..3ea278a8929 100644
--- a/compiler/testData/psi/examples/AnonymousObjects.txt
+++ b/compiler/testData/psi/examples/AnonymousObjects.txt
@@ -1,4 +1,4 @@
-JetFile: AnonymousObjects.kt
+KtFile: AnonymousObjects.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/BinaryTree.txt b/compiler/testData/psi/examples/BinaryTree.txt
index 5eb11d13747..9b3cdf639b6 100644
--- a/compiler/testData/psi/examples/BinaryTree.txt
+++ b/compiler/testData/psi/examples/BinaryTree.txt
@@ -1,4 +1,4 @@
-JetFile: BinaryTree.kt
+KtFile: BinaryTree.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/BitArith.txt b/compiler/testData/psi/examples/BitArith.txt
index 6d02148bf8d..5731bc7f60f 100644
--- a/compiler/testData/psi/examples/BitArith.txt
+++ b/compiler/testData/psi/examples/BitArith.txt
@@ -1,4 +1,4 @@
-JetFile: BitArith.kt
+KtFile: BitArith.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/Builder.txt b/compiler/testData/psi/examples/Builder.txt
index 33811173669..b8f5536f87d 100644
--- a/compiler/testData/psi/examples/Builder.txt
+++ b/compiler/testData/psi/examples/Builder.txt
@@ -1,4 +1,4 @@
-JetFile: Builder.kt
+KtFile: Builder.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/Color.txt b/compiler/testData/psi/examples/Color.txt
index e2af0351935..e8c97401eed 100644
--- a/compiler/testData/psi/examples/Color.txt
+++ b/compiler/testData/psi/examples/Color.txt
@@ -1,4 +1,4 @@
-JetFile: Color.kt
+KtFile: Color.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.txt b/compiler/testData/psi/examples/FunctionsAndTypes.txt
index d376ee7a0fe..da77648db4b 100644
--- a/compiler/testData/psi/examples/FunctionsAndTypes.txt
+++ b/compiler/testData/psi/examples/FunctionsAndTypes.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsAndTypes.kt
+KtFile: FunctionsAndTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/Graph.txt b/compiler/testData/psi/examples/Graph.txt
index 7c599ca09f9..1595f6b8348 100644
--- a/compiler/testData/psi/examples/Graph.txt
+++ b/compiler/testData/psi/examples/Graph.txt
@@ -1,4 +1,4 @@
-JetFile: Graph.kt
+KtFile: Graph.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/IPushPop.txt b/compiler/testData/psi/examples/IPushPop.txt
index 1208cc3b270..e4211b50a0f 100644
--- a/compiler/testData/psi/examples/IPushPop.txt
+++ b/compiler/testData/psi/examples/IPushPop.txt
@@ -1,4 +1,4 @@
-JetFile: IPushPop.kt
+KtFile: IPushPop.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/LINQ.txt b/compiler/testData/psi/examples/LINQ.txt
index c1675c2a75b..ac928f32310 100644
--- a/compiler/testData/psi/examples/LINQ.txt
+++ b/compiler/testData/psi/examples/LINQ.txt
@@ -1,4 +1,4 @@
-JetFile: LINQ.kt
+KtFile: LINQ.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/Queue.txt b/compiler/testData/psi/examples/Queue.txt
index 28f4131ce7f..7ad71bd3100 100644
--- a/compiler/testData/psi/examples/Queue.txt
+++ b/compiler/testData/psi/examples/Queue.txt
@@ -1,4 +1,4 @@
-JetFile: Queue.kt
+KtFile: Queue.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/Stack.txt b/compiler/testData/psi/examples/Stack.txt
index 1a6771fcdf4..c3d6ad55d4f 100644
--- a/compiler/testData/psi/examples/Stack.txt
+++ b/compiler/testData/psi/examples/Stack.txt
@@ -1,4 +1,4 @@
-JetFile: Stack.kt
+KtFile: Stack.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/UnionFind.txt b/compiler/testData/psi/examples/UnionFind.txt
index 7019fcd6386..e216c5baf96 100644
--- a/compiler/testData/psi/examples/UnionFind.txt
+++ b/compiler/testData/psi/examples/UnionFind.txt
@@ -1,4 +1,4 @@
-JetFile: UnionFind.kt
+KtFile: UnionFind.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/UpdateOperation.txt b/compiler/testData/psi/examples/UpdateOperation.txt
index c146984c9d0..62e3dc03624 100644
--- a/compiler/testData/psi/examples/UpdateOperation.txt
+++ b/compiler/testData/psi/examples/UpdateOperation.txt
@@ -1,4 +1,4 @@
-JetFile: UpdateOperation.kt
+KtFile: UpdateOperation.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/With.txt b/compiler/testData/psi/examples/With.txt
index 71dcd432c8c..58733cab697 100644
--- a/compiler/testData/psi/examples/With.txt
+++ b/compiler/testData/psi/examples/With.txt
@@ -1,4 +1,4 @@
-JetFile: With.kt
+KtFile: With.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/array/MutableArray.txt b/compiler/testData/psi/examples/array/MutableArray.txt
index c7e6aafa998..b257e5f6395 100644
--- a/compiler/testData/psi/examples/array/MutableArray.txt
+++ b/compiler/testData/psi/examples/array/MutableArray.txt
@@ -1,4 +1,4 @@
-JetFile: MutableArray.kt
+KtFile: MutableArray.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/ArrayList.txt b/compiler/testData/psi/examples/collections/ArrayList.txt
index cbda98826b2..f98d159a219 100644
--- a/compiler/testData/psi/examples/collections/ArrayList.txt
+++ b/compiler/testData/psi/examples/collections/ArrayList.txt
@@ -1,4 +1,4 @@
-JetFile: ArrayList.kt
+KtFile: ArrayList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/HashMap.txt b/compiler/testData/psi/examples/collections/HashMap.txt
index f92c08bde34..39d81410d84 100644
--- a/compiler/testData/psi/examples/collections/HashMap.txt
+++ b/compiler/testData/psi/examples/collections/HashMap.txt
@@ -1,4 +1,4 @@
-JetFile: HashMap.kt
+KtFile: HashMap.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IIterable.txt b/compiler/testData/psi/examples/collections/IIterable.txt
index 33b29dbc705..17ee10ccfdf 100644
--- a/compiler/testData/psi/examples/collections/IIterable.txt
+++ b/compiler/testData/psi/examples/collections/IIterable.txt
@@ -1,4 +1,4 @@
-JetFile: IIterable.kt
+KtFile: IIterable.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IIterator.txt b/compiler/testData/psi/examples/collections/IIterator.txt
index 86261e14164..5cd394e1a30 100644
--- a/compiler/testData/psi/examples/collections/IIterator.txt
+++ b/compiler/testData/psi/examples/collections/IIterator.txt
@@ -1,4 +1,4 @@
-JetFile: IIterator.kt
+KtFile: IIterator.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IList.txt b/compiler/testData/psi/examples/collections/IList.txt
index 3b65b399f0c..82f5cd216d7 100644
--- a/compiler/testData/psi/examples/collections/IList.txt
+++ b/compiler/testData/psi/examples/collections/IList.txt
@@ -1,4 +1,4 @@
-JetFile: IList.kt
+KtFile: IList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IMutableIterable.txt b/compiler/testData/psi/examples/collections/IMutableIterable.txt
index 8e400408d30..223aaa1c87e 100644
--- a/compiler/testData/psi/examples/collections/IMutableIterable.txt
+++ b/compiler/testData/psi/examples/collections/IMutableIterable.txt
@@ -1,4 +1,4 @@
-JetFile: IMutableIterable.kt
+KtFile: IMutableIterable.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IMutableIterator.txt b/compiler/testData/psi/examples/collections/IMutableIterator.txt
index b6caccb5934..88ec4795c70 100644
--- a/compiler/testData/psi/examples/collections/IMutableIterator.txt
+++ b/compiler/testData/psi/examples/collections/IMutableIterator.txt
@@ -1,4 +1,4 @@
-JetFile: IMutableIterator.kt
+KtFile: IMutableIterator.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IMutableList.txt b/compiler/testData/psi/examples/collections/IMutableList.txt
index ae1b6966f9e..7bb14a04830 100644
--- a/compiler/testData/psi/examples/collections/IMutableList.txt
+++ b/compiler/testData/psi/examples/collections/IMutableList.txt
@@ -1,4 +1,4 @@
-JetFile: IMutableList.kt
+KtFile: IMutableList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/IMutableSet.txt b/compiler/testData/psi/examples/collections/IMutableSet.txt
index 5739d8d5448..0fdc2b2de66 100644
--- a/compiler/testData/psi/examples/collections/IMutableSet.txt
+++ b/compiler/testData/psi/examples/collections/IMutableSet.txt
@@ -1,4 +1,4 @@
-JetFile: IMutableSet.kt
+KtFile: IMutableSet.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/ISet.txt b/compiler/testData/psi/examples/collections/ISet.txt
index d6a49ab4022..90c404b89ff 100644
--- a/compiler/testData/psi/examples/collections/ISet.txt
+++ b/compiler/testData/psi/examples/collections/ISet.txt
@@ -1,4 +1,4 @@
-JetFile: ISet.kt
+KtFile: ISet.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/ISized.txt b/compiler/testData/psi/examples/collections/ISized.txt
index 16e362cb274..9444baf859a 100644
--- a/compiler/testData/psi/examples/collections/ISized.txt
+++ b/compiler/testData/psi/examples/collections/ISized.txt
@@ -1,4 +1,4 @@
-JetFile: ISized.kt
+KtFile: ISized.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/collections/LinkedList.txt b/compiler/testData/psi/examples/collections/LinkedList.txt
index cd07f8065dc..80149051ccc 100644
--- a/compiler/testData/psi/examples/collections/LinkedList.txt
+++ b/compiler/testData/psi/examples/collections/LinkedList.txt
@@ -1,4 +1,4 @@
-JetFile: LinkedList.kt
+KtFile: LinkedList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt
index 94da5617923..360c889a9fe 100644
--- a/compiler/testData/psi/examples/io/IOSamples.txt
+++ b/compiler/testData/psi/examples/io/IOSamples.txt
@@ -1,4 +1,4 @@
-JetFile: IOSamples.kt
+KtFile: IOSamples.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/map/IMap.txt b/compiler/testData/psi/examples/map/IMap.txt
index 68296408e27..0a383654c3b 100644
--- a/compiler/testData/psi/examples/map/IMap.txt
+++ b/compiler/testData/psi/examples/map/IMap.txt
@@ -1,4 +1,4 @@
-JetFile: IMap.kt
+KtFile: IMap.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
index 3c892842296..4244c91491e 100644
--- a/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
+++ b/compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
@@ -1,4 +1,4 @@
-JetFile: BinaryHeap.kt
+KtFile: BinaryHeap.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
index aaf74d5c625..cb6d00a0815 100644
--- a/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
+++ b/compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
@@ -1,4 +1,4 @@
-JetFile: IPriorityQueue.kt
+KtFile: IPriorityQueue.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
index 1aa82526fb9..b31fe2d570f 100644
--- a/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
+++ b/compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
@@ -1,4 +1,4 @@
-JetFile: PriorityQueueAsPushPop.kt
+KtFile: PriorityQueueAsPushPop.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt
index b72fe1c9ddd..1b01fc18a6b 100644
--- a/compiler/testData/psi/examples/util/Comparison.txt
+++ b/compiler/testData/psi/examples/util/Comparison.txt
@@ -1,4 +1,4 @@
-JetFile: Comparison.kt
+KtFile: Comparison.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/examples/util/IComparable.txt b/compiler/testData/psi/examples/util/IComparable.txt
index be5f4029746..0957339d8f6 100644
--- a/compiler/testData/psi/examples/util/IComparable.txt
+++ b/compiler/testData/psi/examples/util/IComparable.txt
@@ -1,4 +1,4 @@
-JetFile: IComparable.kt
+KtFile: IComparable.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
index 99592e1e06f..51f92cc6159 100644
--- a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionTypesWithFunctionReceivers.kt
+KtFile: FunctionTypesWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
index 6202d794935..809d87226ec 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithFunctionReceivers.kt
+KtFile: FunctionsWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
index 135773eaa5b..1f89062f498 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithFunctionReceiversAnnotations.kt
+KtFile: FunctionsWithFunctionReceiversAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
index 9cd7f271d0a..7de265459aa 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsWithFunctionReceiversRecovery.kt
+KtFile: FunctionsWithFunctionReceiversRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
index f96a55b62b4..151520f6e45 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt
@@ -1,4 +1,4 @@
-JetFile: PropertiesWithFunctionReceivers.kt
+KtFile: PropertiesWithFunctionReceivers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
index cbe17b65002..f9303df99b1 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt
@@ -1,4 +1,4 @@
-JetFile: PropertiesWithFunctionReceiversAnnotations.kt
+KtFile: PropertiesWithFunctionReceiversAnnotations.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
index 2b2b320ca7f..1062dd9aa8a 100644
--- a/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
+++ b/compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: PropertiesWithFunctionReceiversRecovery.kt
+KtFile: PropertiesWithFunctionReceiversRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
index dacc149b5d9..1e7fc091f24 100644
--- a/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
+++ b/compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionTypesAsArguments.kt
+KtFile: FunctionTypesAsArguments.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
index ccc93bb87ef..6cc8283a47c 100644
--- a/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
+++ b/compiler/testData/psi/greatSyntacticShift/functionLiterals.txt
@@ -1,4 +1,4 @@
-JetFile: functionLiterals.kt
+KtFile: functionLiterals.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
index ce8387a95f5..8210d029a3e 100644
--- a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
+++ b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
@@ -1,4 +1,4 @@
-JetFile: functionTypes.kt
+KtFile: functionTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/greatSyntacticShift/nullableTypes.txt b/compiler/testData/psi/greatSyntacticShift/nullableTypes.txt
index 370d3070bbb..5cd88624e2e 100644
--- a/compiler/testData/psi/greatSyntacticShift/nullableTypes.txt
+++ b/compiler/testData/psi/greatSyntacticShift/nullableTypes.txt
@@ -1,4 +1,4 @@
-JetFile: nullableTypes.kt
+KtFile: nullableTypes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/AtTags.txt b/compiler/testData/psi/kdoc/AtTags.txt
index eef4ff262cd..a5c06e76bc5 100644
--- a/compiler/testData/psi/kdoc/AtTags.txt
+++ b/compiler/testData/psi/kdoc/AtTags.txt
@@ -1,4 +1,4 @@
-JetFile: AtTags.kt
+KtFile: AtTags.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
index a65814b78f7..454a604abc6 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentAtBeginningOfFile1.kt
+KtFile: DocCommentAtBeginningOfFile1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
index d415c34701d..03cbdd7a449 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentAtBeginningOfFile2.kt
+KtFile: DocCommentAtBeginningOfFile2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
index 3450cbf34a9..25626ef24d6 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentAtBeginningOfFile3.kt
+KtFile: DocCommentAtBeginningOfFile3.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
index 190a1e01810..94b5d07271f 100644
--- a/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
+++ b/compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.txt
@@ -1,4 +1,4 @@
-JetFile: DocCommentAtBeginningOfFile4.kt
+KtFile: DocCommentAtBeginningOfFile4.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt b/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
index 6cb6d970857..60bff083b8e 100644
--- a/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
+++ b/compiler/testData/psi/kdoc/EndOnLeadingAsterisks.txt
@@ -1,4 +1,4 @@
-JetFile: EndOnLeadingAsterisks.kt
+KtFile: EndOnLeadingAsterisks.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/EndRightAfterText.txt b/compiler/testData/psi/kdoc/EndRightAfterText.txt
index 7cd98869479..625b980aa27 100644
--- a/compiler/testData/psi/kdoc/EndRightAfterText.txt
+++ b/compiler/testData/psi/kdoc/EndRightAfterText.txt
@@ -1,4 +1,4 @@
-JetFile: EndRightAfterText.kt
+KtFile: EndRightAfterText.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/HttpLink.txt b/compiler/testData/psi/kdoc/HttpLink.txt
index 2c79860417b..85cb05b8f28 100644
--- a/compiler/testData/psi/kdoc/HttpLink.txt
+++ b/compiler/testData/psi/kdoc/HttpLink.txt
@@ -1,4 +1,4 @@
-JetFile: HttpLink.kt
+KtFile: HttpLink.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/Incomplete.txt b/compiler/testData/psi/kdoc/Incomplete.txt
index 2d53e7d96b9..24593c3dae6 100644
--- a/compiler/testData/psi/kdoc/Incomplete.txt
+++ b/compiler/testData/psi/kdoc/Incomplete.txt
@@ -1,4 +1,4 @@
-JetFile: Incomplete.kt
+KtFile: Incomplete.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/Markdown.txt b/compiler/testData/psi/kdoc/Markdown.txt
index f44c038ebf9..9979e4c85d5 100644
--- a/compiler/testData/psi/kdoc/Markdown.txt
+++ b/compiler/testData/psi/kdoc/Markdown.txt
@@ -1,4 +1,4 @@
-JetFile: Markdown.kt
+KtFile: Markdown.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt b/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
index a0ef8790bb7..57d56eb6ef5 100644
--- a/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
+++ b/compiler/testData/psi/kdoc/MarkdownLinkWithError.txt
@@ -1,4 +1,4 @@
-JetFile: MarkdownLinkWithError.kt
+KtFile: MarkdownLinkWithError.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt b/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
index b31251a9631..c1f8a0b4c43 100644
--- a/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
+++ b/compiler/testData/psi/kdoc/MarkdownLinkWithLabel.txt
@@ -1,4 +1,4 @@
-JetFile: MarkdownLinkWithLabel.kt
+KtFile: MarkdownLinkWithLabel.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt b/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
index 436b499ed2f..2931d8c9285 100644
--- a/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
+++ b/compiler/testData/psi/kdoc/MarkdownQualifiedName.txt
@@ -1,4 +1,4 @@
-JetFile: MarkdownQualifiedName.kt
+KtFile: MarkdownQualifiedName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/ParamTag.txt b/compiler/testData/psi/kdoc/ParamTag.txt
index cefb2381c70..0939708e54b 100644
--- a/compiler/testData/psi/kdoc/ParamTag.txt
+++ b/compiler/testData/psi/kdoc/ParamTag.txt
@@ -1,4 +1,4 @@
-JetFile: ParamTag.kt
+KtFile: ParamTag.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/ParamTagAtStart.txt b/compiler/testData/psi/kdoc/ParamTagAtStart.txt
index a92758f8bce..528b5971faf 100644
--- a/compiler/testData/psi/kdoc/ParamTagAtStart.txt
+++ b/compiler/testData/psi/kdoc/ParamTagAtStart.txt
@@ -1,4 +1,4 @@
-JetFile: ParamTagAtStart.kt
+KtFile: ParamTagAtStart.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/ReturnWithBrackets.txt b/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
index afef72db2ff..3a5670428f0 100644
--- a/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
+++ b/compiler/testData/psi/kdoc/ReturnWithBrackets.txt
@@ -1,4 +1,4 @@
-JetFile: ReturnWithBrackets.kt
+KtFile: ReturnWithBrackets.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/Sections.txt b/compiler/testData/psi/kdoc/Sections.txt
index 64fcbe521f4..7c0366063ca 100644
--- a/compiler/testData/psi/kdoc/Sections.txt
+++ b/compiler/testData/psi/kdoc/Sections.txt
@@ -1,4 +1,4 @@
-JetFile: Sections.kt
+KtFile: Sections.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/SeeEmpty.txt b/compiler/testData/psi/kdoc/SeeEmpty.txt
index dd2fb2f637f..378a7175968 100644
--- a/compiler/testData/psi/kdoc/SeeEmpty.txt
+++ b/compiler/testData/psi/kdoc/SeeEmpty.txt
@@ -1,4 +1,4 @@
-JetFile: SeeEmpty.kt
+KtFile: SeeEmpty.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/SeeLink.txt b/compiler/testData/psi/kdoc/SeeLink.txt
index 5bf4af2756e..4edaaf41851 100644
--- a/compiler/testData/psi/kdoc/SeeLink.txt
+++ b/compiler/testData/psi/kdoc/SeeLink.txt
@@ -1,4 +1,4 @@
-JetFile: SeeLink.kt
+KtFile: SeeLink.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/Simple.txt b/compiler/testData/psi/kdoc/Simple.txt
index 6d7691759ff..3eadb85da91 100644
--- a/compiler/testData/psi/kdoc/Simple.txt
+++ b/compiler/testData/psi/kdoc/Simple.txt
@@ -1,4 +1,4 @@
-JetFile: Simple.kt
+KtFile: Simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt b/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
index 34297bfad48..62fb3de0a85 100644
--- a/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
+++ b/compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.txt
@@ -1,4 +1,4 @@
-JetFile: TextRightAfterLeadAsterisks.kt
+KtFile: TextRightAfterLeadAsterisks.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/kdoc/TwoTags.txt b/compiler/testData/psi/kdoc/TwoTags.txt
index 24172edb6ee..7b6f6c95c92 100644
--- a/compiler/testData/psi/kdoc/TwoTags.txt
+++ b/compiler/testData/psi/kdoc/TwoTags.txt
@@ -1,4 +1,4 @@
-JetFile: TwoTags.kt
+KtFile: TwoTags.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/namelessObjectAsEnumMember.txt b/compiler/testData/psi/namelessObjectAsEnumMember.txt
index ec353686d82..671d69bd175 100644
--- a/compiler/testData/psi/namelessObjectAsEnumMember.txt
+++ b/compiler/testData/psi/namelessObjectAsEnumMember.txt
@@ -1,4 +1,4 @@
-JetFile: namelessObjectAsEnumMember.kt
+KtFile: namelessObjectAsEnumMember.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/newLabels/basic.txt b/compiler/testData/psi/newLabels/basic.txt
index c8a1d25a8f1..4f5ac8e1c89 100644
--- a/compiler/testData/psi/newLabels/basic.txt
+++ b/compiler/testData/psi/newLabels/basic.txt
@@ -1,4 +1,4 @@
-JetFile: basic.kt
+KtFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt b/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
index 9deef9ce9df..96fb079300a 100644
--- a/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
+++ b/compiler/testData/psi/newLabels/oldSyntaxExpressions.txt
@@ -1,4 +1,4 @@
-JetFile: oldSyntaxExpressions.kt
+KtFile: oldSyntaxExpressions.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/newLabels/recovery.txt b/compiler/testData/psi/newLabels/recovery.txt
index 06f605fb07c..4acb084c03c 100644
--- a/compiler/testData/psi/newLabels/recovery.txt
+++ b/compiler/testData/psi/newLabels/recovery.txt
@@ -1,4 +1,4 @@
-JetFile: recovery.kt
+KtFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt b/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
index 48aced5ebe7..e09be0b0a29 100644
--- a/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
+++ b/compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt
@@ -1,4 +1,4 @@
-JetFile: spaceBeforeLabelReference.kt
+KtFile: spaceBeforeLabelReference.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/packages/PackageBlockFirst.txt b/compiler/testData/psi/packages/PackageBlockFirst.txt
index 4d073d4a0ee..9561ac7f0a4 100644
--- a/compiler/testData/psi/packages/PackageBlockFirst.txt
+++ b/compiler/testData/psi/packages/PackageBlockFirst.txt
@@ -1,4 +1,4 @@
-JetFile: PackageBlockFirst.kt
+KtFile: PackageBlockFirst.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt b/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
index 4bbc3e06b4f..4c3cf9c157c 100644
--- a/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
+++ b/compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
@@ -1,4 +1,4 @@
-JetFile: PackageLeadingDotDoubleID.kt
+KtFile: PackageLeadingDotDoubleID.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt b/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
index 1f38e61bd31..3bd2a231a3c 100644
--- a/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
+++ b/compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
@@ -1,4 +1,4 @@
-JetFile: PackageLongNameBetweenDots.kt
+KtFile: PackageLongNameBetweenDots.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageLongNameDoubleID.txt b/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
index 885625d5d39..1de8fffb84b 100644
--- a/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
+++ b/compiler/testData/psi/packages/PackageLongNameDoubleID.txt
@@ -1,4 +1,4 @@
-JetFile: PackageLongNameDoubleID.kt
+KtFile: PackageLongNameDoubleID.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt b/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
index 3c188845cc9..828ff81a8dc 100644
--- a/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
+++ b/compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageLongNameLeadingDot.kt
+KtFile: PackageLongNameLeadingDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt b/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
index 69b38729650..29e0e66c143 100644
--- a/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageLongNameLeadingDoubleDot.kt
+KtFile: PackageLongNameLeadingDoubleDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageModifiers.txt b/compiler/testData/psi/packages/PackageModifiers.txt
index 918abb8d7c9..f796d3df9ff 100644
--- a/compiler/testData/psi/packages/PackageModifiers.txt
+++ b/compiler/testData/psi/packages/PackageModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: PackageModifiers.kt
+KtFile: PackageModifiers.kt
   PACKAGE_DIRECTIVE
     MODIFIER_LIST
       PsiElement(public)('public')
diff --git a/compiler/testData/psi/packages/PackageNameDoubleDot.txt b/compiler/testData/psi/packages/PackageNameDoubleDot.txt
index 0a9f69eb9e3..a7f14d0e94f 100644
--- a/compiler/testData/psi/packages/PackageNameDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageNameDoubleDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageNameDoubleDot.kt
+KtFile: PackageNameDoubleDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageNameJustDot.txt b/compiler/testData/psi/packages/PackageNameJustDot.txt
index 3882d64b97a..d62fdda3a76 100644
--- a/compiler/testData/psi/packages/PackageNameJustDot.txt
+++ b/compiler/testData/psi/packages/PackageNameJustDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageNameJustDot.kt
+KtFile: PackageNameJustDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt b/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
index 788858f52b0..5d1c3051213 100644
--- a/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
+++ b/compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageSimpleNameLeadingDot.kt
+KtFile: PackageSimpleNameLeadingDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt b/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
index e77e4496311..78ec3ffc8e3 100644
--- a/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
+++ b/compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
@@ -1,4 +1,4 @@
-JetFile: PackageSimpleNameLeadingDoubleDot.kt
+KtFile: PackageSimpleNameLeadingDoubleDot.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/platformTypesRecovery/Array.txt b/compiler/testData/psi/platformTypesRecovery/Array.txt
index f2712c571a1..2f08d1da3bb 100644
--- a/compiler/testData/psi/platformTypesRecovery/Array.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Array.txt
@@ -1,4 +1,4 @@
-JetFile: Array.kt
+KtFile: Array.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt b/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
index 144e43f0c6b..22742724b0a 100644
--- a/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
+++ b/compiler/testData/psi/platformTypesRecovery/BeforeDot.txt
@@ -1,4 +1,4 @@
-JetFile: BeforeDot.kt
+KtFile: BeforeDot.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/Collections.txt b/compiler/testData/psi/platformTypesRecovery/Collections.txt
index b97e286d15b..18edeb5a975 100644
--- a/compiler/testData/psi/platformTypesRecovery/Collections.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Collections.txt
@@ -1,4 +1,4 @@
-JetFile: Collections.kt
+KtFile: Collections.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt b/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
index f779fab03b9..623d09ba9ec 100644
--- a/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
+++ b/compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.txt
@@ -1,4 +1,4 @@
-JetFile: FunctionsNotPlatform.kt
+KtFile: FunctionsNotPlatform.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/MapEntry.txt b/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
index 0a392cfec71..1c1953e5ab4 100644
--- a/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
+++ b/compiler/testData/psi/platformTypesRecovery/MapEntry.txt
@@ -1,4 +1,4 @@
-JetFile: MapEntry.kt
+KtFile: MapEntry.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt b/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
index c542231d22e..44b22a5503a 100644
--- a/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
+++ b/compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.txt
@@ -1,4 +1,4 @@
-JetFile: ParenthesizedNotPlatform.kt
+KtFile: ParenthesizedNotPlatform.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/Qualified.txt b/compiler/testData/psi/platformTypesRecovery/Qualified.txt
index 5e49793c696..c569eba2cd5 100644
--- a/compiler/testData/psi/platformTypesRecovery/Qualified.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Qualified.txt
@@ -1,4 +1,4 @@
-JetFile: Qualified.kt
+KtFile: Qualified.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt b/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
index 2152cc3588a..27091d6ee41 100644
--- a/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
+++ b/compiler/testData/psi/platformTypesRecovery/QualifiedCollections.txt
@@ -1,4 +1,4 @@
-JetFile: QualifiedCollections.kt
+KtFile: QualifiedCollections.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/Simple.txt b/compiler/testData/psi/platformTypesRecovery/Simple.txt
index 3434847e404..a18a6a9cd4f 100644
--- a/compiler/testData/psi/platformTypesRecovery/Simple.txt
+++ b/compiler/testData/psi/platformTypesRecovery/Simple.txt
@@ -1,4 +1,4 @@
-JetFile: Simple.kt
+KtFile: Simple.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt b/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
index 6f94ae67679..ff3042400c0 100644
--- a/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
+++ b/compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: WrongWordInParentheses.kt
+KtFile: WrongWordInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/primaryConstructor/local.txt b/compiler/testData/psi/primaryConstructor/local.txt
index ef5be00ee0c..09d978e51ce 100644
--- a/compiler/testData/psi/primaryConstructor/local.txt
+++ b/compiler/testData/psi/primaryConstructor/local.txt
@@ -1,4 +1,4 @@
-JetFile: local.kt
+KtFile: local.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt b/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
index 3faeffcaac3..7a3f7974db7 100644
--- a/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
+++ b/compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt
@@ -1,4 +1,4 @@
-JetFile: nestedClassAmbiguity.kt
+KtFile: nestedClassAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/primaryConstructor/recovery.txt b/compiler/testData/psi/primaryConstructor/recovery.txt
index 67416a1b816..c78d28d9b9d 100644
--- a/compiler/testData/psi/primaryConstructor/recovery.txt
+++ b/compiler/testData/psi/primaryConstructor/recovery.txt
@@ -1,4 +1,4 @@
-JetFile: recovery.kt
+KtFile: recovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt b/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
index 77fc3378769..d6b90d9d80f 100644
--- a/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
+++ b/compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryNestedClassAmbiguity.kt
+KtFile: recoveryNestedClassAmbiguity.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/primaryConstructor/valid.txt b/compiler/testData/psi/primaryConstructor/valid.txt
index 41d1dd422e8..5705c2654cf 100644
--- a/compiler/testData/psi/primaryConstructor/valid.txt
+++ b/compiler/testData/psi/primaryConstructor/valid.txt
@@ -1,4 +1,4 @@
-JetFile: valid.kt
+KtFile: valid.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt b/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
index 8b4605a7805..92be0ab7e40 100644
--- a/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
+++ b/compiler/testData/psi/propertyDelegate/BracketsInDelegate.txt
@@ -1,4 +1,4 @@
-JetFile: BracketsInDelegate.kt
+KtFile: BracketsInDelegate.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt b/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
index d52ee27103a..2e125c28aa7 100644
--- a/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
+++ b/compiler/testData/psi/propertyDelegate/DelegateAndInitializer.txt
@@ -1,4 +1,4 @@
-JetFile: DelegateAndInitializer.kt
+KtFile: DelegateAndInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt b/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
index e26c5dd9bae..0d489c529f6 100644
--- a/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
+++ b/compiler/testData/psi/propertyDelegate/GetterInSameLine.txt
@@ -1,4 +1,4 @@
-JetFile: GetterInSameLine.kt
+KtFile: GetterInSameLine.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/LocalProperty.txt b/compiler/testData/psi/propertyDelegate/LocalProperty.txt
index ddaa7a41566..41c522c6b8a 100644
--- a/compiler/testData/psi/propertyDelegate/LocalProperty.txt
+++ b/compiler/testData/psi/propertyDelegate/LocalProperty.txt
@@ -1,4 +1,4 @@
-JetFile: LocalProperty.kt
+KtFile: LocalProperty.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/OnlyBy.txt b/compiler/testData/psi/propertyDelegate/OnlyBy.txt
index af20eec4539..0564a5cb095 100644
--- a/compiler/testData/psi/propertyDelegate/OnlyBy.txt
+++ b/compiler/testData/psi/propertyDelegate/OnlyBy.txt
@@ -1,4 +1,4 @@
-JetFile: OnlyBy.kt
+KtFile: OnlyBy.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/PropertyInClass.txt b/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
index f544ff2971c..ed5f3e34ebe 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyInClass.txt
@@ -1,4 +1,4 @@
-JetFile: PropertyInClass.kt
+KtFile: PropertyInClass.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt b/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
index 0aaa0d91087..f3502ecc092 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithGetter.txt
@@ -1,4 +1,4 @@
-JetFile: PropertyWithGetter.kt
+KtFile: PropertyWithGetter.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt b/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
index 951f105c6bd..2abf5025294 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithInitializer.txt
@@ -1,4 +1,4 @@
-JetFile: PropertyWithInitializer.kt
+KtFile: PropertyWithInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt b/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
index 80356ace7dd..9b5a81e22cc 100644
--- a/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
+++ b/compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.txt
@@ -1,4 +1,4 @@
-JetFile: PropertyWithoutTypeRef.kt
+KtFile: PropertyWithoutTypeRef.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt b/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
index dbc161c89f5..3d0709b15e0 100644
--- a/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
+++ b/compiler/testData/psi/propertyDelegate/TopLevelProperty.txt
@@ -1,4 +1,4 @@
-JetFile: TopLevelProperty.kt
+KtFile: TopLevelProperty.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/propertyDelegate/TwoProperties.txt b/compiler/testData/psi/propertyDelegate/TwoProperties.txt
index 143e85cf750..df80035c1c7 100644
--- a/compiler/testData/psi/propertyDelegate/TwoProperties.txt
+++ b/compiler/testData/psi/propertyDelegate/TwoProperties.txt
@@ -1,4 +1,4 @@
-JetFile: TwoProperties.kt
+KtFile: TwoProperties.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/AbsentLeftHandSide.txt b/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
index 251b6a1b330..5d34204cf32 100644
--- a/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
+++ b/compiler/testData/psi/recovery/AbsentLeftHandSide.txt
@@ -1,4 +1,4 @@
-JetFile: AbsentLeftHandSide.kt
+KtFile: AbsentLeftHandSide.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/BareVal.txt b/compiler/testData/psi/recovery/BareVal.txt
index 4d3b2847f15..e4cbd77f0a2 100644
--- a/compiler/testData/psi/recovery/BareVal.txt
+++ b/compiler/testData/psi/recovery/BareVal.txt
@@ -1,4 +1,4 @@
-JetFile: BareVal.kt
+KtFile: BareVal.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt b/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
index 7ae7f3daf95..c362915af50 100644
--- a/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
+++ b/compiler/testData/psi/recovery/BrokenFunctionSuperType.txt
@@ -1,4 +1,4 @@
-JetFile: BrokenFunctionSuperType.kt
+KtFile: BrokenFunctionSuperType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/CatchKeywordRBrace.txt b/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
index a939038b4c4..35375f68576 100644
--- a/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
+++ b/compiler/testData/psi/recovery/CatchKeywordRBrace.txt
@@ -1,4 +1,4 @@
-JetFile: CatchKeywordRBrace.kt
+KtFile: CatchKeywordRBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt b/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
index 9cd3b5ccb2d..7fa714e0d14 100644
--- a/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
+++ b/compiler/testData/psi/recovery/CloseBraceAtTopLevel.txt
@@ -1,4 +1,4 @@
-JetFile: CloseBraceAtTopLevel.kt
+KtFile: CloseBraceAtTopLevel.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/DeclarationAfterDotSelectorExpected.txt b/compiler/testData/psi/recovery/DeclarationAfterDotSelectorExpected.txt
index 626cd998128..a489eccd265 100644
--- a/compiler/testData/psi/recovery/DeclarationAfterDotSelectorExpected.txt
+++ b/compiler/testData/psi/recovery/DeclarationAfterDotSelectorExpected.txt
@@ -1,4 +1,4 @@
-JetFile: DeclarationAfterDotSelectorExpected.kt
+KtFile: DeclarationAfterDotSelectorExpected.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/DeclarationAfterIncompleteElvis.txt b/compiler/testData/psi/recovery/DeclarationAfterIncompleteElvis.txt
index b6171471643..90a4917e7fd 100644
--- a/compiler/testData/psi/recovery/DeclarationAfterIncompleteElvis.txt
+++ b/compiler/testData/psi/recovery/DeclarationAfterIncompleteElvis.txt
@@ -1,4 +1,4 @@
-JetFile: DeclarationAfterIncompleteElvis.kt
+KtFile: DeclarationAfterIncompleteElvis.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt b/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
index 054f9390dae..1b3ca3536e6 100644
--- a/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/DoWhileWithEmptyCondition.txt
@@ -1,4 +1,4 @@
-JetFile: DoWhileWithEmptyCondition.kt
+KtFile: DoWhileWithEmptyCondition.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt b/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
index 5410e6255c5..f868d6c00cd 100644
--- a/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/DoWhileWithoutLPar.txt
@@ -1,4 +1,4 @@
-JetFile: DoWhileWithoutLPar.kt
+KtFile: DoWhileWithoutLPar.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForEmptyParentheses.txt b/compiler/testData/psi/recovery/ForEmptyParentheses.txt
index 6dad0208367..ffb44070e2d 100644
--- a/compiler/testData/psi/recovery/ForEmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/ForEmptyParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: ForEmptyParentheses.kt
+KtFile: ForEmptyParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt b/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
index 02d867fed3a..40b54e5ce8b 100644
--- a/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
+++ b/compiler/testData/psi/recovery/ForEmptyWithoutBody.txt
@@ -1,4 +1,4 @@
-JetFile: ForEmptyWithoutBody.kt
+KtFile: ForEmptyWithoutBody.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt b/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
index ab1ef2bc306..33fbc92038e 100644
--- a/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
+++ b/compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.txt
@@ -1,4 +1,4 @@
-JetFile: ForNoBodyBeforeRBrace.kt
+KtFile: ForNoBodyBeforeRBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForRecovery.txt b/compiler/testData/psi/recovery/ForRecovery.txt
index c046783c363..653a3326641 100644
--- a/compiler/testData/psi/recovery/ForRecovery.txt
+++ b/compiler/testData/psi/recovery/ForRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: ForRecovery.kt
+KtFile: ForRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt b/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
index 8923c8c483a..f44049aeaac 100644
--- a/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithOnlyOneLParInEOF.kt
+KtFile: ForWithOnlyOneLParInEOF.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt b/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
index fc7c0507546..363489acfa4 100644
--- a/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithoutBodyInEOF.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithoutBodyInEOF.kt
+KtFile: ForWithoutBodyInEOF.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithoutLPar.txt b/compiler/testData/psi/recovery/ForWithoutLPar.txt
index b601ff5a022..c6f108f1f98 100644
--- a/compiler/testData/psi/recovery/ForWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/ForWithoutLPar.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithoutLPar.kt
+KtFile: ForWithoutLPar.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt b/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
index b90d6dd0c27..6a34a60d321 100644
--- a/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
+++ b/compiler/testData/psi/recovery/ForWithoutLParInEOF.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithoutLParInEOF.kt
+KtFile: ForWithoutLParInEOF.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt b/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
index 911bc3078f2..8cbc8ff6e6f 100644
--- a/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
+++ b/compiler/testData/psi/recovery/ForWithoutParamButWithRange.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithoutParamButWithRange.kt
+KtFile: ForWithoutParamButWithRange.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ForWithoutRange.txt b/compiler/testData/psi/recovery/ForWithoutRange.txt
index e091b423394..b1941bb2fb2 100644
--- a/compiler/testData/psi/recovery/ForWithoutRange.txt
+++ b/compiler/testData/psi/recovery/ForWithoutRange.txt
@@ -1,4 +1,4 @@
-JetFile: ForWithoutRange.kt
+KtFile: ForWithoutRange.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/FunFun.txt b/compiler/testData/psi/recovery/FunFun.txt
index 8a8a056d80e..96c27dfada0 100644
--- a/compiler/testData/psi/recovery/FunFun.txt
+++ b/compiler/testData/psi/recovery/FunFun.txt
@@ -1,4 +1,4 @@
-JetFile: FunFun.kt
+KtFile: FunFun.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IfKeywordRBrace.txt b/compiler/testData/psi/recovery/IfKeywordRBrace.txt
index 568100980e9..8e0cdf364e1 100644
--- a/compiler/testData/psi/recovery/IfKeywordRBrace.txt
+++ b/compiler/testData/psi/recovery/IfKeywordRBrace.txt
@@ -1,4 +1,4 @@
-JetFile: IfKeywordRBrace.kt
+KtFile: IfKeywordRBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IfWithEmptyCondition.txt b/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
index 1f8e62b9ffa..17f3309535d 100644
--- a/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/IfWithEmptyCondition.txt
@@ -1,4 +1,4 @@
-JetFile: IfWithEmptyCondition.kt
+KtFile: IfWithEmptyCondition.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IfWithoutLPar.txt b/compiler/testData/psi/recovery/IfWithoutLPar.txt
index 99afc7d668d..6f84ed4bf86 100644
--- a/compiler/testData/psi/recovery/IfWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/IfWithoutLPar.txt
@@ -1,4 +1,4 @@
-JetFile: IfWithoutLPar.kt
+KtFile: IfWithoutLPar.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ImportRecovery.txt b/compiler/testData/psi/recovery/ImportRecovery.txt
index da62f9ef9d0..8df6987bdc9 100644
--- a/compiler/testData/psi/recovery/ImportRecovery.txt
+++ b/compiler/testData/psi/recovery/ImportRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: ImportRecovery.kt
+KtFile: ImportRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteAccessor1.txt b/compiler/testData/psi/recovery/IncompleteAccessor1.txt
index 9d8e458b6dd..8c0b1aef1a3 100644
--- a/compiler/testData/psi/recovery/IncompleteAccessor1.txt
+++ b/compiler/testData/psi/recovery/IncompleteAccessor1.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteAccessor1.kt
+KtFile: IncompleteAccessor1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteAccessor2.txt b/compiler/testData/psi/recovery/IncompleteAccessor2.txt
index 1353b3b2a95..8631cfd1f0c 100644
--- a/compiler/testData/psi/recovery/IncompleteAccessor2.txt
+++ b/compiler/testData/psi/recovery/IncompleteAccessor2.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteAccessor2.kt
+KtFile: IncompleteAccessor2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt b/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
index ffba96ffffd..9e8836485a3 100644
--- a/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
+++ b/compiler/testData/psi/recovery/IncompleteClassDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteClassDeclaration.kt
+KtFile: IncompleteClassDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
index 9391d552768..47df10ed123 100644
--- a/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteClassTypeParameters.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteClassTypeParameters.kt
+KtFile: IncompleteClassTypeParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteForRBrace.txt b/compiler/testData/psi/recovery/IncompleteForRBrace.txt
index 5ed463292f6..8e92974a4f0 100644
--- a/compiler/testData/psi/recovery/IncompleteForRBrace.txt
+++ b/compiler/testData/psi/recovery/IncompleteForRBrace.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteForRBrace.kt
+KtFile: IncompleteForRBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteFun.txt b/compiler/testData/psi/recovery/IncompleteFun.txt
index b652aa0e6d8..615f3156ef8 100644
--- a/compiler/testData/psi/recovery/IncompleteFun.txt
+++ b/compiler/testData/psi/recovery/IncompleteFun.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteFun.kt
+KtFile: IncompleteFun.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt b/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
index b8658a2ae5a..6297a7f782f 100644
--- a/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
+++ b/compiler/testData/psi/recovery/IncompleteFunDeclaration.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteFunDeclaration.kt
+KtFile: IncompleteFunDeclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
index eefac5eff20..40e37261151 100644
--- a/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteFunTypeParameters.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteFunTypeParameters.kt
+KtFile: IncompleteFunTypeParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
index 8dd6a12cd0f..dd82489f98b 100644
--- a/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteTypeParameters.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteTypeParameters.kt
+KtFile: IncompleteTypeParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt b/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
index ef5a26fb8f7..1f8d13d3a88 100644
--- a/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
+++ b/compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteTypeRefWithPackageKeyword.kt
+KtFile: IncompleteTypeRefWithPackageKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt b/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
index 44b8e33df89..5deff0e503b 100644
--- a/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
+++ b/compiler/testData/psi/recovery/IncompleteValTypeParameters.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteValTypeParameters.kt
+KtFile: IncompleteValTypeParameters.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteWhenElse.txt b/compiler/testData/psi/recovery/IncompleteWhenElse.txt
index 4a60d136580..7139f84ef60 100644
--- a/compiler/testData/psi/recovery/IncompleteWhenElse.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhenElse.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteWhenElse.kt
+KtFile: IncompleteWhenElse.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteWhere.txt b/compiler/testData/psi/recovery/IncompleteWhere.txt
index ffbbdb52314..e973e4d37a5 100644
--- a/compiler/testData/psi/recovery/IncompleteWhere.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhere.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteWhere.kt
+KtFile: IncompleteWhere.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/IncompleteWhere2.txt b/compiler/testData/psi/recovery/IncompleteWhere2.txt
index ddb01e1f61d..8bb5f2564ac 100644
--- a/compiler/testData/psi/recovery/IncompleteWhere2.txt
+++ b/compiler/testData/psi/recovery/IncompleteWhere2.txt
@@ -1,4 +1,4 @@
-JetFile: IncompleteWhere2.kt
+KtFile: IncompleteWhere2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/InterfaceInExpressionPosition.txt b/compiler/testData/psi/recovery/InterfaceInExpressionPosition.txt
index 680727199ed..2adb7a1921d 100644
--- a/compiler/testData/psi/recovery/InterfaceInExpressionPosition.txt
+++ b/compiler/testData/psi/recovery/InterfaceInExpressionPosition.txt
@@ -1,4 +1,4 @@
-JetFile: InterfaceInExpressionPosition.kt
+KtFile: InterfaceInExpressionPosition.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt b/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
index f07b8913739..bd0f2516b91 100644
--- a/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
+++ b/compiler/testData/psi/recovery/InvalidCharAfterPropertyName.txt
@@ -1,4 +1,4 @@
-JetFile: InvalidCharAfterPropertyName.kt
+KtFile: InvalidCharAfterPropertyName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt b/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
index b4cc9668733..1b5b99d9e6d 100644
--- a/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
+++ b/compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.txt
@@ -1,4 +1,4 @@
-JetFile: InvalidCharInSingleLineLambda.kt
+KtFile: InvalidCharInSingleLineLambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt b/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
index e9629ede51e..9527ed5a68b 100644
--- a/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt
@@ -1,4 +1,4 @@
-JetFile: MissingCommaInConstructorValueParameterList.kt
+KtFile: MissingCommaInConstructorValueParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt b/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
index 82bee33e309..2930ae78c87 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueArgumentList.txt
@@ -1,4 +1,4 @@
-JetFile: MissingCommaInValueArgumentList.kt
+KtFile: MissingCommaInValueArgumentList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt b/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
index 8bf45839d69..dcf0381ddbf 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueParameterList.txt
@@ -1,4 +1,4 @@
-JetFile: MissingCommaInValueParameterList.kt
+KtFile: MissingCommaInValueParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt b/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
index a8f8fcc5730..7c1f8726304 100644
--- a/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
+++ b/compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt
@@ -1,4 +1,4 @@
-JetFile: MissingCommaInValueParameterListWithValOrVar.kt
+KtFile: MissingCommaInValueParameterListWithValOrVar.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/NoArrowInWhen.txt b/compiler/testData/psi/recovery/NoArrowInWhen.txt
index 95a972250bd..8ac6d0a0d90 100644
--- a/compiler/testData/psi/recovery/NoArrowInWhen.txt
+++ b/compiler/testData/psi/recovery/NoArrowInWhen.txt
@@ -1,4 +1,4 @@
-JetFile: NoArrowInWhen.kt
+KtFile: NoArrowInWhen.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/PackageNewLineRecovery.txt b/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
index 1e7d5329509..637e28957fa 100644
--- a/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
+++ b/compiler/testData/psi/recovery/PackageNewLineRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: PackageNewLineRecovery.kt
+KtFile: PackageNewLineRecovery.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/recovery/PackageRecovery.txt b/compiler/testData/psi/recovery/PackageRecovery.txt
index 67656c48920..ed6d90edfab 100644
--- a/compiler/testData/psi/recovery/PackageRecovery.txt
+++ b/compiler/testData/psi/recovery/PackageRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: PackageRecovery.kt
+KtFile: PackageRecovery.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
index 6a9d208238e..ed70507c360 100644
--- a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
+++ b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: SameLineStatementRecovery.kt
+KtFile: SameLineStatementRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ValNoName.txt b/compiler/testData/psi/recovery/ValNoName.txt
index d9601b5bba3..169b3892e45 100644
--- a/compiler/testData/psi/recovery/ValNoName.txt
+++ b/compiler/testData/psi/recovery/ValNoName.txt
@@ -1,4 +1,4 @@
-JetFile: ValNoName.kt
+KtFile: ValNoName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ValWithNoNameBeforeNextDeclarationWithModifiers.txt b/compiler/testData/psi/recovery/ValWithNoNameBeforeNextDeclarationWithModifiers.txt
index 231a1122cf7..c73b601569a 100644
--- a/compiler/testData/psi/recovery/ValWithNoNameBeforeNextDeclarationWithModifiers.txt
+++ b/compiler/testData/psi/recovery/ValWithNoNameBeforeNextDeclarationWithModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: ValWithNoNameBeforeNextDeclarationWithModifiers.kt
+KtFile: ValWithNoNameBeforeNextDeclarationWithModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ValWithNoNameInBlock.txt b/compiler/testData/psi/recovery/ValWithNoNameInBlock.txt
index 1f2e3d477a2..ec88c92af86 100644
--- a/compiler/testData/psi/recovery/ValWithNoNameInBlock.txt
+++ b/compiler/testData/psi/recovery/ValWithNoNameInBlock.txt
@@ -1,4 +1,4 @@
-JetFile: ValWithNoNameInBlock.kt
+KtFile: ValWithNoNameInBlock.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
index ed60ecb6dca..cf8c96f1086 100644
--- a/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
+++ b/compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: ValueParameterNoTypeRecovery.kt
+KtFile: ValueParameterNoTypeRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/WhenWithoutBraces.txt b/compiler/testData/psi/recovery/WhenWithoutBraces.txt
index 43b681a164e..fad104f883b 100644
--- a/compiler/testData/psi/recovery/WhenWithoutBraces.txt
+++ b/compiler/testData/psi/recovery/WhenWithoutBraces.txt
@@ -1,4 +1,4 @@
-JetFile: WhenWithoutBraces.kt
+KtFile: WhenWithoutBraces.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt b/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
index 57cb2e61772..4660e24dd76 100644
--- a/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
+++ b/compiler/testData/psi/recovery/WhileWithEmptyCondition.txt
@@ -1,4 +1,4 @@
-JetFile: WhileWithEmptyCondition.kt
+KtFile: WhileWithEmptyCondition.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/WhileWithoutLPar.txt b/compiler/testData/psi/recovery/WhileWithoutLPar.txt
index cf20a72f415..dda23724b7e 100644
--- a/compiler/testData/psi/recovery/WhileWithoutLPar.txt
+++ b/compiler/testData/psi/recovery/WhileWithoutLPar.txt
@@ -1,4 +1,4 @@
-JetFile: WhileWithoutLPar.kt
+KtFile: WhileWithoutLPar.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt b/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
index 09077c054bc..9fb3a6785a8 100644
--- a/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
+++ b/compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.txt
@@ -1,4 +1,4 @@
-JetFile: WithWithoutInAndMultideclaration.kt
+KtFile: WithWithoutInAndMultideclaration.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/initRecovery.txt b/compiler/testData/psi/recovery/initRecovery.txt
index bc83de351d7..f6aebc2e1dd 100644
--- a/compiler/testData/psi/recovery/initRecovery.txt
+++ b/compiler/testData/psi/recovery/initRecovery.txt
@@ -1,4 +1,4 @@
-JetFile: initRecovery.kt
+KtFile: initRecovery.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/kt2172.txt b/compiler/testData/psi/recovery/kt2172.txt
index a69d2cb93db..825f6bdd79f 100644
--- a/compiler/testData/psi/recovery/kt2172.txt
+++ b/compiler/testData/psi/recovery/kt2172.txt
@@ -1,4 +1,4 @@
-JetFile: kt2172.kt
+KtFile: kt2172.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/kt5102.txt b/compiler/testData/psi/recovery/kt5102.txt
index d78de9750ce..1759b993519 100644
--- a/compiler/testData/psi/recovery/kt5102.txt
+++ b/compiler/testData/psi/recovery/kt5102.txt
@@ -1,4 +1,4 @@
-JetFile: kt5102.kt
+KtFile: kt5102.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/lambdaExpressionInString_1.txt b/compiler/testData/psi/recovery/lambdaExpressionInString_1.txt
index 05306c3a48f..eff51446929 100644
--- a/compiler/testData/psi/recovery/lambdaExpressionInString_1.txt
+++ b/compiler/testData/psi/recovery/lambdaExpressionInString_1.txt
@@ -1,4 +1,4 @@
-JetFile: lambdaExpressionInString_1.kt
+KtFile: lambdaExpressionInString_1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/lambdaExpressionInString_2.txt b/compiler/testData/psi/recovery/lambdaExpressionInString_2.txt
index 36a5be6974e..04e78d49d2d 100644
--- a/compiler/testData/psi/recovery/lambdaExpressionInString_2.txt
+++ b/compiler/testData/psi/recovery/lambdaExpressionInString_2.txt
@@ -1,4 +1,4 @@
-JetFile: lambdaExpressionInString_2.kt
+KtFile: lambdaExpressionInString_2.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt b/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
index a299b055068..3549d552629 100644
--- a/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: ConstructorModifiers.kt
+KtFile: ConstructorModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
index dcd28193853..6ab3e9fb23a 100644
--- a/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: EmptyParentheses.kt
+KtFile: EmptyParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/Everything.txt b/compiler/testData/psi/recovery/objects/declarations/Everything.txt
index fe3e97a1253..b171835062b 100644
--- a/compiler/testData/psi/recovery/objects/declarations/Everything.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/Everything.txt
@@ -1,4 +1,4 @@
-JetFile: Everything.kt
+KtFile: Everything.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt b/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
index 4ba12df0cde..c84f3f90ee7 100644
--- a/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: FollowedByModifiers.kt
+KtFile: FollowedByModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
index e9efa3af329..ef3a151106b 100644
--- a/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: ParametersInParentheses.kt
+KtFile: ParametersInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt b/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
index 42fe84ddaad..7134e780336 100644
--- a/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: TypeParametersAndParentheses.kt
+KtFile: TypeParametersAndParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt b/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
index e69402f1507..c5921d422ed 100644
--- a/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/TypeParameterss.txt
@@ -1,4 +1,4 @@
-JetFile: TypeParameterss.kt
+KtFile: TypeParameterss.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/declarations/Where.txt b/compiler/testData/psi/recovery/objects/declarations/Where.txt
index c1d39c1e3fb..e5fe6ef3337 100644
--- a/compiler/testData/psi/recovery/objects/declarations/Where.txt
+++ b/compiler/testData/psi/recovery/objects/declarations/Where.txt
@@ -1,4 +1,4 @@
-JetFile: Where.kt
+KtFile: Where.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
index 98a45344878..d61eaf31614 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt
@@ -1,4 +1,4 @@
-JetFile: ConstructorModifiers.kt
+KtFile: ConstructorModifiers.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
index 4596f8de2d5..5ff28ab7b36 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt
@@ -1,4 +1,4 @@
-JetFile: ConstructorModifiersAndName.kt
+KtFile: ConstructorModifiersAndName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
index 554e25edb31..f56b9e6c186 100644
--- a/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: EmptyParentheses.kt
+KtFile: EmptyParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/Everything.txt b/compiler/testData/psi/recovery/objects/expressions/Everything.txt
index 5a96f5b6a58..178fe9d9cb3 100644
--- a/compiler/testData/psi/recovery/objects/expressions/Everything.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/Everything.txt
@@ -1,4 +1,4 @@
-JetFile: Everything.kt
+KtFile: Everything.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/InFunction.txt b/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
index 36038ca2ba1..2dde7d19ef5 100644
--- a/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/InFunction.txt
@@ -1,4 +1,4 @@
-JetFile: InFunction.kt
+KtFile: InFunction.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
index 24b3118dee3..7f0f0a3c293 100644
--- a/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: ParametersInParentheses.kt
+KtFile: ParametersInParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt b/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
index 252ba8a872f..8b30fb6d1e0 100644
--- a/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt
@@ -1,4 +1,4 @@
-JetFile: TypeParametersAndParentheses.kt
+KtFile: TypeParametersAndParentheses.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt b/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
index e86eed4d8ef..4ced3c06c49 100644
--- a/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt
@@ -1,4 +1,4 @@
-JetFile: TypeParameterss.kt
+KtFile: TypeParameterss.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/objects/expressions/Where.txt b/compiler/testData/psi/recovery/objects/expressions/Where.txt
index 42d5607180e..76732426d74 100644
--- a/compiler/testData/psi/recovery/objects/expressions/Where.txt
+++ b/compiler/testData/psi/recovery/objects/expressions/Where.txt
@@ -1,4 +1,4 @@
-JetFile: Where.kt
+KtFile: Where.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt b/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
index ad01d4bb370..29aa2972a79 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.txt
@@ -1,4 +1,4 @@
-JetFile: noQualifiedExpression.kt
+KtFile: noQualifiedExpression.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt b/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
index a8e944139ed..bf2cd758afa 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.txt
@@ -1,4 +1,4 @@
-JetFile: noSafeQualifiedExpression.kt
+KtFile: noSafeQualifiedExpression.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
index 19ee1a0143c..b13ee910b16 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.txt
@@ -1,4 +1,4 @@
-JetFile: qualifiedExpressionWithSelector.kt
+KtFile: qualifiedExpressionWithSelector.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
index e81bce2d967..206e8fa0685 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.txt
@@ -1,4 +1,4 @@
-JetFile: qualifiedExpressionWithoutSelector.kt
+KtFile: qualifiedExpressionWithoutSelector.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
index d15450745fc..e0ebd549806 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.txt
@@ -1,4 +1,4 @@
-JetFile: safeQualifiedExpressionWithSelector.kt
+KtFile: safeQualifiedExpressionWithSelector.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
index 615fb499185..6bd1992694e 100644
--- a/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
+++ b/compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.txt
@@ -1,4 +1,4 @@
-JetFile: safeQualifiedExpressionWithoutSelector.kt
+KtFile: safeQualifiedExpressionWithoutSelector.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
index 150841d4388..43cf154ddb1 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInFunction.txt
@@ -1,4 +1,4 @@
-JetFile: firstInFunction.kt
+KtFile: firstInFunction.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
index 9426fdd15bd..36686b4c6df 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.txt
@@ -1,4 +1,4 @@
-JetFile: firstInFunctionalType.kt
+KtFile: firstInFunctionalType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
index 09f339554e1..fbf5b8f9030 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInLambda.txt
@@ -1,4 +1,4 @@
-JetFile: firstInLambda.kt
+KtFile: firstInLambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
index da9f2e59dc3..fb8ada1c4c9 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: firstInPrimaryConstructor.kt
+KtFile: firstInPrimaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
index ec9e5bef11b..45c2b58a804 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: firstInSecondaryConstructor.kt
+KtFile: firstInSecondaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt b/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
index 95cc714e360..ed56cd0ce3e 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/firstInSetter.txt
@@ -1,4 +1,4 @@
-JetFile: firstInSetter.kt
+KtFile: firstInSetter.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
index c827bce32c4..745a2ec8c8f 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInFunction.txt
@@ -1,4 +1,4 @@
-JetFile: secondInFunction.kt
+KtFile: secondInFunction.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
index 7b0849cbbb2..0f54794a97a 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.txt
@@ -1,4 +1,4 @@
-JetFile: secondInFunctionalType.kt
+KtFile: secondInFunctionalType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
index ae5d592b7e1..3bf19e2e382 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInLambda.txt
@@ -1,4 +1,4 @@
-JetFile: secondInLambda.kt
+KtFile: secondInLambda.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
index 7886f6422d4..bda969036da 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: secondInPrimaryConstructor.kt
+KtFile: secondInPrimaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt b/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
index 2364d4feb76..fed17a4bcdd 100644
--- a/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
+++ b/compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.txt
@@ -1,4 +1,4 @@
-JetFile: secondInSecondaryConstructor.kt
+KtFile: secondInSecondaryConstructor.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/ComplexScript.txt b/compiler/testData/psi/script/ComplexScript.txt
index 2cd94ec14d8..bd93bc9228a 100644
--- a/compiler/testData/psi/script/ComplexScript.txt
+++ b/compiler/testData/psi/script/ComplexScript.txt
@@ -1,4 +1,4 @@
-JetFile: ComplexScript.kts
+KtFile: ComplexScript.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/Import.txt b/compiler/testData/psi/script/Import.txt
index e00c543a86e..3c150bfd50d 100644
--- a/compiler/testData/psi/script/Import.txt
+++ b/compiler/testData/psi/script/Import.txt
@@ -1,4 +1,4 @@
-JetFile: Import.kts
+KtFile: Import.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/Shebang.txt b/compiler/testData/psi/script/Shebang.txt
index 65670d56759..6be1ebb2185 100644
--- a/compiler/testData/psi/script/Shebang.txt
+++ b/compiler/testData/psi/script/Shebang.txt
@@ -1,4 +1,4 @@
-JetFile: Shebang.kts
+KtFile: Shebang.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/ShebangIncorrect.txt b/compiler/testData/psi/script/ShebangIncorrect.txt
index 498fcd71f83..ede49671c32 100644
--- a/compiler/testData/psi/script/ShebangIncorrect.txt
+++ b/compiler/testData/psi/script/ShebangIncorrect.txt
@@ -1,4 +1,4 @@
-JetFile: ShebangIncorrect.kts
+KtFile: ShebangIncorrect.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/SimpleScript.txt b/compiler/testData/psi/script/SimpleScript.txt
index b1cd7768bf0..7e01502a472 100644
--- a/compiler/testData/psi/script/SimpleScript.txt
+++ b/compiler/testData/psi/script/SimpleScript.txt
@@ -1,4 +1,4 @@
-JetFile: SimpleScript.kts
+KtFile: SimpleScript.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/manyAnnotationsOnFile.txt b/compiler/testData/psi/script/manyAnnotationsOnFile.txt
index 0ef543e85ce..7712ad559ae 100644
--- a/compiler/testData/psi/script/manyAnnotationsOnFile.txt
+++ b/compiler/testData/psi/script/manyAnnotationsOnFile.txt
@@ -1,4 +1,4 @@
-JetFile: manyAnnotationsOnFile.kts
+KtFile: manyAnnotationsOnFile.kts
   FILE_ANNOTATION_LIST
     ANNOTATION
       PsiElement(AT)('@')
diff --git a/compiler/testData/psi/script/topLevelPropertiesWithGetSet.txt b/compiler/testData/psi/script/topLevelPropertiesWithGetSet.txt
index 263a8045021..8c409f9daa3 100644
--- a/compiler/testData/psi/script/topLevelPropertiesWithGetSet.txt
+++ b/compiler/testData/psi/script/topLevelPropertiesWithGetSet.txt
@@ -1,4 +1,4 @@
-JetFile: topLevelPropertiesWithGetSet.kts
+KtFile: topLevelPropertiesWithGetSet.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/script/unexpectedSymbol.txt b/compiler/testData/psi/script/unexpectedSymbol.txt
index 8bcf4ecfe6f..d9c53550c29 100644
--- a/compiler/testData/psi/script/unexpectedSymbol.txt
+++ b/compiler/testData/psi/script/unexpectedSymbol.txt
@@ -1,4 +1,4 @@
-JetFile: unexpectedSymbol.kts
+KtFile: unexpectedSymbol.kts
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt b/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
index 56c092189f9..6aa213f3459 100644
--- a/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
+++ b/compiler/testData/psi/secondaryConstructors/anonymousInitializer.txt
@@ -1,4 +1,4 @@
-JetFile: anonymousInitializer.kt
+KtFile: anonymousInitializer.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/basic.txt b/compiler/testData/psi/secondaryConstructors/basic.txt
index 5dedddfc768..d16c2290d18 100644
--- a/compiler/testData/psi/secondaryConstructors/basic.txt
+++ b/compiler/testData/psi/secondaryConstructors/basic.txt
@@ -1,4 +1,4 @@
-JetFile: basic.kt
+KtFile: basic.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/emptyBody.txt b/compiler/testData/psi/secondaryConstructors/emptyBody.txt
index 9b006484f73..b7353a75bd6 100644
--- a/compiler/testData/psi/secondaryConstructors/emptyBody.txt
+++ b/compiler/testData/psi/secondaryConstructors/emptyBody.txt
@@ -1,4 +1,4 @@
-JetFile: emptyBody.kt
+KtFile: emptyBody.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/enumParsing.txt b/compiler/testData/psi/secondaryConstructors/enumParsing.txt
index 0bbb6e6b799..956b89fa6f6 100644
--- a/compiler/testData/psi/secondaryConstructors/enumParsing.txt
+++ b/compiler/testData/psi/secondaryConstructors/enumParsing.txt
@@ -1,4 +1,4 @@
-JetFile: enumParsing.kt
+KtFile: enumParsing.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt b/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
index 92dcd3cb130..bff937fb2c8 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryEmptyDelegationType.kt
+KtFile: recoveryEmptyDelegationType.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
index bc677fe7fca..2ac19a9ced0 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryJustConstructorKeyword.kt
+KtFile: recoveryJustConstructorKeyword.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
index 7a1d6f8520a..84d8de54aea 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryJustConstructorKeywordSameLineBrace.kt
+KtFile: recoveryJustConstructorKeywordSameLineBrace.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt b/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
index 40ed32026ca..8dfb5c404b1 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryNoDelegationCallAfterColon.kt
+KtFile: recoveryNoDelegationCallAfterColon.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt b/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
index cbb0554e8c8..ac455ca2f32 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryWithoutBodyWrongDelegationName.kt
+KtFile: recoveryWithoutBodyWrongDelegationName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt b/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
index ff1175ea156..11db915aede 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryWithoutParameterList.kt
+KtFile: recoveryWithoutParameterList.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt b/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
index b6de067b306..ad8624f203b 100644
--- a/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
+++ b/compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.txt
@@ -1,4 +1,4 @@
-JetFile: recoveryWrongDelegationName.kt
+KtFile: recoveryWrongDelegationName.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/testData/psi/semicolonBetweenDeclarations.txt b/compiler/testData/psi/semicolonBetweenDeclarations.txt
index cd0f3826120..75a35326f49 100644
--- a/compiler/testData/psi/semicolonBetweenDeclarations.txt
+++ b/compiler/testData/psi/semicolonBetweenDeclarations.txt
@@ -1,4 +1,4 @@
-JetFile: semicolonBetweenDeclarations.kt
+KtFile: semicolonBetweenDeclarations.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt b/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
index 49f153e6e71..9076aa499cc 100644
--- a/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
+++ b/compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
@@ -1,4 +1,4 @@
-JetFile: RawStringsWithManyQuotes.kt
+KtFile: RawStringsWithManyQuotes.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index 07eac486079..e3f389f1cae 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -533,7 +533,7 @@ private fun createFileForDebugger(codeFragment: KtCodeFragment,
 }
 
 private fun PsiElement.createKtFile(fileName: String, fileText: String): KtFile {
-    // Not using KtPsiFactory because we need a virtual file attached to the JetFile
+    // Not using KtPsiFactory because we need a virtual file attached to the KtFile
     val virtualFile = LightVirtualFile(fileName, KotlinLanguage.INSTANCE, fileText)
     virtualFile.charset = CharsetToolkit.UTF8_CHARSET
     val jetFile = (PsiFileFactory.getInstance(project) as PsiFileFactoryImpl)
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.log b/idea/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.log
index 6e749953a5b..7d032e524ba 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.log
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.log
@@ -1,7 +1,7 @@
 Resolved INSTANCE()
 Resolved INSTANCE()
-Searched imported static member PsiField:INSTANCE in [JetFile: javaInvokeWithStaticImport.0.kt]
-Searched imported static member PsiField:INSTANCE in [JetFile: javaInvokeWithStaticImport.1.kt]
+Searched imported static member PsiField:INSTANCE in [KtFile: javaInvokeWithStaticImport.0.kt]
+Searched imported static member PsiField:INSTANCE in [KtFile: javaInvokeWithStaticImport.1.kt]
 Searched references to JavaClassWI
 Searched references to JavaClassWI.Other
 Searched references to static INSTANCE in non-Java files by request JavaClassWI.*