diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 851c600b223..a46cb66c93f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -112,7 +112,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
      */
     private final Map<JetElement, StackValue.Local> tempVariables = Maps.newHashMap();
     @NotNull
-    private final TailRecursionGeneratorUtil tailRecursionGeneratorUtil;
+    private final TailRecursionCodegen tailRecursionCodegen;
 
     public CalculatedClosure generateObjectLiteral(GenerationState state, JetObjectLiteralExpression literal) {
         JetObjectDeclaration objectDeclaration = literal.getObjectDeclaration();
@@ -182,7 +182,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         this.bindingContext = state.getBindingContext();
         this.context = context;
         this.statementVisitor = new CodegenStatementVisitor(this);
-        this.tailRecursionGeneratorUtil = new TailRecursionGeneratorUtil(context, this, this.v, state);
+        this.tailRecursionCodegen = new TailRecursionCodegen(context, this, this.v, state);
     }
 
     protected InstructionAdapter createInstructionAdapter(MethodVisitor mv) {
@@ -2146,8 +2146,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
     private void pushArgumentsAndInvoke(@NotNull ResolvedCall<?> resolvedCall, @NotNull CallableMethod callable) {
         int mask = pushMethodArguments(resolvedCall, callable.getValueParameterTypes());
 
-        if (tailRecursionGeneratorUtil.isTailRecursion(resolvedCall)) {
-            tailRecursionGeneratorUtil.generateTailRecursion(resolvedCall);
+        if (tailRecursionCodegen.isTailRecursion(resolvedCall)) {
+            tailRecursionCodegen.generateTailRecursion(resolvedCall);
             return;
         }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionGeneratorUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionGeneratorUtil.java
rename to compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
index 9edf5e75fdc..afd9f0ac9df 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionGeneratorUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
@@ -36,7 +36,7 @@ import java.util.List;
 import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL;
 import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL;
 
-public class TailRecursionGeneratorUtil {
+public class TailRecursionCodegen {
 
     @NotNull
     private final MethodContext context;
@@ -47,7 +47,7 @@ public class TailRecursionGeneratorUtil {
     @NotNull
     private final GenerationState state;
 
-    public TailRecursionGeneratorUtil(
+    public TailRecursionCodegen(
             @NotNull MethodContext context,
             @NotNull ExpressionCodegen codegen,
             @NotNull InstructionAdapter v,