diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java
index 1b63fcf8092..ca1d3e6b720 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java
@@ -59,7 +59,7 @@ public class JetNamespaceHeader extends JetReferenceExpression {
     @NotNull
     public Name getNameAsName() {
         PsiElement nameIdentifier = getNameIdentifier();
-        return nameIdentifier == null ? SpecialNames.ROOT_NAMESPACE : Name.identifier(nameIdentifier.getText());
+        return nameIdentifier == null ? SpecialNames.ROOT_PACKAGE : Name.identifier(nameIdentifier.getText());
     }
 
     public boolean isRoot() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java
index b93859dd681..e881aa9b04d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java
@@ -25,6 +25,6 @@ import org.jetbrains.jet.lang.types.PackageType;
 public class JetModuleUtil {
     public static PackageType getRootPackageType(JetElement expression) {
         // TODO: this is a stub: at least the modules' root namespaces must be indexed here
-        return new PackageType(SpecialNames.ROOT_NAMESPACE, JetScope.EMPTY, ReceiverValue.NO_RECEIVER);
+        return new PackageType(SpecialNames.ROOT_PACKAGE, JetScope.EMPTY, ReceiverValue.NO_RECEIVER);
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
index 095440bf917..bd15b6012bd 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
@@ -96,7 +96,7 @@ public class LazyResolveTestUtil {
             JetNamespaceHeader header = file.getNamespaceHeader();
             if (header != null) {
                 List<JetSimpleNameExpression> names = header.getNamespaceNames();
-                Name name = names.isEmpty() ? SpecialNames.ROOT_NAMESPACE : names.get(0).getReferencedNameAsName();
+                Name name = names.isEmpty() ? SpecialNames.ROOT_PACKAGE : names.get(0).getReferencedNameAsName();
                 shortNames.add(name);
             }
             else {
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
index 9d7acddaf60..5e2abe793f6 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
@@ -463,7 +463,7 @@ public class DescriptorUtils {
     }
 
     /**
-     * @return true iff {@code descriptor}'s first non-class container is a namespace
+     * @return true iff {@code descriptor}'s first non-class container is a package
      */
     public static boolean isTopLevelOrInnerClass(@NotNull ClassDescriptor descriptor) {
         DeclarationDescriptor containing = descriptor.getContainingDeclaration();
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java
index ffb7c287e31..b5b98773499 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class SpecialNames {
     public static final Name NO_NAME_PROVIDED = Name.special("<no name provided>");
-    public static final Name ROOT_NAMESPACE = Name.special("<root namespace>");
+    public static final Name ROOT_PACKAGE = Name.special("<root package>");
 
     private static final String CLASS_OBJECT_FOR = "<class-object-for-";
 
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
index 3932de7d33b..eb234b2f88b 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
@@ -240,8 +240,8 @@ public class WritableScopeImpl extends WritableScopeWithImports {
     public VariableDescriptor getLocalVariable(@NotNull Name name) {
         checkMayRead();
 
-        Map<Name, DeclarationDescriptor> variableClassOrNamespaceDescriptors = getVariableOrClassDescriptors();
-        DeclarationDescriptor descriptor = variableClassOrNamespaceDescriptors.get(name);
+        Map<Name, DeclarationDescriptor> variableOrClassDescriptors = getVariableOrClassDescriptors();
+        DeclarationDescriptor descriptor = variableOrClassDescriptors.get(name);
         if (descriptor instanceof VariableDescriptor && !getPropertyGroups().get(name).contains(descriptor)) {
             return (VariableDescriptor) descriptor;
         }
@@ -368,8 +368,8 @@ public class WritableScopeImpl extends WritableScopeWithImports {
     public ClassifierDescriptor getClassifier(@NotNull Name name) {
         checkMayRead();
 
-        Map<Name, DeclarationDescriptor> variableClassOrNamespaceDescriptors = getVariableOrClassDescriptors();
-        DeclarationDescriptor descriptor = variableClassOrNamespaceDescriptors.get(name);
+        Map<Name, DeclarationDescriptor> variableOrClassDescriptors = getVariableOrClassDescriptors();
+        DeclarationDescriptor descriptor = variableOrClassDescriptors.get(name);
         if (descriptor instanceof ClassifierDescriptor) return (ClassifierDescriptor) descriptor;
 
         ClassifierDescriptor classifierDescriptor = getWorkerScope().getClassifier(name);