diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java
index 073fc7a2748..39ff97d369e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java
@@ -41,12 +41,12 @@ public class FieldRemapper {
         params = methodParams;
     }
 
-    public boolean canProcess(@NotNull String fieldOwner, boolean forTransformation) {
+    public boolean canProcess(@NotNull String fieldOwner, boolean isFolding) {
         return fieldOwner.equals(getLambdaInternalName());
     }
 
     @Nullable
-    public AbstractInsnNode transformIfNeeded(
+    public AbstractInsnNode foldFieldAccessChainIfNeeded(
             @NotNull List<AbstractInsnNode> capturedFieldAccess,
             @NotNull MethodNode node
     ) {
@@ -55,11 +55,11 @@ public class FieldRemapper {
             return null;
         }
 
-        return transformIfNeeded(capturedFieldAccess, 1, node);
+        return foldFieldAccessChainIfNeeded(capturedFieldAccess, 1, node);
     }
 
     @Nullable
-    private AbstractInsnNode transformIfNeeded(
+    private AbstractInsnNode foldFieldAccessChainIfNeeded(
             @NotNull List<AbstractInsnNode> capturedFieldAccess,
             int currentInstruction,
             @NotNull MethodNode node
@@ -67,7 +67,7 @@ public class FieldRemapper {
         AbstractInsnNode transformed = null;
         boolean checkParent = !isRoot() && currentInstruction < capturedFieldAccess.size() - 1;
         if (checkParent) {
-            transformed = parent.transformIfNeeded(capturedFieldAccess, currentInstruction + 1, node);
+            transformed = parent.foldFieldAccessChainIfNeeded(capturedFieldAccess, currentInstruction + 1, node);
         }
 
         if (transformed == null) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java
index 53996d7eb6f..0aa19f63a0d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java
@@ -34,8 +34,8 @@ public class InlinedLambdaRemapper extends FieldRemapper {
 
 
     @Override
-    public boolean canProcess(@NotNull String fieldOwner, boolean forTransformation) {
-        return forTransformation ? super.canProcess(fieldOwner, forTransformation) : false;
+    public boolean canProcess(@NotNull String fieldOwner, boolean isFolding) {
+        return isFolding ? super.canProcess(fieldOwner, isFolding) : false;
     }
 
     @Override
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
index 41df4cb5610..66683d98131 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
@@ -410,7 +410,7 @@ public class MethodInliner {
             if (cur instanceof VarInsnNode && cur.getOpcode() == Opcodes.ALOAD) {
                 if (((VarInsnNode) cur).var == 0) {
                     List<AbstractInsnNode> accessChain = getCapturedFieldAccessChain((VarInsnNode) cur);
-                    AbstractInsnNode insnNode = nodeRemapper.transformIfNeeded(accessChain, node);
+                    AbstractInsnNode insnNode = nodeRemapper.foldFieldAccessChainIfNeeded(accessChain, node);
                     if (insnNode != null) {
                         cur = insnNode;
                     }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java
index aba49ba99dc..f176f605ef8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java
@@ -51,8 +51,8 @@ public class RegeneratedLambdaFieldRemapper extends FieldRemapper {
     }
 
     @Override
-    public boolean canProcess(@NotNull String fieldOwner, boolean forTransformation) {
-        return super.canProcess(fieldOwner, forTransformation) || isRecapturedLambdaType(fieldOwner);
+    public boolean canProcess(@NotNull String fieldOwner, boolean isFolding) {
+        return super.canProcess(fieldOwner, isFolding) || isRecapturedLambdaType(fieldOwner);
     }
 
     private boolean isRecapturedLambdaType(String owner) {