Got rid of "namespace" word in test data.

compiler/testData/diagnostics/tests/Abstract.kt

@@ -1,5 +1,5 @@
 // FILE: b.kt
-package MyNamespace
+package MyPackage
     //properties
     <!MUST_BE_INITIALIZED!>val a: Int<!>
     val a1: Int = 1

compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.kt

@@ -31,7 +31,7 @@ fun Any?.vars(<!UNUSED_PARAMETER!>a<!>: Any?) : Int {
     if (example.ns.y is Int) {
         b = <!UNUSED_VALUE, DEBUG_INFO_AUTOCAST!>example.ns.y<!>
     }
-//    if (namespace.bottles.ns.y is Int) {
+//    if (package.bottles.ns.y is Int) {
 //        b = ns.y
 //    }
     if (Obj.y is Int) {

compiler/testData/diagnostics/tests/DelegationAndOverriding.kt

@@ -1,4 +1,4 @@
-//namespace override
+package override
 
 trait T {
     fun foo()

compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt

@@ -107,7 +107,7 @@ class TestBackingFieldsVisibility() {
         <!INACCESSIBLE_BACKING_FIELD!>a.$a<!> = 3
     }
 
-    val x = <!INACCESSIBLE_BACKING_FIELD!>$namespaceLevelVar<!>
+    val x = <!INACCESSIBLE_BACKING_FIELD!>$topLevelVar<!>
 
     inner class Inner() {
         val z = this@TestBackingFieldsVisibility.$x
@@ -117,7 +117,7 @@ class TestBackingFieldsVisibility() {
     get() = $w //test there is no second error here
 }
 
-val namespaceLevelVar = 11
+val topLevelVar = 11
 
 class T() {
     val z : Int get() = 42

compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.kt

@@ -1,13 +1,13 @@
-// FILE: ns1.kt
-// check no error in overload in different namespaces
+// FILE: pkg1.kt
+// check no error in overload in different packages
 
-package ns1
+package pkg1
 fun e() = 1
 
-// FILE: ns2.kt
-package ns2
+// FILE: pkg2.kt
+package pkg2
 fun e() = 1
 
-// FILE: ns3ns1.kt
-package ns3.ns1
+// FILE: pkg3pkg1.kt
+package pkg3.pkg1
 fun e() = 1

compiler/testData/diagnostics/tests/regressions/kt328.kt

@@ -14,7 +14,7 @@ class A() {
     val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
 }
 
-//in a namespace
+//in a package
 val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
 
 //KT-787 AssertionError on code 'val x = x'

compiler/testData/psi/PackageBlockFirst.txt

@@ -1,4 +1,4 @@
-JetFile: NamespaceBlockFirst.kt
+JetFile: PackageBlockFirst.kt
   PACKAGE_DIRECTIVE
     <empty list>
   PsiErrorElement:Expecting package directive or top level declaration

compiler/testData/psi/PackageModifiers.txt

@@ -1,4 +1,4 @@
-JetFile: NamespaceModifiers.kt
+JetFile: PackageModifiers.kt
   PACKAGE_DIRECTIVE
     MODIFIER_LIST
       PsiElement(public)('public')

compiler/testData/psi/QuotedIdentifiers.kt

@@ -1,4 +1,4 @@
-[`return`] fun `namespace`() {
+[`return`] fun `package`() {
   `class`()
 }
 

compiler/testData/psi/QuotedIdentifiers.txt

@@ -15,7 +15,7 @@ JetFile: QuotedIdentifiers.kt
     PsiWhiteSpace(' ')
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`namespace`')
+    PsiElement(IDENTIFIER)('`package`')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
       PsiElement(RPAR)(')')

compiler/testData/psi/greatSyntacticShift/functionTypes.kt

@@ -6,7 +6,7 @@ package n {
 }
 abstract class XXX() {
     abstract val a : Int
-    abstract val a1 : namespace.Int
+    abstract val a1 : package.Int
     abstract val a2 : n.B
     abstract val a3 : (A)
     abstract val a31 : (n.B)

compiler/testData/psi/greatSyntacticShift/functionTypes.txt

@@ -74,9 +74,7 @@ JetFile: functionTypes.kt
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('namespace')
+            PsiElement(package)('package')
             PsiElement(DOT)('.')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')