diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
index 28b10e59324..600e473c055 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
@@ -186,10 +186,6 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitExpression(expression, data);
     }
 
-//    public R visitNewExpression(@NotNull JetNewExpression expression, D data) {
-//        return visitExpression(expression, data);
-//    }
-//
     public R visitReturnExpression(@NotNull JetReturnExpression expression, D data) {
         return visitLabelQualifiedExpression(expression, data);
     }
@@ -243,7 +239,7 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     }
 
     public R visitCallExpression(@NotNull JetCallExpression expression, D data) {
-        return visitExpression(expression, data);
+        return visitReferenceExpression(expression, data);
     }
 
     public R visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression, D data) {
@@ -373,15 +369,15 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     public R visitWhenConditionInRange(@NotNull JetWhenConditionInRange condition, D data) {
         return visitJetElement(condition, data);
     }
-    
-    public R visitWhenConditionExpression(@NotNull JetWhenConditionWithExpression condition, D data) {
+
+    public R visitWhenConditionWithExpression(@NotNull JetWhenConditionWithExpression condition, D data) {
         return visitJetElement(condition, data);
     }
 
     public R visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, D data) {
         return visitNamedDeclaration(declaration, data);
     }
-    
+
     public R visitObjectDeclarationName(@NotNull JetObjectDeclarationName declarationName, D data) {
         return visitExpression(declarationName, data);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
index 4692d04e670..2e72478f2b0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
@@ -44,6 +44,14 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitNamedDeclaration(property);
     }
 
+    public void visitMultiDeclaration(@NotNull JetMultiDeclaration multiDeclaration) {
+        visitDeclaration(multiDeclaration);
+    }
+
+    public void visitMultiDeclarationEntry(@NotNull JetMultiDeclarationEntry multiDeclarationEntry) {
+        visitNamedDeclaration(multiDeclarationEntry);
+    }
+
     public void visitTypedef(@NotNull JetTypedef typedef) {
         visitNamedDeclaration(typedef);
     }
@@ -176,10 +184,6 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitExpression(expression);
     }
 
-    //    public void visitNewExpression(JetNewExpression expression) {
-//        visitExpression(expression);
-//    }
-//
     public void visitReturnExpression(@NotNull JetReturnExpression expression) {
         visitLabelQualifiedExpression(expression);
     }
@@ -372,8 +376,8 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitNamedDeclaration(declaration);
     }
 
-    public void visitObjectDeclarationName(@NotNull JetObjectDeclarationName declaration) {
-        visitExpression(declaration);
+    public void visitObjectDeclarationName(@NotNull JetObjectDeclarationName declarationName) {
+        visitExpression(declarationName);
     }
 
     public void visitStringTemplateEntry(@NotNull JetStringTemplateEntry entry) {
@@ -399,12 +403,4 @@ public class JetVisitorVoid extends PsiElementVisitor {
     public void visitEscapeStringTemplateEntry(@NotNull JetEscapeStringTemplateEntry entry) {
         visitStringTemplateEntry(entry);
     }
-
-    public void visitMultiDeclaration(@NotNull JetMultiDeclaration declaration) {
-        visitDeclaration(declaration);
-    }
-
-    public void visitMultiDeclarationEntry(@NotNull JetMultiDeclarationEntry entry) {
-        visitNamedDeclaration(entry);
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
index e5b5e6d7ad4..7381e50c97b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
@@ -38,7 +38,7 @@ public class JetWhenConditionWithExpression extends JetWhenCondition {
 
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
-        return visitor.visitWhenConditionExpression(this, data);
+        return visitor.visitWhenConditionWithExpression(this, data);
     }
 
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java b/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java
index c859a1db641..7461b0697cb 100644
--- a/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/util/JetPsiMatcher.java
@@ -237,7 +237,7 @@ public class JetPsiMatcher {
         }
 
         @Override
-        public Boolean visitWhenConditionExpression(@NotNull JetWhenConditionWithExpression condition, JetElement data) {
+        public Boolean visitWhenConditionWithExpression(@NotNull JetWhenConditionWithExpression condition, JetElement data) {
             return checkElementMatch(condition.getExpression(), ((JetWhenConditionWithExpression) data).getExpression());
         }