diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
index 12f5d72eee6..4100b8d8249 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
@@ -260,11 +260,11 @@ public class DescriptorDeserializer {
             @NotNull AnnotationDeserializer annotationDeserializer,
             @NotNull NameResolver nameResolver
     ) {
-        assert containingDeclaration instanceof ClassOrNamespaceDescriptor
-                : "Only members in classes or namespaces should be serialized: " + containingDeclaration;
+        assert containingDeclaration instanceof ClassOrPackageFragmentDescriptor
+                : "Only members in classes or package fragments should be serialized: " + containingDeclaration;
         return Flags.HAS_ANNOTATIONS.get(flags)
                ? annotationDeserializer
-                       .loadCallableAnnotations((ClassOrNamespaceDescriptor) containingDeclaration, proto, nameResolver, kind)
+                       .loadCallableAnnotations((ClassOrPackageFragmentDescriptor) containingDeclaration, proto, nameResolver, kind)
                : Collections.<AnnotationDescriptor>emptyList();
     }
 
@@ -371,9 +371,9 @@ public class DescriptorDeserializer {
     @NotNull
     private List<ValueParameterDescriptor> valueParameters(@NotNull Callable callable, @NotNull AnnotatedCallableKind kind) {
         DeclarationDescriptor containerOfCallable = containingDeclaration.getContainingDeclaration();
-        assert containerOfCallable instanceof ClassOrNamespaceDescriptor
-                : "Only members in classes or namespaces should be serialized: " + containerOfCallable;
-        ClassOrNamespaceDescriptor classOrNamespace = (ClassOrNamespaceDescriptor) containerOfCallable;
+        assert containerOfCallable instanceof ClassOrPackageFragmentDescriptor
+                : "Only members in classes or package fragments should be serialized: " + containerOfCallable;
+        ClassOrPackageFragmentDescriptor classOrPackage = (ClassOrPackageFragmentDescriptor) containerOfCallable;
 
         List<Callable.ValueParameter> protos = callable.getValueParameterList();
         List<ValueParameterDescriptor> result = new ArrayList<ValueParameterDescriptor>(protos.size());
@@ -382,7 +382,7 @@ public class DescriptorDeserializer {
             result.add(new ValueParameterDescriptorImpl(
                     containingDeclaration,
                     i,
-                    getAnnotations(classOrNamespace, callable, kind, proto),
+                    getAnnotations(classOrPackage, callable, kind, proto),
                     nameResolver.getName(proto.getName()),
                     typeDeserializer.type(proto.getType()),
                     Flags.DECLARES_DEFAULT_VALUE.get(proto.getFlags()),
@@ -394,13 +394,13 @@ public class DescriptorDeserializer {
 
     @NotNull
     private List<AnnotationDescriptor> getAnnotations(
-            @NotNull ClassOrNamespaceDescriptor classOrNamespace,
+            @NotNull ClassOrPackageFragmentDescriptor classOrPackage,
             @NotNull Callable callable,
             @NotNull AnnotatedCallableKind kind,
             @NotNull Callable.ValueParameter valueParameter
     ) {
         return Flags.HAS_ANNOTATIONS.get(valueParameter.getFlags())
-               ? annotationDeserializer.loadValueParameterAnnotations(classOrNamespace, callable, nameResolver, kind, valueParameter)
+               ? annotationDeserializer.loadValueParameterAnnotations(classOrPackage, callable, nameResolver, kind, valueParameter)
                : Collections.<AnnotationDescriptor>emptyList();
     }
 }
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java
index d0657e3bf61..30a2c7181fa 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.descriptors.serialization;
 import gnu.trove.TObjectHashingStrategy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
@@ -67,7 +66,7 @@ public class NameTable {
         return simpleNames.intern(name.asString());
     }
 
-    public int getFqNameIndex(@NotNull ClassOrNamespaceDescriptor descriptor) {
+    public int getFqNameIndex(@NotNull ClassOrPackageFragmentDescriptor descriptor) {
         QualifiedName.Builder builder = QualifiedName.newBuilder();
         if (descriptor instanceof ClassDescriptor) {
             builder.setKind(QualifiedName.Kind.CLASS);
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
index a075f75cb26..b818a09fa3c 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationDeserializer.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 
 import java.util.List;
@@ -36,7 +36,7 @@ public interface AnnotationDeserializer {
         @NotNull
         @Override
         public List<AnnotationDescriptor> loadCallableAnnotations(
-                @NotNull ClassOrNamespaceDescriptor container,
+                @NotNull ClassOrPackageFragmentDescriptor container,
                 @NotNull ProtoBuf.Callable proto,
                 @NotNull NameResolver nameResolver,
                 @NotNull AnnotatedCallableKind kind
@@ -47,7 +47,7 @@ public interface AnnotationDeserializer {
         @NotNull
         @Override
         public List<AnnotationDescriptor> loadValueParameterAnnotations(
-                @NotNull ClassOrNamespaceDescriptor container,
+                @NotNull ClassOrPackageFragmentDescriptor container,
                 @NotNull ProtoBuf.Callable callable,
                 @NotNull NameResolver nameResolver,
                 @NotNull AnnotatedCallableKind kind,
@@ -74,7 +74,7 @@ public interface AnnotationDeserializer {
 
     @NotNull
     List<AnnotationDescriptor> loadCallableAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable proto,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind
@@ -82,7 +82,7 @@ public interface AnnotationDeserializer {
 
     @NotNull
     List<AnnotationDescriptor> loadValueParameterAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable callable,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind,
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
index 7dd74c8758a..3dc53c4a4c5 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
@@ -152,7 +152,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
             return fragments.iterator().next();
         }
         else {
-            ClassOrNamespaceDescriptor result = descriptorFinder.findClass(classId.getOuterClassId());
+            ClassOrPackageFragmentDescriptor result = descriptorFinder.findClass(classId.getOuterClassId());
             return result != null ? result : ErrorUtils.getErrorModule();
         }
     }
diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java
index 25c853539d0..75e5cd51201 100644
--- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java
+++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java
@@ -76,14 +76,14 @@ public class RecursiveDescriptorComparator {
     }
 
     private void appendDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull Printer printer, boolean topLevel) {
-        if ((descriptor instanceof ClassOrNamespaceDescriptor || descriptor instanceof PackageViewDescriptor) && !topLevel) {
+        if ((descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) && !topLevel) {
             printer.println();
         }
 
         boolean isPrimaryConstructor = descriptor instanceof ConstructorDescriptor && ((ConstructorDescriptor) descriptor).isPrimary();
         printer.print(isPrimaryConstructor && conf.checkPrimaryConstructors ? "/*primary*/ " : "", conf.renderer.render(descriptor));
 
-        if (descriptor instanceof ClassOrNamespaceDescriptor || descriptor instanceof PackageViewDescriptor) {
+        if (descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) {
             if (!topLevel) {
                 printer.printlnWithNoIndent(" {").pushIndent();
             }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
index 1e5c0cd8352..605f486c6a8 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.java.descriptor;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
 import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
 
@@ -26,7 +26,7 @@ public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl
     private final JavaClassDescriptor samInterface;
 
     public SamConstructorDescriptor(
-            @NotNull ClassOrNamespaceDescriptor containingDeclaration,
+            @NotNull ClassOrPackageFragmentDescriptor containingDeclaration,
             @NotNull JavaClassDescriptor samInterface
     ) {
         super(containingDeclaration, samInterface.getAnnotations(), samInterface.getName(), Kind.SYNTHESIZED);
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
index 131eda1f175..9726c2283b6 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
@@ -130,7 +130,7 @@ public final class DescriptorResolverUtils {
                "valueOf(java.lang.String)".equals(signature);
     }
 
-    public static boolean isCorrectOwnerForEnumMethod(@NotNull ClassOrNamespaceDescriptor ownerDescriptor, @NotNull JavaMethod method) {
+    public static boolean isCorrectOwnerForEnumMethod(@NotNull ClassOrPackageFragmentDescriptor ownerDescriptor, @NotNull JavaMethod method) {
         return isEnumClassObject(ownerDescriptor) == shouldBeInEnumClassObject(method);
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
index 629bb9f74f5..dc4e157c4d5 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
@@ -208,7 +208,7 @@ public final class JavaClassResolver {
             return alreadyResolved;
         }
 
-        ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass());
+        ClassOrPackageFragmentDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass());
         // class may be resolved during resolution of parent
         ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName));
         if (cachedDescriptor != null) {
@@ -242,7 +242,7 @@ public final class JavaClassResolver {
             @NotNull FqName fqName,
             @NotNull JavaClass javaClass,
             @NotNull PostponedTasks taskList,
-            @NotNull ClassOrNamespaceDescriptor containingDeclaration
+            @NotNull ClassOrPackageFragmentDescriptor containingDeclaration
     ) {
         ClassDescriptorFromJvmBytecode classDescriptor =
                 new ClassDescriptorFromJvmBytecode(containingDeclaration, javaClass.getName(), determineClassKind(javaClass), isInnerClass(javaClass));
@@ -374,7 +374,7 @@ public final class JavaClassResolver {
     }
 
     @NotNull
-    private ClassOrNamespaceDescriptor resolveParentDescriptor(@NotNull FqName childClassFQName, JavaClass parentClass) {
+    private ClassOrPackageFragmentDescriptor resolveParentDescriptor(@NotNull FqName childClassFQName, JavaClass parentClass) {
         if (parentClass != null) {
             FqName parentFqName = parentClass.getFqName();
             ClassDescriptor parentClassDescriptor = resolveClass(parentFqName, INCLUDE_KOTLIN_SOURCES);
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index cc360fd6edc..2f7bf5e5cea 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -87,14 +87,14 @@ public final class JavaFunctionResolver {
     }
 
     @Nullable
-    SimpleFunctionDescriptor resolveFunctionMutely(@NotNull JavaMethod method, @NotNull ClassOrNamespaceDescriptor owner) {
+    SimpleFunctionDescriptor resolveFunctionMutely(@NotNull JavaMethod method, @NotNull ClassOrPackageFragmentDescriptor owner) {
         return resolveMethodToFunctionDescriptor(method, owner, false);
     }
 
     @Nullable
     private SimpleFunctionDescriptor resolveMethodToFunctionDescriptor(
             @NotNull JavaMethod method,
-            @NotNull ClassOrNamespaceDescriptor ownerDescriptor,
+            @NotNull ClassOrPackageFragmentDescriptor ownerDescriptor,
             boolean record
     ) {
         if (!DescriptorResolverUtils.isCorrectOwnerForEnumMethod(ownerDescriptor, method)) {
@@ -179,7 +179,7 @@ public final class JavaFunctionResolver {
     }
 
     @NotNull
-    public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
+    public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
         Name methodName = members.getName();
 
         Set<SimpleFunctionDescriptor> functionsFromCurrent = new HashSet<SimpleFunctionDescriptor>();
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
index 46a6f2cfbf8..e96483f9c18 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
@@ -60,12 +60,12 @@ public class JavaMemberResolver {
     }
 
     @NotNull
-    public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
+    public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
         return functionResolver.resolveFunctionGroupForClass(members, owner);
     }
 
     @NotNull
-    public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor ownerDescriptor) {
+    public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor ownerDescriptor) {
         return propertyResolver.resolveFieldGroup(members, ownerDescriptor);
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
index 636f9ebb126..a1b8e5b6b58 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
@@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.types.TypeUtils;
 import javax.inject.Inject;
 import java.util.*;
 
-import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClass;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject;
 import static org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils.resolveOverrides;
 
@@ -67,7 +66,7 @@ public final class JavaPropertyResolver {
     }
 
     @NotNull
-    public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
+    public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
         if (isEnumClassObject(owner)) {
             return Collections.emptySet();
         }
@@ -101,7 +100,7 @@ public final class JavaPropertyResolver {
     }
 
     @NotNull
-    private PropertyDescriptor resolveProperty(@NotNull ClassOrNamespaceDescriptor owner, @NotNull Name name, @NotNull JavaField field) {
+    private PropertyDescriptor resolveProperty(@NotNull ClassOrPackageFragmentDescriptor owner, @NotNull Name name, @NotNull JavaField field) {
         assert !field.isEnumEntry() : "Enum entries are resolved into classes, not into properties: " + name;
 
         boolean isVar = !field.isFinal();
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
index c6013a3ad57..9e8b3c5d53d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
@@ -133,7 +133,7 @@ public class SingleAbstractMethodUtils {
 
     @NotNull
     public static SamConstructorDescriptor createSamConstructorFunction(
-            @NotNull ClassOrNamespaceDescriptor owner,
+            @NotNull ClassOrPackageFragmentDescriptor owner,
             @NotNull JavaClassDescriptor samInterface
     ) {
         assert isSamInterface(samInterface) : samInterface;
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
index 65ec908f794..368a7a6fa14 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
@@ -40,13 +40,13 @@ public abstract class JavaBaseScope extends JetScopeImpl {
     @Nullable
     private Collection<DeclarationDescriptor> allDescriptors = null;
     @NotNull
-    protected final ClassOrNamespaceDescriptor descriptor;
+    protected final ClassOrPackageFragmentDescriptor descriptor;
 
     private Collection<ClassDescriptor> innerClasses = null;
 
 
     protected JavaBaseScope(
-            @NotNull ClassOrNamespaceDescriptor descriptor,
+            @NotNull ClassOrPackageFragmentDescriptor descriptor,
             @NotNull JavaMemberResolver memberResolver,
             @NotNull MembersProvider membersProvider
     ) {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
index 462f912962a..991076daa59 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
@@ -28,7 +28,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope {
     private Map<Name, ClassDescriptor> innerClassesMap = null;
 
     protected JavaClassMembersScope(
-            @NotNull ClassOrNamespaceDescriptor descriptor,
+            @NotNull ClassOrPackageFragmentDescriptor descriptor,
             @NotNull MembersProvider membersProvider,
             @NotNull JavaMemberResolver memberResolver
     ) {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaEnumClassObjectScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaEnumClassObjectScope.java
index 64a12e2a8cb..f0373a35595 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaEnumClassObjectScope.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaEnumClassObjectScope.java
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.scope;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.java.resolver.JavaMemberResolver;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
 
@@ -27,7 +27,7 @@ import java.util.Collections;
 
 public class JavaEnumClassObjectScope extends JavaClassMembersScope {
     public JavaEnumClassObjectScope(
-            @NotNull ClassOrNamespaceDescriptor descriptor,
+            @NotNull ClassOrPackageFragmentDescriptor descriptor,
             @NotNull JavaClass javaClass,
             @NotNull JavaMemberResolver memberResolver
     ) {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
index 498dff928d4..85002c2201b 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
@@ -110,7 +110,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
     }
 
     @Nullable
-    private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrNamespaceDescriptor descriptor) {
+    private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrPackageFragmentDescriptor descriptor) {
         if (descriptor instanceof ClassDescriptor) {
             return kotlinClassFinder.findKotlinClass(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor)));
         }
@@ -218,7 +218,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
     @NotNull
     @Override
     public List<AnnotationDescriptor> loadCallableAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable proto,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind
@@ -231,7 +231,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
 
     @NotNull
     private List<AnnotationDescriptor> findClassAndLoadMemberAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable proto,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind,
@@ -249,7 +249,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
 
     @Nullable
     private KotlinJvmBinaryClass findClassWithMemberAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable proto,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind
@@ -259,7 +259,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
         }
         else if (isClassObject(container) && isStaticFieldInOuter(proto)) {
             // Backing fields of properties of a class object are generated in the outer class
-            return findKotlinClassByDescriptor((ClassOrNamespaceDescriptor) container.getContainingDeclaration());
+            return findKotlinClassByDescriptor((ClassOrPackageFragmentDescriptor) container.getContainingDeclaration());
         }
         else if (isTrait(container) && kind == AnnotatedCallableKind.PROPERTY) {
             PackageFragmentDescriptor containingPackage = DescriptorUtils.getParentOfType(container, PackageFragmentDescriptor.class);
@@ -497,7 +497,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
     @NotNull
     @Override
     public List<AnnotationDescriptor> loadValueParameterAnnotations(
-            @NotNull ClassOrNamespaceDescriptor container,
+            @NotNull ClassOrPackageFragmentDescriptor container,
             @NotNull ProtoBuf.Callable callable,
             @NotNull NameResolver nameResolver,
             @NotNull AnnotatedCallableKind kind,
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
index 18a42860061..1ffc3e45d0f 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
 import java.util.Collection;
 import java.util.List;
 
-public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor, ClassOrNamespaceDescriptor {
+public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor, ClassOrPackageFragmentDescriptor {
 
     @NotNull
     JetScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments);
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java
similarity index 87%
rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java
rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java
index 48faef124ef..3200a637c3a 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java
@@ -16,5 +16,5 @@
 
 package org.jetbrains.jet.lang.descriptors;
 
-public interface ClassOrNamespaceDescriptor extends DeclarationDescriptorNonRoot {
+public interface ClassOrPackageFragmentDescriptor extends DeclarationDescriptorNonRoot {
 }
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java
index 3e626a336df..3dbdcf3cb6a 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 
-public interface PackageFragmentDescriptor extends ClassOrNamespaceDescriptor {
+public interface PackageFragmentDescriptor extends ClassOrPackageFragmentDescriptor {
     @NotNull
     PackageFragmentProvider getProvider();
 
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
index 675641ce9c3..7af9fa379d2 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
@@ -110,8 +110,8 @@ public final class DecompiledNavigationUtils {
     //TODO: navigate to inner classes
     @Nullable
     private static FqName getContainerFqName(@NotNull DeclarationDescriptor referencedDescriptor) {
-        ClassOrNamespaceDescriptor
-                containerDescriptor = DescriptorUtils.getParentOfType(referencedDescriptor, ClassOrNamespaceDescriptor.class, false);
+        ClassOrPackageFragmentDescriptor
+                containerDescriptor = DescriptorUtils.getParentOfType(referencedDescriptor, ClassOrPackageFragmentDescriptor.class, false);
         if (containerDescriptor instanceof PackageFragmentDescriptor) {
             return PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) containerDescriptor).getFqName());
         }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.java
index 2389d4af1f0..2d21e89c4f9 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.java
@@ -95,7 +95,7 @@ public final class UsageTracker {
             }
 
             // local named function
-            if (!(containingDeclaration instanceof ClassOrNamespaceDescriptor) &&
+            if (!(containingDeclaration instanceof ClassOrPackageFragmentDescriptor) &&
                 !isAncestor(memberDescriptor, descriptor)) {
                 addCapturedMember(callableDescriptor);
             }