diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResult.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResult.java
index b0c291562ac7..b84cea3d8c65 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResult.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResult.java
@@ -25,7 +25,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.SpreadState;
 
 public class GroovyMethodResult extends GroovyResolveResultImpl {
 
-  private final NotNullLazyValue<PsiSubstitutor> mySubstitutorInferer;
+  private final NotNullLazyValue<PsiSubstitutor> mySubstitutorComputer;
 
   public GroovyMethodResult(@NotNull PsiMethod method,
                             @Nullable PsiElement resolveContext,
@@ -33,17 +33,17 @@ public class GroovyMethodResult extends GroovyResolveResultImpl {
                             @NotNull PsiSubstitutor substitutor,
                             boolean isAccessible, boolean staticsOK) {
     super(method, resolveContext, spreadState, substitutor, isAccessible, staticsOK, true, true);
-    mySubstitutorInferer = NotNullLazyValue.createConstantValue(substitutor);
+    mySubstitutorComputer = NotNullLazyValue.createConstantValue(substitutor);
   }
 
   public GroovyMethodResult(@NotNull PsiMethod element,
                             @Nullable PsiElement resolveContext,
                             @Nullable SpreadState spreadState,
                             @NotNull PsiSubstitutor partialSubstitutor,
-                            @NotNull NotNullLazyValue<PsiSubstitutor> substitutorInferer,
+                            @NotNull NotNullLazyValue<PsiSubstitutor> substitutorComputer,
                             boolean isAccessible, boolean staticsOK, boolean isApplicable) {
     super(element, resolveContext, spreadState, partialSubstitutor, isAccessible, staticsOK, false, isApplicable);
-    mySubstitutorInferer = substitutorInferer;
+    mySubstitutorComputer = substitutorComputer;
   }
 
   @NotNull
@@ -55,11 +55,11 @@ public class GroovyMethodResult extends GroovyResolveResultImpl {
   @NotNull
   @Override
   public PsiSubstitutor getSubstitutor() {
-    return mySubstitutorInferer.getValue();
+    return mySubstitutorComputer.getValue();
   }
 
   @NotNull
   public PsiSubstitutor getSubstitutor(boolean infer) {
-    return infer ? mySubstitutorInferer.getValue() : super.getSubstitutor();
+    return infer ? mySubstitutorComputer.getValue() : super.getSubstitutor();
   }
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
index 60a6db54a443..7ad48d1f7a80 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
@@ -108,7 +108,7 @@ public class MethodResolverProcessor extends ResolverProcessor<GroovyMethodResul
       final PsiElement resolveContext = state.get(RESOLVE_CONTEXT);
       final SpreadState spreadState = state.get(SpreadState.SPREAD_STATE);
       final PsiSubstitutor partialSubstitutor = getSubstitutor(state);
-      final NotNullLazyValue<PsiSubstitutor> substitutorInferer
+      final NotNullLazyValue<PsiSubstitutor> substitutorComputer
         = myByShape ? NotNullLazyValue.createConstantValue(partialSubstitutor) : new NotNullLazyValue<PsiSubstitutor>() {
         @NotNull
         @Override
@@ -123,7 +123,7 @@ public class MethodResolverProcessor extends ResolverProcessor<GroovyMethodResul
       boolean isValidResult = isStaticsOK && isAccessible && isApplicable;
 
       GroovyMethodResult candidate = new GroovyMethodResult(
-        method, resolveContext, spreadState, partialSubstitutor, substitutorInferer, isAccessible, isStaticsOK, isValidResult
+        method, resolveContext, spreadState, partialSubstitutor, substitutorComputer, isAccessible, isStaticsOK, isValidResult
       );
 
       if (!myAllVariants && isValidResult) {