NamespaceLikeBuilder → PackageLikeBuilder.

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java

@@ -173,13 +173,13 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite {
         getWritableScopeForInitializers().changeLockLevel(WritableScope.LockLevel.READING);
     }
 
-    private NamespaceLikeBuilder builder = null;
+    private PackageLikeBuilder builder = null;
 
     @Override
-    public NamespaceLikeBuilder getBuilder() {
+    public PackageLikeBuilder getBuilder() {
         if (builder == null) {
-            final NamespaceLikeBuilder superBuilder = super.getBuilder();
-            builder = new NamespaceLikeBuilderDummy() {
+            final PackageLikeBuilder superBuilder = super.getBuilder();
+            builder = new PackageLikeBuilderDummy() {
                 @NotNull
                 @Override
                 public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java

@@ -189,10 +189,10 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
         this.annotations = annotations;
     }
 
-    private NamespaceLikeBuilder builder = null;
-    public NamespaceLikeBuilder getBuilder() {
+    private PackageLikeBuilder builder = null;
+    public PackageLikeBuilder getBuilder() {
         if (builder == null) {
-            builder = new NamespaceLikeBuilderDummy() {
+            builder = new PackageLikeBuilderDummy() {
                 @NotNull
                 @Override
                 public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java

@@ -35,7 +35,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
     private final ModuleDescriptor module;
     private final FqName fqName;
     private final WritableScope scope;
-    private final NamespaceLikeBuilder builder;
+    private final PackageLikeBuilder builder;
 
     public MutablePackageFragmentDescriptor(
             @NotNull PackageFragmentProvider provider,
@@ -49,7 +49,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
 
         scope = new WritableScopeImpl(JetScope.EMPTY, this, RedeclarationHandler.DO_NOTHING, "Members of " + fqName + " in " + module);
         scope.changeLockLevel(WritableScope.LockLevel.BOTH);
-        builder = new ScopeBasedNamespaceLikeBuilder(this, scope);
+        builder = new ScopeBasedPackageLikeBuilder(this, scope);
     }
 
     @NotNull
@@ -88,7 +88,7 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
     }
 
     @NotNull
-    public NamespaceLikeBuilder getBuilder() {
+    public PackageLikeBuilder getBuilder() {
         return builder;
     }
 }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilder.java

@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 
-public interface NamespaceLikeBuilder {
+public interface PackageLikeBuilder {
 
     @NotNull
     DeclarationDescriptor getOwnerForChildren();

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilderDummy.java

@@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 
-public class NamespaceLikeBuilderDummy implements NamespaceLikeBuilder {
+public class PackageLikeBuilderDummy implements PackageLikeBuilder {
     @NotNull
     @Override
     public DeclarationDescriptor getOwnerForChildren() {

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScopeBasedPackageLikeBuilder.java

@@ -22,11 +22,11 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 
-public class ScopeBasedNamespaceLikeBuilder implements NamespaceLikeBuilder {
+public class ScopeBasedPackageLikeBuilder implements PackageLikeBuilder {
     private final DeclarationDescriptor containingDeclaration;
     private final WritableScope scope;
 
-    ScopeBasedNamespaceLikeBuilder(
+    ScopeBasedPackageLikeBuilder(
             @NotNull DeclarationDescriptor containingDeclaration,
             @NotNull WritableScope scope
     ) {