diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
index 3b8847a1ca3..cefc18ec8f4 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
@@ -117,7 +117,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
     }
 
     private fun checkClass(classDescriptor: ClassDescriptor) {
-        classDescriptor.getDefaultType().getMemberScope().getAllDescriptors().filterIsInstance(javaClass<CallableDescriptor>()).forEach {
+        classDescriptor.getDefaultType().getMemberScope().getDescriptors().filterIsInstance(javaClass<CallableDescriptor>()).forEach {
             checkCallable(it)
         }
 
diff --git a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
index 3751a5c169e..c3fb71aa627 100644
--- a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
+++ b/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
@@ -51,12 +51,12 @@ fun generate(): String {
 
     val builtIns = KotlinBuiltIns.getInstance()
     [suppress("UNCHECKED_CAST")]
-    val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getAllDescriptors()
+    val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getDescriptors()
             .filter { it is ClassDescriptor && builtIns.isPrimitiveType(it.getDefaultType()) } as List<ClassDescriptor>
 
     for (descriptor in allPrimitiveTypes + builtIns.getString()) {
         [suppress("UNCHECKED_CAST")]
-        val functions = descriptor.getMemberScope(Collections.emptyList()).getAllDescriptors()
+        val functions = descriptor.getMemberScope(Collections.emptyList()).getDescriptors()
                 .filter { it is FunctionDescriptor && !EXCLUDED_FUNCTIONS.contains(it.getName().asString()) } as List<FunctionDescriptor>
 
         for (function in functions) {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
index 3be40ea0508..5f08aad4eaa 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
@@ -153,7 +153,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
                     builder.append(subindent)
                     appendDescriptor(classObject, subindent)
                 }
-                for (member in sortDeclarations(descriptor.getDefaultType().getMemberScope().getAllDescriptors())) {
+                for (member in sortDeclarations(descriptor.getDefaultType().getMemberScope().getDescriptors())) {
                     if (member.getContainingDeclaration() != descriptor) {
                         continue
                     }
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
index 930b7303879..4976bce7a40 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
@@ -68,7 +68,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
                 JavaProtoBufUtil.readPackageDataFrom(annotationData),
                 deserializationContext
         ) { listOf() }
-        return membersScope.getAllDescriptors()
+        return membersScope.getDescriptors()
     }
 
     private val localClassFinder = object : KotlinClassFinder {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt
index 1bc6aee46f2..bc0a144cce8 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt
@@ -50,7 +50,7 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<Tr
         val children = ArrayList<TreeElement>()
 
         val defaultType = descriptor.getDefaultType()
-        for (memberDescriptor in defaultType.getMemberScope().getAllDescriptors()) {
+        for (memberDescriptor in defaultType.getMemberScope().getDescriptors()) {
             if (memberDescriptor !is CallableMemberDescriptor) continue
 
             when (memberDescriptor.getKind()) {