diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml
index a4b59be133e..2186d0cfd54 100644
--- a/libraries/docs/website/pom.xml
+++ b/libraries/docs/website/pom.xml
@@ -67,7 +67,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>org.jetbrains.kotlin.site.namespace</mainClass>
+                    <mainClass>org.jetbrains.kotlin.site.SitePackage</mainClass>
                     <arguments>
                         <argument>${basedir}</argument>
                     </arguments>
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index e9e40342006..fe1114f325d 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -106,7 +106,7 @@
                             <phase>test</phase>
                             <configuration>
                               <target>
-                                <java fork="true" classpathref="maven.test.classpath" classname="io.kool.javafx.namespace">
+                                <java fork="true" classpathref="maven.test.classpath" classname="io.kool.javafx.JavafxPackage">
                                     <arg value="file://sample-javafx.html"/>
                                 </java>
                               </target>
diff --git a/libraries/examples/browser-example/sample-javafx.html b/libraries/examples/browser-example/sample-javafx.html
index 7aafb8e5820..4b1c44ed196 100644
--- a/libraries/examples/browser-example/sample-javafx.html
+++ b/libraries/examples/browser-example/sample-javafx.html
@@ -9,7 +9,7 @@
 </div>
 
 <script  type="text/kotlin">
-    sample.namespace.myApp()
+    sample.SamplePackage.myApp()
 </script>
 
 </body>
diff --git a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
index e899a23af4b..b3b41d1cb60 100644
--- a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
+++ b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
@@ -1,7 +1,7 @@
 package test.kotlin.jtests;
 
-import static kotlin.namespace.*;
-import static kotlin.util.namespace.*;
+import static kotlin.KotlinPackage.*;
+import static kotlin.util.UtilPackage.*;
 
 import jet.Function1;
 import junit.framework.TestCase;
diff --git a/libraries/kotlin-swing/pom.xml b/libraries/kotlin-swing/pom.xml
index eac98705786..7550d600330 100644
--- a/libraries/kotlin-swing/pom.xml
+++ b/libraries/kotlin-swing/pom.xml
@@ -63,7 +63,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>demo.namespace</mainClass>
+                    <mainClass>demo.DemoPackage</mainClass>
                     <classpathScope>test</classpathScope>
                     <systemProperties>
                         <systemProperty>
@@ -98,7 +98,7 @@
                             <phase>test</phase>
                             <configuration>
                               <target>
-                                <java fork="true" classpathref="maven.test.classpath" classname="demo.namespace"/>
+                                <java fork="true" classpathref="maven.test.classpath" classname="demo.DemoPackage"/>
                               </target>
                             </configuration>
                             <goals>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index bb5e85d930c..dc6bd9ff614 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -38,7 +38,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>org.jetbrains.kotlin.tools.namespace</mainClass>
+                    <mainClass>org.jetbrains.kotlin.tools.ToolsPackage</mainClass>
                     <classpathScope>test</classpathScope>
                 </configuration>
             </plugin>
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
index 6b5289b0db0..3e04fbb7fb1 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
@@ -171,7 +171,7 @@ abstract class KClassOrPackage(model: KModel, declarationDescriptor: Declaration
 class SourceInfo(val psi: JetFile, val relativePath: String, val htmlPath: String)
 
 class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs: List<File>, val sources: List<JetFile>) {
-    // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
+    // TODO generates java.lang.NoSuchMethodError: kotlin.util.UtilPackage.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
     //val packages = sortedMap<String,KPackage>()
     public val packageMap: SortedMap<String, KPackage> = TreeMap<String, KPackage>()
 
@@ -942,7 +942,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor,
         var useExternalLink: Boolean = false): KClassOrPackage(model, descriptor), Comparable<KPackage> {
 
 
-    // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
+    // TODO generates java.lang.NoSuchMethodError: kotlin.util.UtilPackage.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap;
     //val classes = sortedMap<String,KClass>()
     public val classMap: SortedMap<String, KClass> = TreeMap<String, KClass>()