diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java
index 5967c3f09a6..2f809423585 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.java
@@ -23,7 +23,7 @@ public interface JetElement extends NavigatablePsiElement {
     @NotNull
     JetFile getContainingJetFile();
 
-    <D> void acceptChildren(@NotNull JetTreeVisitor<D> visitor, D data);
+    <D> void acceptChildren(@NotNull JetVisitor<Void, D> visitor, D data);
 
     <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data);
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java
index 81e00ca6865..5248c7ddaf6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java
@@ -62,7 +62,7 @@ public class JetElementImpl extends ASTWrapperPsiElement implements JetElement {
     }
 
     @Override
-    public <D> void acceptChildren(@NotNull JetTreeVisitor<D> visitor, D data) {
+    public <D> void acceptChildren(@NotNull JetVisitor<Void, D> visitor, D data) {
         JetPsiUtil.visitChildren(this, visitor, data);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
index 2ecf9e16ae2..2385cec8c01 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
@@ -70,7 +70,7 @@ public class JetElementImplStub<T extends StubElement> extends StubBasedPsiEleme
     }
 
     @Override
-    public <D> void acceptChildren(@NotNull JetTreeVisitor<D> visitor, D data) {
+    public <D> void acceptChildren(@NotNull JetVisitor<Void, D> visitor, D data) {
         PsiElement child = getFirstChild();
         while (child != null) {
             if (child instanceof JetElement) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java
index 2bd6f1f834b..17e7db9f593 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java
@@ -213,7 +213,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
     }
 
     @Override
-    public <D> void acceptChildren(@NotNull JetTreeVisitor<D> visitor, D data) {
+    public <D> void acceptChildren(@NotNull JetVisitor<Void, D> visitor, D data) {
         JetPsiUtil.visitChildren(this, visitor, data);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
index 052152421db..24af2ab33c7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
@@ -59,7 +59,7 @@ public class JetPsiUtil {
         JetExpression getBaseExpression();
     }
 
-    public static <D> void visitChildren(@NotNull JetElement element, @NotNull JetTreeVisitor<D> visitor, D data) {
+    public static <D> void visitChildren(@NotNull JetElement element, @NotNull JetVisitor<Void, D> visitor, D data) {
         PsiElement child = element.getFirstChild();
         while (child != null) {
             if (child instanceof JetElement) {