diff --git a/src/org/jetbrains/jet/j2k/ast/File.java b/src/org/jetbrains/jet/j2k/ast/File.java
index da873d9419b..d65a1605cbe 100644
--- a/src/org/jetbrains/jet/j2k/ast/File.java
+++ b/src/org/jetbrains/jet/j2k/ast/File.java
@@ -25,8 +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 + SPACE + "{" + N +
-      common +
-      "}";
+    return "namespace" + SPACE + myPackageName + N +
+      common;
   }
 }
diff --git a/testData/ast/constructors/file/customerBuilder.kt b/testData/ast/constructors/file/customerBuilder.kt
index cf263799a68..7218a7f38bf 100644
--- a/testData/ast/constructors/file/customerBuilder.kt
+++ b/testData/ast/constructors/file/customerBuilder.kt
@@ -1,4 +1,4 @@
-namespace org.test.customer {
+namespace org.test.customer
 open class Customer(first : String?, last : String?) {
 public val _firstName : String?
 public val _lastName : String?
@@ -42,5 +42,4 @@ System.out?.println(customer?.getFirstName())
 System.out?.println(customer?.getLastName())
 }
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/file/file/packageWithClass.kt b/testData/ast/file/file/packageWithClass.kt
index 48abf7a9bbf..8b169b30b42 100644
--- a/testData/ast/file/file/packageWithClass.kt
+++ b/testData/ast/file/file/packageWithClass.kt
@@ -1,4 +1,3 @@
-namespace test {
+namespace 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 1cb4a91ba46..076ff7373a9 100644
--- a/testData/ast/file/file/packageWithImports.kt
+++ b/testData/ast/file/file/packageWithImports.kt
@@ -1,4 +1,3 @@
-namespace test {
+namespace test
 import ast
-import ast2
-}
\ No newline at end of file
+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 1cb4a91ba46..076ff7373a9 100644
--- a/testData/ast/file/file/packageWithMixedImports.kt
+++ b/testData/ast/file/file/packageWithMixedImports.kt
@@ -1,4 +1,3 @@
-namespace test {
+namespace test
 import ast
-import ast2
-}
\ No newline at end of file
+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 e229fa8c6ee..37c1f1c767f 100644
--- a/testData/ast/file/file/packageWithOpenClass.kt
+++ b/testData/ast/file/file/packageWithOpenClass.kt
@@ -1,4 +1,3 @@
-namespace test {
+namespace 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 1cb4a91ba46..076ff7373a9 100644
--- a/testData/ast/file/file/packageWithStaticImports.kt
+++ b/testData/ast/file/file/packageWithStaticImports.kt
@@ -1,4 +1,3 @@
-namespace test {
+namespace test
 import ast
-import ast2
-}
\ No newline at end of file
+import ast2
\ No newline at end of file
diff --git a/testData/ast/importStatement/file/importWithKeywords.kt b/testData/ast/importStatement/file/importWithKeywords.kt
index 3720bbfeabc..f5babdc556c 100644
--- a/testData/ast/importStatement/file/importWithKeywords.kt
+++ b/testData/ast/importStatement/file/importWithKeywords.kt
@@ -1,5 +1,4 @@
-namespace test {
+namespace 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 65cc2f10c67..ad30b8594cb 100644
--- a/testData/ast/importStatement/file/importWithStar.kt
+++ b/testData/ast/importStatement/file/importWithStar.kt
@@ -1,5 +1,4 @@
-namespace org.jetbrains.jet.j2k {
+namespace 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 0a97e34e764..dcead7d53b8 100644
--- a/testData/ast/importStatement/file/simpleImport.kt
+++ b/testData/ast/importStatement/file/simpleImport.kt
@@ -1,5 +1,4 @@
-namespace org.jetbrains.jet.j2k {
+namespace org.jetbrains.jet.j2k
 import org.jetbrains.annotations.NotNull
 public open class Converter() {
-}
 }
\ No newline at end of file
diff --git a/testData/ast/methodCallExpression/file/genericMethod.kt b/testData/ast/methodCallExpression/file/genericMethod.kt
index f965f4e78e5..eb9f546267f 100644
--- a/testData/ast/methodCallExpression/file/genericMethod.kt
+++ b/testData/ast/methodCallExpression/file/genericMethod.kt
@@ -1,4 +1,4 @@
-namespace demo {
+namespace demo
 open class Map() {
 open fun put<K, V>(k : K?, v : V?) : Unit {
 }
@@ -8,5 +8,4 @@ open fun test() : Unit {
 var m : Map? = Map()
 m?.put<String?, Int>("10", 10)
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/fullQualifiedName.kt b/testData/ast/newClassExpression/file/fullQualifiedName.kt
index 18839b09afd..6f47648c18f 100644
--- a/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ b/testData/ast/newClassExpression/file/fullQualifiedName.kt
@@ -1,8 +1,7 @@
-namespace test {
+namespace test
 import java.util.List
 open class User() {
 open fun main() : Unit {
 var list : List<*>? = java.util.LinkedList()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/testData/ast/newClassExpression/file/fullQualifiedName2.kt
index 474fda2fcd5..694d09886dc 100644
--- a/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ b/testData/ast/newClassExpression/file/fullQualifiedName2.kt
@@ -1,7 +1,6 @@
-namespace test {
+namespace test
 open class User() {
 open fun main() : Unit {
 var list : java.util.List<*>? = java.util.LinkedList()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/newClassByFullName.kt b/testData/ast/newClassExpression/file/newClassByFullName.kt
index 26ff7b2cf9e..c60db08ecaa 100644
--- a/testData/ast/newClassExpression/file/newClassByFullName.kt
+++ b/testData/ast/newClassExpression/file/newClassByFullName.kt
@@ -1,9 +1,8 @@
-namespace org.test {
+namespace org.test
 open class Library() {
 }
 open class User() {
 open fun main() : Unit {
 var lib : Library? = Library()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/newInnerClass.kt b/testData/ast/newClassExpression/file/newInnerClass.kt
index 497bc0514cd..b3bbbdf8623 100644
--- a/testData/ast/newClassExpression/file/newInnerClass.kt
+++ b/testData/ast/newClassExpression/file/newInnerClass.kt
@@ -1,4 +1,4 @@
-namespace org.test {
+namespace org.test
 open class OuterClass() {
 open class InnerClass() {
 }
@@ -8,5 +8,4 @@ open fun main() : Unit {
 var outerObject : OuterClass? = OuterClass()
 var innerObject : OuterClass.InnerClass? = outerObject?.InnerClass()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/newListAndNewMember.kt b/testData/ast/newClassExpression/file/newListAndNewMember.kt
index 0c6c5e4a59d..a13a2515a54 100644
--- a/testData/ast/newClassExpression/file/newListAndNewMember.kt
+++ b/testData/ast/newClassExpression/file/newListAndNewMember.kt
@@ -1,4 +1,4 @@
-namespace org.test {
+namespace org.test
 import java.util.List
 import java.util.LinkedList
 open class Member() {
@@ -8,5 +8,4 @@ open fun main() : Unit {
 var members : List<Member?>? = LinkedList<Member?>()
 members?.add(Member())
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/newClassExpression/file/newStaticInnerClass.kt b/testData/ast/newClassExpression/file/newStaticInnerClass.kt
index 8adc33c21a5..61338ae3cfc 100644
--- a/testData/ast/newClassExpression/file/newStaticInnerClass.kt
+++ b/testData/ast/newClassExpression/file/newStaticInnerClass.kt
@@ -1,4 +1,4 @@
-namespace demo {
+namespace demo
 open class Foo() {
 class object {
 open class Bar() {
@@ -9,5 +9,4 @@ open class User() {
 open fun main() : Unit {
 var boo : Foo.Bar? = Foo.Bar()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/objectLiteral/file/MyFrame.kt b/testData/ast/objectLiteral/file/MyFrame.kt
index 834758deae5..4c39ca14713 100644
--- a/testData/ast/objectLiteral/file/MyFrame.kt
+++ b/testData/ast/objectLiteral/file/MyFrame.kt
@@ -1,4 +1,4 @@
-namespace demo {
+namespace demo
 import java.awt.*
 import java.awt.event.*
 import java.io.*
@@ -17,5 +17,4 @@ dispose()
 }
 })
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
index 9700c7d464f..d4534115df5 100644
--- a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
+++ b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
@@ -1,6 +1,5 @@
-namespace org.jetbrains.jet.j2k.`in` {
+namespace org.jetbrains.jet.j2k.`in`
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.annotations.Nullable
 public open class Converter() {
-}
 }
\ No newline at end of file
diff --git a/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
index ebf7822a53e..3fd7726bfd0 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 {
+namespace demo
 open class Collection<E>(e : E?) {
 {
 System.out?.println(e)
@@ -10,5 +10,4 @@ var raw1 : Collection<*>? = Collection(1)
 var raw2 : Collection<*>? = Collection<Int?>(1)
 var raw3 : Collection<*>? = Collection<String?>("1")
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/rawGenerics/file/kt-540.kt b/testData/ast/rawGenerics/file/kt-540.kt
index 7d2290afbf1..bf2f869cf42 100644
--- a/testData/ast/rawGenerics/file/kt-540.kt
+++ b/testData/ast/rawGenerics/file/kt-540.kt
@@ -1,4 +1,4 @@
-namespace demo {
+namespace demo
 import java.util.List
 import java.util.LinkedList
 open class Test() {
@@ -7,5 +7,4 @@ var common : List<String?>? = LinkedList<String?>()
 var raw : List<*>? = LinkedList<String?>()
 var superRaw : List<*>? = LinkedList()
 }
-}
 }
\ No newline at end of file
diff --git a/testData/ast/rawGenerics/file/rawGenericMethod.kt b/testData/ast/rawGenerics/file/rawGenericMethod.kt
index 7372f4e257d..bce70b24a11 100644
--- a/testData/ast/rawGenerics/file/rawGenericMethod.kt
+++ b/testData/ast/rawGenerics/file/rawGenericMethod.kt
@@ -1,4 +1,4 @@
-namespace demo {
+namespace demo
 open class TestT() {
 open fun getT<T>() : Unit {
 }
@@ -10,5 +10,4 @@ t?.getT<String?>()
 t?.getT<Int?>()
 t?.getT()
 }
-}
 }
\ No newline at end of file