diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
index 59ad4dd31f5..181faebb6fa 100644
--- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
@@ -36,8 +36,8 @@ public interface JetControlFlowBuilder {
     JetElement getCurrentLoop();
 
     // Finally
-    void pushFinally(@NotNull JetBlockExpression expression);
-    void popFinally();
+    void enterTryFinally(@NotNull JetBlockExpression expression);
+    void exitTryFinally();
 
     // Subroutines
     void enterSubroutine(@NotNull JetElement subroutine);
diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowGraphBuilder.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowGraphBuilder.java
index fe5239a42eb..3f0a020c497 100644
--- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowGraphBuilder.java
+++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowGraphBuilder.java
@@ -221,7 +221,7 @@ package org.jetbrains.jet.lang.cfg;
 //    }
 //
 //    @Override
-//    public void popFinally() {
+//    public void exitTryFinally() {
 //        throw new UnsupportedOperationException(); // TODO
 //    }
 //
@@ -236,7 +236,7 @@ package org.jetbrains.jet.lang.cfg;
 //    }
 //
 //    @Override
-//    public void pushFinally(JetBlockExpression expression) {
+//    public void enterTryFinally(JetBlockExpression expression) {
 //        throw new UnsupportedOperationException(); // TODO
 //    }
 //
diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
index c7c6800fa1e..e6b360c3a23 100644
--- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
@@ -124,7 +124,7 @@ public class JetControlFlowProcessor {
         public void visitTryExpression(JetTryExpression expression) {
             JetFinallySection finallyBlock = expression.getFinallyBlock();
             if (finallyBlock != null) {
-                builder.pushFinally(finallyBlock.getFinalExpression());
+                builder.enterTryFinally(finallyBlock.getFinalExpression());
             }
 
             List<JetCatchClause> catchClauses = expression.getCatchClauses();
@@ -153,7 +153,7 @@ public class JetControlFlowProcessor {
             }
 
             if (finallyBlock != null) {
-                builder.popFinally();
+                builder.exitTryFinally();
             }
         }
 
diff --git a/idea/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/idea/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
index 90a05542e3a..8c3d0e11094 100644
--- a/idea/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+++ b/idea/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
@@ -158,12 +158,12 @@ public class JetControlFlowInstructionsGenerator implements JetControlFlowBuilde
     }
 
     @Override
-    public void popFinally() {
+    public void enterTryFinally(@NotNull JetBlockExpression expression) {
         throw new UnsupportedOperationException(); // TODO
     }
 
     @Override
-    public void pushFinally(@NotNull JetBlockExpression expression) {
+    public void exitTryFinally() {
         throw new UnsupportedOperationException(); // TODO
     }