diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
index ca844c8b8b4..cd04c0de3ae 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
@@ -154,7 +154,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
                 if (packageDescriptor == null) {
                     return Collections.emptyList();
                 }
-                return packageDescriptor.getDeclarationProvider().getAllDeclaredPackages();
+                return packageDescriptor.getDeclarationProvider().getAllDeclaredSubPackages();
             }
         };
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java
index 24f5fccb92d..e6149a930ea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java
@@ -32,7 +32,7 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
     private final FqName fqName;
     private final FileBasedDeclarationProviderFactory factory;
     private final Collection<JetFile> packageFiles;
-    private final NotNullLazyValue<Collection<FqName>> allDeclaredPackages;
+    private final NotNullLazyValue<Collection<FqName>> allDeclaredSubPackages;
 
 
     /*package*/ FileBasedPackageMemberDeclarationProvider(
@@ -45,7 +45,7 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
         this.fqName = _fqName;
         this.factory = _factory;
         this.packageFiles = packageFiles;
-        this.allDeclaredPackages = storageManager.createLazyValue(new Function0<Collection<FqName>>() {
+        this.allDeclaredSubPackages = storageManager.createLazyValue(new Function0<Collection<FqName>>() {
             @Override
             public Collection<FqName> invoke() {
                 return factory.getAllDeclaredSubPackagesOf(fqName);
@@ -65,8 +65,8 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
 
     @NotNull
     @Override
-    public Collection<FqName> getAllDeclaredPackages() {
-        return allDeclaredPackages.invoke();
+    public Collection<FqName> getAllDeclaredSubPackages() {
+        return allDeclaredSubPackages.invoke();
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.java
index 6a8423bfbba..3d6530287ce 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.java
@@ -26,10 +26,9 @@ import java.util.Collection;
 
 public interface PackageMemberDeclarationProvider extends DeclarationProvider {
 
-    //TODO: method name
     @ReadOnly
     @NotNull
-    Collection<FqName> getAllDeclaredPackages();
+    Collection<FqName> getAllDeclaredSubPackages();
 
     @ReadOnly
     @NotNull
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/CombinedPackageMemberDeclarationProvider.kt b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/CombinedPackageMemberDeclarationProvider.kt
index f10926d5e44..f3b9396376e 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/CombinedPackageMemberDeclarationProvider.kt
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/CombinedPackageMemberDeclarationProvider.kt
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.name.Name
 
 public class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
-    override fun getAllDeclaredPackages() = providers.flatMap { it.getAllDeclaredPackages() }
+    override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() }
 
     override fun getPackageDeclarations(fqName: FqName) = providers.flatMap { it.getPackageDeclarations(fqName) }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
index bea13ed89c3..19f6ccb05c4 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
@@ -58,7 +58,7 @@ public class StubBasedPackageMemberDeclarationProvider(
         return JetTopLevelPropertiesFqnNameIndex.getInstance().get(childName(name), project, searchScope)
     }
 
-    override fun getAllDeclaredPackages(): Collection<FqName> {
+    override fun getAllDeclaredSubPackages(): Collection<FqName> {
         //TODO: duplication with light class generation support
         val allPackagesInProject = JetAllPackagesIndex.getInstance().getAllKeys(project)
         return allPackagesInProject.filter {