diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java
index 859cb1e1f8..18798da868 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/GenericToken.java
@@ -16,11 +16,11 @@ public interface GenericToken {
     GenericToken getNext();
 
     /**
-     * Obtain a special generic token which, according to the input stream which generated the instance of this token,
+     * Obtain a comment-type token which, according to the input stream which generated the instance of this token,
      * precedes this instance token and succeeds the previous generic token (if there is any).
-     * @return the special token if it exists; null if it does not exist
+     * @return the comment-type token if it exists; null if it does not exist
      */
-    GenericToken getPreviousSpecialGenericToken();
+    GenericToken getPreviousComment();
 
     /**
      * Gets the token's text.
diff --git a/pmd-cpp/src/main/ant/alljavacc.xml b/pmd-cpp/src/main/ant/alljavacc.xml
index 6092c621e1..9347d126e4 100644
--- a/pmd-cpp/src/main/ant/alljavacc.xml
+++ b/pmd-cpp/src/main/ant/alljavacc.xml
@@ -59,7 +59,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-java/src/main/ant/alljavacc.xml b/pmd-java/src/main/ant/alljavacc.xml
index df3c24e40f..e1a80620f1 100644
--- a/pmd-java/src/main/ant/alljavacc.xml
+++ b/pmd-java/src/main/ant/alljavacc.xml
@@ -101,7 +101,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-javascript/src/main/ant/alljavacc.xml b/pmd-javascript/src/main/ant/alljavacc.xml
index 98266c3118..6f7a0a7bc4 100644
--- a/pmd-javascript/src/main/ant/alljavacc.xml
+++ b/pmd-javascript/src/main/ant/alljavacc.xml
@@ -59,7 +59,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-jsp/src/main/ant/alljavacc.xml b/pmd-jsp/src/main/ant/alljavacc.xml
index 677ed0ebeb..34207aa4a6 100644
--- a/pmd-jsp/src/main/ant/alljavacc.xml
+++ b/pmd-jsp/src/main/ant/alljavacc.xml
@@ -79,7 +79,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-matlab/src/main/ant/alljavacc.xml b/pmd-matlab/src/main/ant/alljavacc.xml
index 2841465fab..ecf431f7b6 100644
--- a/pmd-matlab/src/main/ant/alljavacc.xml
+++ b/pmd-matlab/src/main/ant/alljavacc.xml
@@ -59,7 +59,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-objectivec/src/main/ant/alljavacc.xml b/pmd-objectivec/src/main/ant/alljavacc.xml
index 60108b51e1..26ab8cd3d9 100644
--- a/pmd-objectivec/src/main/ant/alljavacc.xml
+++ b/pmd-objectivec/src/main/ant/alljavacc.xml
@@ -59,7 +59,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-plsql/src/main/ant/alljavacc.xml b/pmd-plsql/src/main/ant/alljavacc.xml
index e8eb9381cb..d111dbb946 100644
--- a/pmd-plsql/src/main/ant/alljavacc.xml
+++ b/pmd-plsql/src/main/ant/alljavacc.xml
@@ -96,7 +96,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-python/src/main/ant/alljavacc.xml b/pmd-python/src/main/ant/alljavacc.xml
index 22cc3f93ac..b876617263 100644
--- a/pmd-python/src/main/ant/alljavacc.xml
+++ b/pmd-python/src/main/ant/alljavacc.xml
@@ -59,7 +59,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-visualforce/src/main/ant/alljavacc.xml b/pmd-visualforce/src/main/ant/alljavacc.xml
index f22d9bb72d..b2463ff956 100644
--- a/pmd-visualforce/src/main/ant/alljavacc.xml
+++ b/pmd-visualforce/src/main/ant/alljavacc.xml
@@ -79,7 +79,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }
 
diff --git a/pmd-vm/src/main/ant/alljavacc.xml b/pmd-vm/src/main/ant/alljavacc.xml
index 9a144d8703..8f07d54ade 100644
--- a/pmd-vm/src/main/ant/alljavacc.xml
+++ b/pmd-vm/src/main/ant/alljavacc.xml
@@ -92,7 +92,7 @@ public class Token implements GenericToken, java.io.Serializable]]></replacevalu
   }
 
   @Override
-  public GenericToken getPreviousSpecialGenericToken() {
+  public GenericToken getPreviousComment() {
     return specialToken;
   }