diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
index 51ef3b3aef5..92d1807cec3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
@@ -90,7 +90,7 @@ public class ResolveSessionUtils {
         }
     }
 
-    public static @NotNull BindingContext getExpressionBindingContext(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
+    public static @NotNull BindingContext resolveToExpression(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
         final DelegatingBindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext());
 
         JetFile file = (JetFile) expression.getContainingFile();
diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
index ec4e75d3ea3..62c4d9d48d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
@@ -156,7 +156,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
             @NotNull ResolveSession resolveSession,
             @NotNull GlobalSearchScope scope
     ) {
-        BindingContext context = ResolveSessionUtils.getExpressionBindingContext(resolveSession, expression);
+        BindingContext context = ResolveSessionUtils.resolveToExpression(resolveSession, expression);
         JetScope jetScope = context.get(BindingContext.RESOLUTION_SCOPE, expression);
 
         if (jetScope == null || name.isEmpty()) {
@@ -238,7 +238,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
     ) {
         Collection<DeclarationDescriptor> resultDescriptors = new ArrayList<DeclarationDescriptor>();
 
-        BindingContext context = ResolveSessionUtils.getExpressionBindingContext(resolveSession, expression);
+        BindingContext context = ResolveSessionUtils.resolveToExpression(resolveSession, expression);
         JetExpression receiverExpression = expression.getReceiverExpression();
 
         if (receiverExpression != null) {
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
index e29431bccea..4860f777225 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
@@ -35,8 +35,8 @@ import org.jetbrains.jet.cli.jvm.compiler.TipsManager;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
+import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.caches.JetCacheManager;
@@ -84,7 +84,7 @@ public class JetCompletionContributor extends CompletionContributor {
                            session.resolveSession =
                                    WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile());
 
-                           session.expressionBindingContext = ResolveSessionUtils.getExpressionBindingContext(
+                           session.expressionBindingContext = ResolveSessionUtils.resolveToExpression(
                                    session.resolveSession, jetReference.getExpression());
 
                            JetScope scope = session.expressionBindingContext.get(BindingContext.RESOLUTION_SCOPE, jetReference.getExpression());
@@ -96,7 +96,7 @@ public class JetCompletionContributor extends CompletionContributor {
                                // Rerun completion if nothing was found
                                session.customInvocationCount = 1;
                                session.resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile());
-                               session.expressionBindingContext = ResolveSessionUtils.getExpressionBindingContext(
+                               session.expressionBindingContext = ResolveSessionUtils.resolveToExpression(
                                        session.resolveSession, jetReference.getExpression());
 
                                completeForReference(parameters, result, position, jetReference, session);
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
index 64486a4491d..a3a34ce852a 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
@@ -75,7 +75,7 @@ public class JetPackagesContributor extends CompletionContributor {
 
                            ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile(
                                    (JetFile) simpleNameReference.getExpression().getContainingFile());
-                           BindingContext bindingContext = ResolveSessionUtils.getExpressionBindingContext(
+                           BindingContext bindingContext = ResolveSessionUtils.resolveToExpression(
                                    resolveSession, simpleNameReference.getExpression());
 
                            for (LookupElement variant : DescriptorLookupConverter.collectLookupElements(
diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
index 8e999bf912d..e5c30820667 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
@@ -64,7 +64,7 @@ public class JetSimpleNameReference extends JetPsiReference {
     @Override
     public Object[] getVariants() {
         ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) getExpression().getContainingFile());
-        BindingContext bindingContext = ResolveSessionUtils.getExpressionBindingContext(resolveSession, getExpression());
+        BindingContext bindingContext = ResolveSessionUtils.resolveToExpression(resolveSession, getExpression());
 
         return DescriptorLookupConverter.collectLookupElements(
                 resolveSession, bindingContext, TipsManager.getReferenceVariants(myExpression, bindingContext));