JetNamespaceHeader → JetPackageDirective.

compiler/testData/psi/AnnotatedExpressions.txt

@@ -1,5 +1,5 @@
 JetFile: AnnotatedExpressions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/AnonymousInitializer.txt

@@ -1,5 +1,5 @@
 JetFile: AnonymousInitializer.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/AssertNotNull.txt

@@ -1,5 +1,5 @@
 JetFile: AssertNotNull.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Attributes.txt

@@ -1,5 +1,5 @@
 JetFile: Attributes.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/AttributesOnPatterns.txt

@@ -1,5 +1,5 @@
 JetFile: AttributesOnPatterns.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Attributes_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Attributes_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BabySteps.txt

@@ -1,5 +1,5 @@
 JetFile: BabySteps.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BabySteps_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: BabySteps_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/BlockCommentAtBeginningOfFile1.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile1.kt
   PsiComment(BLOCK_COMMENT)('/*')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile2.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile2.kt
   PsiComment(BLOCK_COMMENT)('/*\n/*')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile3.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile3.kt
   PsiComment(BLOCK_COMMENT)('/*\n\nfooo')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/BlockCommentAtBeginningOfFile4.txt

@@ -1,4 +1,4 @@
 JetFile: BlockCommentAtBeginningOfFile4.kt
   PsiComment(BLOCK_COMMENT)('/*\n\n/*foo*/\n\nasdfas')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/ByClauses.txt

@@ -1,5 +1,5 @@
 JetFile: ByClauses.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/CallWithManyClosures.txt

@@ -1,5 +1,5 @@
 JetFile: CallWithManyClosures.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/CallsInWhen.txt

@@ -1,5 +1,5 @@
 JetFile: CallsInWhen.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Constructors.txt

@@ -1,5 +1,5 @@
 JetFile: Constructors.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/ControlStructures.txt

@@ -1,5 +1,5 @@
 JetFile: ControlStructures.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/DoubleColon.txt

@@ -1,5 +1,5 @@
 JetFile: DoubleColon.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EOLsInComments.txt

@@ -1,5 +1,5 @@
 JetFile: EOLsInComments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EOLsOnRollback.txt

@@ -1,5 +1,5 @@
 JetFile: EOLsOnRollback.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/EmptyFile.txt

@@ -1,3 +1,3 @@
 JetFile: EmptyFile.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>

compiler/testData/psi/Enums.txt

@@ -1,5 +1,5 @@
 JetFile: Enums.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Expressions_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Expressions_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ExtensionsWithQNReceiver.txt

@@ -1,5 +1,5 @@
 JetFile: ExtensionsWithQNReceiver.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/FileStart_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FileStart_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(DIV)('/')

compiler/testData/psi/FloatingPointLiteral.txt

@@ -1,5 +1,5 @@
 JetFile: FloatingPointLiteral.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ForWithMultiDecl.txt

@@ -1,5 +1,5 @@
 JetFile: ForWithMultiDecl.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionCalls.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionCalls.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionLiterals.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionLiterals.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionLiterals_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionLiterals_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/FunctionNoParameterList.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionNoParameterList.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/FunctionTypes.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionTypes.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/FunctionTypes_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionTypes_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/Functions.txt

@@ -1,5 +1,5 @@
 JetFile: Functions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Functions_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Functions_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/HangOnLonelyModifier.txt

@@ -1,5 +1,5 @@
 JetFile: HangOnLonelyModifier.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/IfWithPropery.txt

@@ -1,5 +1,5 @@
 JetFile: IfWithPropery.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/ImportSoftKW.txt

@@ -1,5 +1,5 @@
 JetFile: ImportSoftKW.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
     IMPORT_DIRECTIVE

compiler/testData/psi/Imports.txt

@@ -1,5 +1,5 @@
 JetFile: Imports.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/Imports_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Imports_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/Inner.txt

@@ -1,5 +1,5 @@
 JetFile: Inner.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/IntegerLiteral.txt

@@ -1,5 +1,5 @@
 JetFile: IntegerLiteral.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/Labels.txt

@@ -1,5 +1,5 @@
 JetFile: Labels.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/LocalDeclarations.txt

@@ -1,5 +1,5 @@
 JetFile: LocalDeclarations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ModifierAsSelector.txt

@@ -1,7 +1,7 @@
 JetFile: ModifierAsSelector.kt
   PsiComment(EOL_COMMENT)('// JET-1')
   PsiWhiteSpace('\n\n')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/MultiVariableDeclarations.txt

@@ -1,5 +1,5 @@
 JetFile: MultiVariableDeclarations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NamespaceBlockFirst.txt

@@ -1,5 +1,5 @@
 JetFile: NamespaceBlockFirst.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')

compiler/testData/psi/NamespaceModifiers.txt

@@ -1,5 +1,5 @@
 JetFile: NamespaceModifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     MODIFIER_LIST
       PsiElement(public)('public')
       PsiWhiteSpace(' ')

compiler/testData/psi/NestedComments.txt

@@ -1,5 +1,5 @@
 JetFile: NestedComments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NewLinesValidOperations.txt

@@ -1,5 +1,5 @@
 JetFile: NewLinesValidOperations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NewlinesInParentheses.txt

@@ -1,5 +1,5 @@
 JetFile: NewlinesInParentheses.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/NotIsAndNotIn.txt

@@ -1,5 +1,5 @@
 JetFile: NotIsAndNotIn.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ObjectLiteralAsStatement.txt

@@ -1,5 +1,5 @@
 JetFile: ObjectLiteralAsStatement.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ParameterNameMising.txt

@@ -1,5 +1,5 @@
 JetFile: ParameterNameMising.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Precedence.txt

@@ -1,5 +1,5 @@
 JetFile: Precedence.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: PrimaryConstructorModifiers_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/Properties.txt

@@ -1,5 +1,5 @@
 JetFile: Properties.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/PropertiesFollowedByInitializers.txt

@@ -1,5 +1,5 @@
 JetFile: PropertiesFollowedByInitializers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/Properties_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: Properties_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(var)('var')

compiler/testData/psi/QuotedIdentifiers.txt

@@ -1,5 +1,5 @@
 JetFile: QuotedIdentifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     MODIFIER_LIST

compiler/testData/psi/RootNamespace.txt

@@ -1,5 +1,5 @@
 JetFile: RootNamespace.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SemicolonAfterIf.txt

@@ -1,5 +1,5 @@
 JetFile: SemicolonAfterIf.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ShortAnnotations.txt

@@ -1,5 +1,5 @@
 JetFile: ShortAnnotations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     MODIFIER_LIST
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE

compiler/testData/psi/SimpleClassMembers.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleClassMembers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/SimpleClassMembers_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleClassMembers_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/SimpleExpressions.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleExpressions.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/SimpleModifiers.txt

@@ -1,5 +1,5 @@
 JetFile: SimpleModifiers.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SoftKeywords.txt

@@ -1,5 +1,5 @@
 JetFile: SoftKeywords.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/SoftKeywordsInTypeArguments.txt

@@ -1,5 +1,5 @@
 JetFile: SoftKeywordsInTypeArguments.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/StringTemplates.txt

@@ -1,5 +1,5 @@
 JetFile: StringTemplates.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/Super.txt

@@ -1,7 +1,7 @@
 JetFile: Super.kt
   PsiComment(EOL_COMMENT)('// KT-156 Fix the this<Super> syntax')
   PsiWhiteSpace('\n')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/ThisType.txt

@@ -1,5 +1,5 @@
 JetFile: ThisType.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TryRecovery.txt

@@ -1,5 +1,5 @@
 JetFile: TryRecovery.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/TypeAnnotations.txt

@@ -1,5 +1,5 @@
 JetFile: TypeAnnotations.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TypeConstraints.txt

@@ -1,5 +1,5 @@
 JetFile: TypeConstraints.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/TypeDef.txt

@@ -1,5 +1,5 @@
 JetFile: TypeDef.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
     REFERENCE_EXPRESSION

compiler/testData/psi/TypeDef_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: TypeDef_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/TypeExpressionAmbiguities_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: TypeExpressionAmbiguities_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/TypeParametersBeforeName.txt

@@ -1,5 +1,5 @@
 JetFile: TypeParametersBeforeName.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/When.txt

@@ -1,5 +1,5 @@
 JetFile: When.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/When_ERR.txt

@@ -1,5 +1,5 @@
 JetFile: When_ERR.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/AnonymousObjects.txt

@@ -1,5 +1,5 @@
 JetFile: AnonymousObjects.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/BinaryTree.txt

@@ -1,5 +1,5 @@
 JetFile: BinaryTree.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/BitArith.txt

@@ -1,5 +1,5 @@
 JetFile: BitArith.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/Builder.txt

@@ -1,5 +1,5 @@
 JetFile: Builder.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   PROPERTY
     PsiElement(val)('val')

compiler/testData/psi/examples/Color.txt

@@ -1,5 +1,5 @@
 JetFile: Color.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/examples/FunctionsAndTypes.txt

@@ -1,5 +1,5 @@
 JetFile: FunctionsAndTypes.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   TYPEDEF
     PsiElement(type)('type')

compiler/testData/psi/examples/Graph.txt

@@ -1,5 +1,5 @@
 JetFile: Graph.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/IPushPop.txt

@@ -1,5 +1,5 @@
 JetFile: IPushPop.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/examples/LINQ.txt

@@ -1,5 +1,5 @@
 JetFile: LINQ.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     PsiElement(fun)('fun')

compiler/testData/psi/examples/PolymorphicClassObjects.txt

@@ -1,5 +1,5 @@
 JetFile: PolymorphicClassObjects.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/examples/Queue.txt

@@ -1,5 +1,5 @@
 JetFile: Queue.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/Stack.txt

@@ -1,5 +1,5 @@
 JetFile: Stack.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/UnionFind.txt

@@ -1,5 +1,5 @@
 JetFile: UnionFind.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/UpdateOperation.txt

@@ -1,5 +1,5 @@
 JetFile: UpdateOperation.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/With.txt

@@ -1,5 +1,5 @@
 JetFile: With.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   FUN
     MODIFIER_LIST

compiler/testData/psi/examples/array/MutableArray.txt

@@ -6,7 +6,7 @@ JetFile: MutableArray.kt
     PsiWhiteSpace('\n')
     PsiElement(KDOC_END)('*/')
   PsiWhiteSpace('\n\n')
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/examples/collections/ArrayList.txt

@@ -1,5 +1,5 @@
 JetFile: ArrayList.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     PsiElement(class)('class')

compiler/testData/psi/examples/collections/HashMap.txt

@@ -1,5 +1,5 @@
 JetFile: HashMap.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST

compiler/testData/psi/examples/collections/IIterable.txt

@@ -1,5 +1,5 @@
 JetFile: IIterable.kt
-  NAMESPACE_HEADER
+  PACKAGE_DIRECTIVE
     <empty list>
   CLASS
     MODIFIER_LIST