diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 21733ddf7b9..6dcb560d88c 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -67,7 +67,6 @@ public class Converter {
   public static File fileToFileWithCompatibilityImport(@NotNull PsiJavaFile javaFile) {
     final PsiImportList importList = javaFile.getImportList();
     List<Import> imports = importList == null ? Collections.<Import>emptyList() : importsToImportList(importList.getAllImportStatements());
-    imports.add(new Import("std.*"));
     imports.add(new Import("std.compatibility.*"));
     return new File(quoteKeywords(javaFile.getPackageName()), imports, classesToClassList(javaFile.getClasses()));
   }
diff --git a/src/org/jetbrains/jet/j2k/ast/File.java b/src/org/jetbrains/jet/j2k/ast/File.java
index d65a1605cbe..d599ec8ab4b 100644
--- a/src/org/jetbrains/jet/j2k/ast/File.java
+++ b/src/org/jetbrains/jet/j2k/ast/File.java
@@ -25,7 +25,7 @@ public class File extends Node {
     final String common = AstUtil.joinNodes(myImports, N) + N2 + AstUtil.joinNodes(myClasses, N) + N;
     if (myPackageName.isEmpty())
       return common;
-    return "namespace" + SPACE + myPackageName + N +
+    return "package" + SPACE + myPackageName + N +
       common;
   }
 }
diff --git a/testData/ast/annotations/file/jetbrainsNotNull.kt b/testData/ast/annotations/file/jetbrainsNotNull.kt
index ebf15859e15..9213f5f8e4f 100644
--- a/testData/ast/annotations/file/jetbrainsNotNull.kt
+++ b/testData/ast/annotations/file/jetbrainsNotNull.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 public open class Test(str : String) {
 {
 myStr = str
diff --git a/testData/ast/boxedType/file/kt-671.kt b/testData/ast/boxedType/file/kt-671.kt
index a8da231e104..11419363e4b 100644
--- a/testData/ast/boxedType/file/kt-671.kt
+++ b/testData/ast/boxedType/file/kt-671.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun test() : Unit {
 var i : Int? = Integer.valueOf(100)
diff --git a/testData/ast/class/file/kt-639.kt b/testData/ast/class/file/kt-639.kt
index 3ec7dd90e23..3164965fa1f 100644
--- a/testData/ast/class/file/kt-639.kt
+++ b/testData/ast/class/file/kt-639.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 import java.util.HashMap
 open class Test() {
 class object {
diff --git a/testData/ast/constructors/file/customerBuilder.kt b/testData/ast/constructors/file/customerBuilder.kt
index ab1461ed191..efad343539a 100644
--- a/testData/ast/constructors/file/customerBuilder.kt
+++ b/testData/ast/constructors/file/customerBuilder.kt
@@ -1,4 +1,4 @@
-namespace org.test.customer
+package org.test.customer
 open class Customer(first : String?, last : String?) {
 {
 doSmthBefore()
diff --git a/testData/ast/enum/class/colorEnum.kt b/testData/ast/enum/class/colorEnum.kt
index 694128a9518..af42b240e68 100644
--- a/testData/ast/enum/class/colorEnum.kt
+++ b/testData/ast/enum/class/colorEnum.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 enum class MyEnum(_color : Int) {
 {
 color = _color
diff --git a/testData/ast/enum/class/primaryPrivateConstructor.kt b/testData/ast/enum/class/primaryPrivateConstructor.kt
index d869ad519c1..37be650dc19 100644
--- a/testData/ast/enum/class/primaryPrivateConstructor.kt
+++ b/testData/ast/enum/class/primaryPrivateConstructor.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 enum class Color(c : Int) {
 {
 code = c
diff --git a/testData/ast/file/comp/intNullability.kt b/testData/ast/file/comp/intNullability.kt
index eb097e14e50..9b798908ee1 100644
--- a/testData/ast/file/comp/intNullability.kt
+++ b/testData/ast/file/comp/intNullability.kt
@@ -1,5 +1,4 @@
-namespace demo
-import std.*
+package demo
 import std.compatibility.*
 open class Test() {
 open fun test() : Unit {
diff --git a/testData/ast/file/file/packageWithClass.kt b/testData/ast/file/file/packageWithClass.kt
index 8b169b30b42..3f205654c0b 100644
--- a/testData/ast/file/file/packageWithClass.kt
+++ b/testData/ast/file/file/packageWithClass.kt
@@ -1,3 +1,3 @@
-namespace test
+package test
 class C() {
 }
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithImports.kt b/testData/ast/file/file/packageWithImports.kt
index 076ff7373a9..d646d02ccc0 100644
--- a/testData/ast/file/file/packageWithImports.kt
+++ b/testData/ast/file/file/packageWithImports.kt
@@ -1,3 +1,3 @@
-namespace test
+package test
 import ast
 import ast2
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithMixedImports.kt b/testData/ast/file/file/packageWithMixedImports.kt
index 076ff7373a9..d646d02ccc0 100644
--- a/testData/ast/file/file/packageWithMixedImports.kt
+++ b/testData/ast/file/file/packageWithMixedImports.kt
@@ -1,3 +1,3 @@
-namespace test
+package test
 import ast
 import ast2
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithOpenClass.kt b/testData/ast/file/file/packageWithOpenClass.kt
index 37c1f1c767f..d4336ffcc51 100644
--- a/testData/ast/file/file/packageWithOpenClass.kt
+++ b/testData/ast/file/file/packageWithOpenClass.kt
@@ -1,3 +1,3 @@
-namespace test
+package test
 open class C() {
 }
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithStaticImports.kt b/testData/ast/file/file/packageWithStaticImports.kt
index 076ff7373a9..d646d02ccc0 100644
--- a/testData/ast/file/file/packageWithStaticImports.kt
+++ b/testData/ast/file/file/packageWithStaticImports.kt
@@ -1,3 +1,3 @@
-namespace test
+package test
 import ast
 import ast2
\ No newline at end of file
diff --git a/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
index f1893768f30..eea76d734e4 100644
--- a/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
+++ b/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 open class Test() : Base() {
 override public fun hashCode() : Int {
 return super.hashCode()
diff --git a/testData/ast/function/file/functionInFinalClass.kt b/testData/ast/function/file/functionInFinalClass.kt
index 507b84ba7d4..def36e1f8de 100644
--- a/testData/ast/function/file/functionInFinalClass.kt
+++ b/testData/ast/function/file/functionInFinalClass.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 class Final() {
 fun test() : Unit {
 }
diff --git a/testData/ast/function/file/overrideObject.kt b/testData/ast/function/file/overrideObject.kt
index 658174be178..cdbb7783005 100644
--- a/testData/ast/function/file/overrideObject.kt
+++ b/testData/ast/function/file/overrideObject.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 open class Test() {
 open public fun hashCode() : Int {
 return System.identityHashCode(this)
diff --git a/testData/ast/function/file/varVararg.kt b/testData/ast/function/file/varVararg.kt
index a32417ad75b..6d364141a95 100644
--- a/testData/ast/function/file/varVararg.kt
+++ b/testData/ast/function/file/varVararg.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun test(vararg var args : Any?) : Unit {
 args = array<Int?>(1, 2, 3)
diff --git a/testData/ast/function/file/writableParameter.kt b/testData/ast/function/file/writableParameter.kt
index 8dcff305936..645403e2035 100644
--- a/testData/ast/function/file/writableParameter.kt
+++ b/testData/ast/function/file/writableParameter.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun test(var i : Int) : Int {
 i = 10
diff --git a/testData/ast/importStatement/file/importWithKeywords.kt b/testData/ast/importStatement/file/importWithKeywords.kt
index f5babdc556c..b9370c9adf9 100644
--- a/testData/ast/importStatement/file/importWithKeywords.kt
+++ b/testData/ast/importStatement/file/importWithKeywords.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 import `namespace`.`as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
 open class Test() {
 }
\ No newline at end of file
diff --git a/testData/ast/importStatement/file/importWithStar.kt b/testData/ast/importStatement/file/importWithStar.kt
index ad30b8594cb..c390c539acc 100644
--- a/testData/ast/importStatement/file/importWithStar.kt
+++ b/testData/ast/importStatement/file/importWithStar.kt
@@ -1,4 +1,4 @@
-namespace org.jetbrains.jet.j2k
+package org.jetbrains.jet.j2k
 import org.jetbrains.annotations.*
 public open class Converter() {
 }
\ No newline at end of file
diff --git a/testData/ast/importStatement/file/simpleImport.kt b/testData/ast/importStatement/file/simpleImport.kt
index 97e54209431..c35720004e5 100644
--- a/testData/ast/importStatement/file/simpleImport.kt
+++ b/testData/ast/importStatement/file/simpleImport.kt
@@ -1,3 +1,3 @@
-namespace org.jetbrains.jet.j2k
+package org.jetbrains.jet.j2k
 public open class Converter() {
 }
\ No newline at end of file
diff --git a/testData/ast/issues/file/kt-543-boxed.kt b/testData/ast/issues/file/kt-543-boxed.kt
index dafbd546c92..b63653b3d2e 100644
--- a/testData/ast/issues/file/kt-543-boxed.kt
+++ b/testData/ast/issues/file/kt-543-boxed.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun putInt(i : Int?) : Unit {
 }
diff --git a/testData/ast/issues/file/kt-543-mixed.kt b/testData/ast/issues/file/kt-543-mixed.kt
index 1fd99286342..566c7766284 100644
--- a/testData/ast/issues/file/kt-543-mixed.kt
+++ b/testData/ast/issues/file/kt-543-mixed.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun putInt(i : Int?) : Unit {
 }
diff --git a/testData/ast/issues/file/kt-543.kt b/testData/ast/issues/file/kt-543.kt
index 9e06bf3f48c..0e507c0d62f 100644
--- a/testData/ast/issues/file/kt-543.kt
+++ b/testData/ast/issues/file/kt-543.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun putInt(i : Int) : Unit {
 }
diff --git a/testData/ast/issues/file/kt-696.kt b/testData/ast/issues/file/kt-696.kt
index a238b6fa9fb..9369e8ec092 100644
--- a/testData/ast/issues/file/kt-696.kt
+++ b/testData/ast/issues/file/kt-696.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 open class Base() {
 open public fun hashCode() : Int {
 return System.identityHashCode(this)
diff --git a/testData/ast/issues/file/kt-792-mixed.kt b/testData/ast/issues/file/kt-792-mixed.kt
index 69f9f3feb15..fa82740445e 100644
--- a/testData/ast/issues/file/kt-792-mixed.kt
+++ b/testData/ast/issues/file/kt-792-mixed.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test(i : Int?) {
 open fun test() : Unit {
 var i : Int = 10
diff --git a/testData/ast/issues/file/kt-792.kt b/testData/ast/issues/file/kt-792.kt
index cdba42971fc..e43490413d0 100644
--- a/testData/ast/issues/file/kt-792.kt
+++ b/testData/ast/issues/file/kt-792.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test(i : Int) {
 open fun test() : Unit {
 var b : Byte = 10
diff --git a/testData/ast/issues/file/kt-794-mixed.kt b/testData/ast/issues/file/kt-794-mixed.kt
index 5e6ec805f77..4ec128cbf11 100644
--- a/testData/ast/issues/file/kt-794-mixed.kt
+++ b/testData/ast/issues/file/kt-794-mixed.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun getInteger(i : Int?) : Int? {
 return i
diff --git a/testData/ast/issues/file/kt-809-string.kt b/testData/ast/issues/file/kt-809-string.kt
index 0e261443721..062a09acdb4 100644
--- a/testData/ast/issues/file/kt-809-string.kt
+++ b/testData/ast/issues/file/kt-809-string.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Container() {
 var myString : String? = 1
 }
diff --git a/testData/ast/issues/file/kt-809.kt b/testData/ast/issues/file/kt-809.kt
index e9e43c99bf3..78932463e03 100644
--- a/testData/ast/issues/file/kt-809.kt
+++ b/testData/ast/issues/file/kt-809.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Container() {
 var myInt : Int = 1
 }
diff --git a/testData/ast/issues/file/kt-820-field.kt b/testData/ast/issues/file/kt-820-field.kt
index 77fb95f2c19..72711267b5b 100644
--- a/testData/ast/issues/file/kt-820-field.kt
+++ b/testData/ast/issues/file/kt-820-field.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Container() {
 var myInt : Int = 1
 }
diff --git a/testData/ast/issues/file/kt-820.kt b/testData/ast/issues/file/kt-820.kt
index 56fb9bc0682..abe8bfcb987 100644
--- a/testData/ast/issues/file/kt-820.kt
+++ b/testData/ast/issues/file/kt-820.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Container() {
 var myInt : Int = 1
 }
diff --git a/testData/ast/issues/file/kt-824-isDir.kt b/testData/ast/issues/file/kt-824-isDir.kt
index 9bae2da71ea..f03d1382414 100644
--- a/testData/ast/issues/file/kt-824-isDir.kt
+++ b/testData/ast/issues/file/kt-824-isDir.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 import java.io.File
 public open class Test() {
 class object {
diff --git a/testData/ast/issues/file/kt-824.kt b/testData/ast/issues/file/kt-824.kt
index 87e1d165317..5059669b42a 100644
--- a/testData/ast/issues/file/kt-824.kt
+++ b/testData/ast/issues/file/kt-824.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Container() {
 var myBoolean : Boolean = true
 }
diff --git a/testData/ast/issues/file/kt-836.kt b/testData/ast/issues/file/kt-836.kt
index e80ed065e8a..8b761878378 100644
--- a/testData/ast/issues/file/kt-836.kt
+++ b/testData/ast/issues/file/kt-836.kt
@@ -1,4 +1,4 @@
-namespace com.voltvoodoo.saplo4j.model
+package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 public open class Language(code : String?) : Serializable {
 {
diff --git a/testData/ast/issues/file/kt-837.kt b/testData/ast/issues/file/kt-837.kt
index c2040e45d81..7f6e2e5c63b 100644
--- a/testData/ast/issues/file/kt-837.kt
+++ b/testData/ast/issues/file/kt-837.kt
@@ -1,4 +1,4 @@
-namespace com.voltvoodoo.saplo4j.model
+package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 public open class Language(code : String?) : Serializable {
 {
diff --git a/testData/ast/kotlinExclusion/file/kt-656.kt b/testData/ast/kotlinExclusion/file/kt-656.kt
index f0e88acf7f6..4d8d3ac6e19 100644
--- a/testData/ast/kotlinExclusion/file/kt-656.kt
+++ b/testData/ast/kotlinExclusion/file/kt-656.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 import java.util.Iterator
 open class Test() : java.lang.Iterable<String?> {
 override public fun iterator() : java.util.Iterator<String?>? {
diff --git a/testData/ast/literalExpression/file/dollarInsideString.kt b/testData/ast/literalExpression/file/dollarInsideString.kt
index fdc29f01466..6a42dcad2c9 100644
--- a/testData/ast/literalExpression/file/dollarInsideString.kt
+++ b/testData/ast/literalExpression/file/dollarInsideString.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Test() {
 open fun test() : Unit {
 var name : String? = "$$$$"
diff --git a/testData/ast/methodCallExpression/file/genericMethod.kt b/testData/ast/methodCallExpression/file/genericMethod.kt
index eb9f546267f..b130cbc9376 100644
--- a/testData/ast/methodCallExpression/file/genericMethod.kt
+++ b/testData/ast/methodCallExpression/file/genericMethod.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Map() {
 open fun put<K, V>(k : K?, v : V?) : Unit {
 }
diff --git a/testData/ast/newClassExpression/file/fullQualifiedName.kt b/testData/ast/newClassExpression/file/fullQualifiedName.kt
index 6f47648c18f..e89453f3809 100644
--- a/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ b/testData/ast/newClassExpression/file/fullQualifiedName.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 import java.util.List
 open class User() {
 open fun main() : Unit {
diff --git a/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/testData/ast/newClassExpression/file/fullQualifiedName2.kt
index 694d09886dc..bdcb458a76f 100644
--- a/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ b/testData/ast/newClassExpression/file/fullQualifiedName2.kt
@@ -1,4 +1,4 @@
-namespace test
+package test
 open class User() {
 open fun main() : Unit {
 var list : java.util.List<*>? = java.util.LinkedList()
diff --git a/testData/ast/newClassExpression/file/newClassByFullName.kt b/testData/ast/newClassExpression/file/newClassByFullName.kt
index c60db08ecaa..adb7fce935a 100644
--- a/testData/ast/newClassExpression/file/newClassByFullName.kt
+++ b/testData/ast/newClassExpression/file/newClassByFullName.kt
@@ -1,4 +1,4 @@
-namespace org.test
+package org.test
 open class Library() {
 }
 open class User() {
diff --git a/testData/ast/newClassExpression/file/newInnerClass.kt b/testData/ast/newClassExpression/file/newInnerClass.kt
index b3bbbdf8623..93c7fec3411 100644
--- a/testData/ast/newClassExpression/file/newInnerClass.kt
+++ b/testData/ast/newClassExpression/file/newInnerClass.kt
@@ -1,4 +1,4 @@
-namespace org.test
+package org.test
 open class OuterClass() {
 open class InnerClass() {
 }
diff --git a/testData/ast/newClassExpression/file/newListAndNewMember.kt b/testData/ast/newClassExpression/file/newListAndNewMember.kt
index a13a2515a54..089a1acef21 100644
--- a/testData/ast/newClassExpression/file/newListAndNewMember.kt
+++ b/testData/ast/newClassExpression/file/newListAndNewMember.kt
@@ -1,4 +1,4 @@
-namespace org.test
+package org.test
 import java.util.List
 import java.util.LinkedList
 open class Member() {
diff --git a/testData/ast/newClassExpression/file/newStaticInnerClass.kt b/testData/ast/newClassExpression/file/newStaticInnerClass.kt
index 61338ae3cfc..3a6a440f397 100644
--- a/testData/ast/newClassExpression/file/newStaticInnerClass.kt
+++ b/testData/ast/newClassExpression/file/newStaticInnerClass.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Foo() {
 class object {
 open class Bar() {
diff --git a/testData/ast/objectLiteral/file/MyFrame.kt b/testData/ast/objectLiteral/file/MyFrame.kt
index 1957f66f297..bb49c2e14d5 100644
--- a/testData/ast/objectLiteral/file/MyFrame.kt
+++ b/testData/ast/objectLiteral/file/MyFrame.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class WindowAdapter() {
 open public fun windowClosing() : Unit {
 }
diff --git a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
index 51ebb27fea5..a673d540277 100644
--- a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
+++ b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
@@ -1,4 +1,4 @@
-namespace org.jetbrains.jet.j2k.`in`
+package org.jetbrains.jet.j2k.`in`
 import org.jetbrains.annotations.Nullable
 public open class Converter() {
 }
\ No newline at end of file
diff --git a/testData/ast/rawGenerics/file/kt-540-map.kt b/testData/ast/rawGenerics/file/kt-540-map.kt
index 2184c3b7214..42fb66b7c4e 100644
--- a/testData/ast/rawGenerics/file/kt-540-map.kt
+++ b/testData/ast/rawGenerics/file/kt-540-map.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 import java.util.HashMap
 open class Test() {
 open fun main() : Unit {
diff --git a/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
index 3fd7726bfd0..426b2190bc9 100644
--- a/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
+++ b/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class Collection<E>(e : E?) {
 {
 System.out?.println(e)
diff --git a/testData/ast/rawGenerics/file/kt-540.kt b/testData/ast/rawGenerics/file/kt-540.kt
index bf2f869cf42..6db46c17105 100644
--- a/testData/ast/rawGenerics/file/kt-540.kt
+++ b/testData/ast/rawGenerics/file/kt-540.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 import java.util.List
 import java.util.LinkedList
 open class Test() {
diff --git a/testData/ast/rawGenerics/file/rawGenericMethod.kt b/testData/ast/rawGenerics/file/rawGenericMethod.kt
index bce70b24a11..ea3e08d5bdb 100644
--- a/testData/ast/rawGenerics/file/rawGenericMethod.kt
+++ b/testData/ast/rawGenerics/file/rawGenericMethod.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 open class TestT() {
 open fun getT<T>() : Unit {
 }
diff --git a/testData/ast/switch/file/comlicatedFallDown.kt b/testData/ast/switch/file/comlicatedFallDown.kt
index 59e285684c2..b1af2ce6ffa 100644
--- a/testData/ast/switch/file/comlicatedFallDown.kt
+++ b/testData/ast/switch/file/comlicatedFallDown.kt
@@ -1,4 +1,4 @@
-namespace demo
+package demo
 public open class SwitchDemo() {
 class object {
 open public fun print(o : Any?) : Unit {
diff --git a/testData/ast/switch/file/fallDown.kt b/testData/ast/switch/file/fallDown.kt
index fd15f52af57..a237a7ee535 100644
--- a/testData/ast/switch/file/fallDown.kt
+++ b/testData/ast/switch/file/fallDown.kt
@@ -1,4 +1,4 @@
-namespace switch_demo
+package switch_demo
 public open class SwitchDemo() {
 class object {
 open public fun main(args : Array<String?>?) : Unit {
diff --git a/testData/ast/switch/file/kt-539.kt b/testData/ast/switch/file/kt-539.kt
index 1f2184937ae..63fd0eaf959 100644
--- a/testData/ast/switch/file/kt-539.kt
+++ b/testData/ast/switch/file/kt-539.kt
@@ -1,4 +1,4 @@
-namespace switch_demo
+package switch_demo
 public open class SwitchDemo() {
 class object {
 open public fun main(args : Array<String?>?) : Unit {