diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
index 4f3acc19d5..95155214ac 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
@@ -30,11 +30,6 @@ abstract class AbstractPLSQLNode extends AbstractJjtreeNode<AbstractPLSQLNode, P
         return value;
     }
 
-    @Override
-    public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
-        return visitor.visit(this, data);
-    }
-
 
     @Override
     public String getXPathNodeName() {
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
index 0c73e86343..56e753fee6 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
@@ -101,6 +101,6 @@ public abstract class AbstractPLSQLRule extends AbstractRule implements PLSQLPar
      */
     public Object visit(ExecutableCode node, Object data) {
         LOGGER.entering(CLASS_NAME, "visit(ExecutableCode)");
-        return visit((PLSQLNode) node, data);
+        return visitPLSQLNode(node, data);
     }
 }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractCounterCheckRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractCounterCheckRule.java
index b2062dcf45..1e3de2dce2 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractCounterCheckRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractCounterCheckRule.java
@@ -85,7 +85,7 @@ abstract class AbstractCounterCheckRule<T extends PLSQLNode> extends AbstractPLS
     protected abstract int getMetric(T node);
 
     @Override
-    public Object visit(PLSQLNode node, Object data) {
+    public Object visitPLSQLNode(PLSQLNode node, Object data) {
         @SuppressWarnings("unchecked")
         T t = (T) node;
         // since we only visit this node, it's ok
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractNcssCountRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractNcssCountRule.java
index 7a5fe71d58..e7cdcd4ef4 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractNcssCountRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/AbstractNcssCountRule.java
@@ -50,13 +50,13 @@ public abstract class AbstractNcssCountRule<T extends PLSQLNode> extends Abstrac
 
     @Override
     protected int getMetric(T node) {
-        return (Integer) new NcssVisitor().visit(node, null) + 1;
+        return 1 + (Integer) node.jjtAccept(new NcssVisitor(), null);
     }
 
     private static class NcssVisitor extends PLSQLParserVisitorAdapter {
 
         @Override
-        public Object visit(PLSQLNode node, Object data) {
+        public Object visitPLSQLNode(PLSQLNode node, Object data) {
             return countNodeChildren(node, data);
         }
 
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityVisitor.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityVisitor.java
index 4ea35c76f7..bd0ce03cab 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityVisitor.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityVisitor.java
@@ -78,7 +78,7 @@ class NPathComplexityVisitor extends PLSQLParserVisitorAdapter {
     }
 
     @Override
-    public Object visit(PLSQLNode node, Object data) {
+    public Object visitPLSQLNode(PLSQLNode node, Object data) {
         return complexityMultipleOf(node, data);
     }
 
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ScopeAndDeclarationFinder.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ScopeAndDeclarationFinder.java
index 315621cb5f..77fc9ad98b 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ScopeAndDeclarationFinder.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ScopeAndDeclarationFinder.java
@@ -364,7 +364,7 @@ public class ScopeAndDeclarationFinder extends PLSQLParserVisitorAdapter {
     // }
 
     private void cont(PLSQLNode node) {
-        super.visit(node, null);
+        super.visitPLSQLNode(node, null);
         scopes.pop();
     }
 }