diff --git a/compiler/testData/psi/FileStart_ERR.txt b/compiler/testData/psi/FileStart_ERR.txt
index 5730db1fdf6..fe469cd014b 100644
--- a/compiler/testData/psi/FileStart_ERR.txt
+++ b/compiler/testData/psi/FileStart_ERR.txt
@@ -1,9 +1,9 @@
 JetFile: FileStart_ERR.jet
   NAMESPACE_HEADER
     <empty list>
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(DIV)('/')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
@@ -31,5 +31,5 @@ JetFile: FileStart_ERR.jet
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     <empty list>
\ No newline at end of file
diff --git a/compiler/testData/psi/Imports_ERR.txt b/compiler/testData/psi/Imports_ERR.txt
index 6f880181140..9406df03bb6 100644
--- a/compiler/testData/psi/Imports_ERR.txt
+++ b/compiler/testData/psi/Imports_ERR.txt
@@ -31,7 +31,7 @@ JetFile: Imports_ERR.jet
     REFERENCE_EXPRESSION
       PsiErrorElement:Expecting qualified name
         <empty list>
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(MUL)('*')
   PsiWhiteSpace('\n')
   IMPORT_DIRECTIVE
@@ -125,7 +125,7 @@ JetFile: Imports_ERR.jet
             PsiErrorElement:Expecting type name
               PsiElement(MUL)('*')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(as)('as')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
@@ -158,7 +158,7 @@ JetFile: Imports_ERR.jet
             PsiErrorElement:Expecting type name
               PsiElement(MUL)('*')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(as)('as')
   PsiWhiteSpace('\n\n')
   IMPORT_DIRECTIVE
diff --git a/compiler/testData/psi/NamespaceBlockFirst.txt b/compiler/testData/psi/NamespaceBlockFirst.txt
index c60803e634b..ee2e8d110aa 100644
--- a/compiler/testData/psi/NamespaceBlockFirst.txt
+++ b/compiler/testData/psi/NamespaceBlockFirst.txt
@@ -1,7 +1,7 @@
 JetFile: NamespaceBlockFirst.jet
   NAMESPACE_HEADER
     <empty list>
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
@@ -12,7 +12,7 @@ JetFile: NamespaceBlockFirst.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foobar')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LBRACE)('{')
   PsiWhiteSpace('\n  ')
   PROPERTY
@@ -39,5 +39,5 @@ JetFile: NamespaceBlockFirst.jet
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('a')
   PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/testData/psi/Properties_ERR.txt b/compiler/testData/psi/Properties_ERR.txt
index ac727cd3088..f15af5049e5 100644
--- a/compiler/testData/psi/Properties_ERR.txt
+++ b/compiler/testData/psi/Properties_ERR.txt
@@ -119,22 +119,22 @@ JetFile: Properties_ERR.jet
   MODIFIER_LIST
     PsiElement(public)('public')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RPAR)(')')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n   ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RPAR)(')')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(EQ)('=')
   PsiWhiteSpace(' ')
   PROPERTY
diff --git a/compiler/testData/psi/RootNamespace.txt b/compiler/testData/psi/RootNamespace.txt
index 70d461713cc..71de1d19f32 100644
--- a/compiler/testData/psi/RootNamespace.txt
+++ b/compiler/testData/psi/RootNamespace.txt
@@ -16,7 +16,7 @@ JetFile: RootNamespace.jet
     PsiWhiteSpace('\n\n')
     TYPE_PARAMETER_LIST
       <empty list>
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
@@ -31,7 +31,7 @@ JetFile: RootNamespace.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LBRACE)('{')
   PsiWhiteSpace('\n  ')
   FUN
@@ -130,5 +130,5 @@ JetFile: RootNamespace.jet
       PsiWhiteSpace('\n  ')
       PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
index fd200c73574..d1da2d361c7 100644
--- a/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
+++ b/compiler/testData/psi/greatSyntacticShift/functionTypes.txt
@@ -13,7 +13,7 @@ JetFile: functionTypes.jet
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n\n')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(package)('package')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
@@ -24,7 +24,7 @@ JetFile: functionTypes.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('n')
   PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(LBRACE)('{')
   PsiWhiteSpace('\n  ')
   CLASS
@@ -34,7 +34,7 @@ JetFile: functionTypes.jet
     PsiWhiteSpace('\n')
     TYPE_PARAMETER_LIST
       <empty list>
-  PsiErrorElement:Expecting namespace or top level declaration
+  PsiErrorElement:Expecting package directive or top level declaration
     PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
   CLASS