RootNamespaceExpression → RootPackageExpression.

compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java

@@ -137,7 +137,7 @@ public interface JetNodeTypes {
     JetNodeType SAFE_ACCESS_EXPRESSION    = new JetNodeType("SAFE_ACCESS_EXPRESSION", JetSafeQualifiedExpression.class);
 
     JetNodeType OBJECT_LITERAL            = new JetNodeType("OBJECT_LITERAL", JetObjectLiteralExpression.class);
-    JetNodeType ROOT_NAMESPACE            = new JetNodeType("ROOT_NAMESPACE", JetRootNamespaceExpression.class);
+    JetNodeType ROOT_PACKAGE = new JetNodeType("ROOT_PACKAGE", JetRootPackageExpression.class);
 
     JetNodeType WHEN                      = new JetNodeType("WHEN", JetWhenExpression.class);
     JetNodeType WHEN_ENTRY                = new JetNodeType("WHEN_ENTRY", JetWhenEntry.class);

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java

@@ -566,7 +566,7 @@ public interface Errors {
     DiagnosticFactory0<JetClassInitializer> ANONYMOUS_INITIALIZER_IN_TRAIT = DiagnosticFactory0.create(ERROR);
 
     DiagnosticFactory0<JetThisExpression> NO_THIS = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory0<JetRootNamespaceExpression> NAMESPACE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<JetRootPackageExpression> NAMESPACE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<JetSimpleNameExpression, ClassifierDescriptor> NO_CLASS_OBJECT = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<JetSimpleNameExpression, TypeParameterDescriptor> TYPE_PARAMETER_IS_NOT_AN_EXPRESSION = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<JetSimpleNameExpression, TypeParameterDescriptor> TYPE_PARAMETER_ON_LHS_OF_DOT = DiagnosticFactory1.create(ERROR);

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -542,7 +542,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
             parseTupleExpression();
         }
         else if (at(PACKAGE_KEYWORD)) {
-            parseOneTokenExpression(ROOT_NAMESPACE);
+            parseOneTokenExpression(ROOT_PACKAGE);
         }
         else if (at(THIS_KEYWORD)) {
             parseThisExpression();

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java

@@ -19,18 +19,18 @@ package org.jetbrains.jet.lang.psi;
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 
-public class JetRootNamespaceExpression extends JetExpressionImpl {
+public class JetRootPackageExpression extends JetExpressionImpl {
-    public JetRootNamespaceExpression(@NotNull ASTNode node) {
+    public JetRootPackageExpression(@NotNull ASTNode node) {
         super(node);
     }
 
     @Override
     public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitRootNamespaceExpression(this);
+        visitor.visitRootPackageExpression(this);
     }
 
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
-        return visitor.visitRootNamespaceExpression(this, data);
+        return visitor.visitRootPackageExpression(this, data);
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java

@@ -266,7 +266,7 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitExpression(expression, data);
     }
 
-    public R visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, D data) {
+    public R visitRootPackageExpression(@NotNull JetRootPackageExpression expression, D data) {
         return visitExpression(expression, data);
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java

@@ -264,7 +264,7 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitExpression(expression);
     }
 
-    public void visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression) {
+    public void visitRootPackageExpression(@NotNull JetRootPackageExpression expression) {
         visitExpression(expression);
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java

@@ -266,8 +266,8 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
         super.visitObjectLiteralExpression(expression, data);
     }
 
-    public void visitRootNamespaceExpressionVoid(@NotNull JetRootNamespaceExpression expression, P data) {
+    public void visitRootPackageExpressionVoid(@NotNull JetRootPackageExpression expression, P data) {
-        super.visitRootNamespaceExpression(expression, data);
+        super.visitRootPackageExpression(expression, data);
     }
 
     public void visitBlockExpressionVoid(@NotNull JetBlockExpression expression, P data) {
@@ -772,8 +772,8 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
     }
 
     @Override
-    public final Void visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, P data) {
+    public final Void visitRootPackageExpression(@NotNull JetRootPackageExpression expression, P data) {
-        visitRootNamespaceExpressionVoid(expression, data);
+        visitRootPackageExpressionVoid(expression, data);
     	return null;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java

@@ -155,7 +155,7 @@ public class DataFlowValueFactory {
 
             return getIdForThisReceiver(declarationDescriptor);
         }
-        else if (expression instanceof JetRootNamespaceExpression) {
+        else if (expression instanceof JetRootPackageExpression) {
             return createPackageInfo(JetModuleUtil.getRootPackageType(expression));
         }
         return NO_IDENTIFIER_INFO;

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java

@@ -1170,7 +1170,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
     }
 
     @Override
-    public JetTypeInfo visitRootNamespaceExpression(@NotNull JetRootNamespaceExpression expression, ExpressionTypingContext context) {
+    public JetTypeInfo visitRootPackageExpression(@NotNull JetRootPackageExpression expression, ExpressionTypingContext context) {
         if (JetPsiUtil.isLHSOfDot(expression)) {
             return DataFlowUtils.checkType(JetModuleUtil.getRootPackageType(expression), expression, context, context.dataFlowInfo);
         }

compiler/testData/psi/RootPackage.txt

@@ -1,4 +1,4 @@
-JetFile: RootNamespace.kt
+JetFile: RootPackage.kt
   PACKAGE_DIRECTIVE
     PsiElement(package)('package')
     PsiWhiteSpace(' ')
@@ -46,7 +46,7 @@ JetFile: RootNamespace.kt
       DOT_QUALIFIED_EXPRESSION
         DOT_QUALIFIED_EXPRESSION
           DOT_QUALIFIED_EXPRESSION
-            ROOT_NAMESPACE
+            ROOT_PACKAGE
               PsiElement(package)('package')
             PsiElement(DOT)('.')
             REFERENCE_EXPRESSION
@@ -61,7 +61,7 @@ JetFile: RootNamespace.kt
       DOT_QUALIFIED_EXPRESSION
         DOT_QUALIFIED_EXPRESSION
           DOT_QUALIFIED_EXPRESSION
-            ROOT_NAMESPACE
+            ROOT_PACKAGE
               PsiElement(package)('package')
             PsiElement(DOT)('.')
             REFERENCE_EXPRESSION

compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java

@@ -337,9 +337,9 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         doParsingTest("compiler/testData/psi/QuotedIdentifiers.kt");
     }
     
-    @TestMetadata("RootNamespace.kt")
+    @TestMetadata("RootPackage.kt")
-    public void testRootNamespace() throws Exception {
+    public void testRootPackage() throws Exception {
-        doParsingTest("compiler/testData/psi/RootNamespace.kt");
+        doParsingTest("compiler/testData/psi/RootPackage.kt");
     }
     
     @TestMetadata("SemicolonAfterIf.kt")

js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java

@@ -45,7 +45,7 @@ public final class Namer {
     private static final String GETTER_PREFIX = "get_";
     private static final String BACKING_FIELD_PREFIX = "$";
     private static final String SUPER_METHOD_NAME = "baseInitializer";
-    private static final String ROOT_NAMESPACE = "_";
+    private static final String ROOT_PACKAGE = "_";
     private static final String RECEIVER_PARAMETER_NAME = "$receiver";
     private static final String THROW_NPE_FUN_NAME = "throwNPE";
     private static final String CLASS_OBJECT_GETTER = "object";
@@ -63,7 +63,7 @@ public final class Namer {
 
     @NotNull
     public static String getRootNamespaceName() {
-        return ROOT_NAMESPACE;
+        return ROOT_PACKAGE;
     }
 
     @NotNull