diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersByNameCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java
similarity index 98%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersByNameCache.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java
index e4574d705a6..cda5c29bdfe 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersByNameCache.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-public final class MembersByNameCache {
+public final class MembersCache {
 
     @NotNull
     private final Map<Name, NamedMembers> namedMembersMap = new HashMap<Name, NamedMembers>();
@@ -55,13 +55,13 @@ public final class MembersByNameCache {
     }
 
     @NotNull
-    public static MembersByNameCache buildMembersByNameCache(
+    public static MembersCache buildMembersByNameCache(
             @Nullable PsiClass psiClass,
             @Nullable PsiPackage psiPackage,
             boolean staticMembers,
             boolean isKotlin
     ) {
-        MembersByNameCache cache = new MembersByNameCache();
+        MembersCache cache = new MembersCache();
         if (psiClass != null) {
             cache.new ClassProcessor(new PsiClassWrapper(psiClass), staticMembers, isKotlin).process();
         }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
index bfd90983085..63ff6fbec96 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
 import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
-import org.jetbrains.jet.lang.resolve.java.MembersByNameCache;
+import org.jetbrains.jet.lang.resolve.java.MembersCache;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
@@ -118,12 +118,12 @@ public abstract class ResolverScopeData {
         }
     }
 
-    private MembersByNameCache membersCache = null;
+    private MembersCache membersCache = null;
 
     @NotNull
-    public MembersByNameCache getMembersCache() {
+    public MembersCache getMembersCache() {
         if (membersCache == null) {
-            membersCache = MembersByNameCache.buildMembersByNameCache(psiClass, psiPackage, staticMembers, kotlin);
+            membersCache = MembersCache.buildMembersByNameCache(psiClass, psiPackage, staticMembers, kotlin);
         }
         return membersCache;
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index 70c340e5b27..7d0f915365a 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -221,7 +221,7 @@ public final class JavaFunctionResolver {
 
     @NotNull
     public Set<FunctionDescriptor> resolveFunctionGroup(Name methodName, ResolverScopeData scopeData) {
-        MembersByNameCache namedMembersMap = scopeData.getMembersCache();
+        MembersCache namedMembersMap = scopeData.getMembersCache();
 
         NamedMembers namedMembers = namedMembersMap.get(methodName);
         if (namedMembers == null) {