diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 91ab9de067..8e15b071eb 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -298,7 +298,7 @@ public interface Node {
      * @return What the visitor returned
      */
     // TODO remove the default implementation, convert all visitors to be generic
-    default <R, P> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
+    default <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
         // override me
         return visitor.visitNode(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
index 2685fe4cd9..a50522a092 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
@@ -34,7 +34,7 @@ public abstract class AbstractJavaNode extends AbstractJjtreeNode<AbstractJavaNo
     }
 
     @Override
-    public final <R, P> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
+    public final <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
         if (visitor instanceof JavaVisitor) {
             return this.acceptVisitor((JavaVisitor<? super P, ? extends R>) visitor, data);
         }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
index 8d4af2e0b5..d325167911 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
@@ -14,7 +14,7 @@ abstract class AbstractJspNode extends AbstractJjtreeNode<AbstractJspNode, JspNo
     }
 
     @Override
-    public final <R, P> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
+    public final <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
         if (visitor instanceof JspVisitor) {
             return this.acceptVisitor((JspVisitor<? super P, ? extends R>) visitor, data);
         }
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index e924638054..caf0f8e2c0 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -34,7 +34,7 @@ abstract class AbstractScalaNode<T extends Tree> extends AbstractNode<AbstractSc
     }
 
     @Override
-    public <R, P> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
+    public <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
         if (visitor instanceof ScalaParserVisitor) {
             return this.acceptVisitor((ScalaParserVisitor<P, R>) visitor, data);
         }