diff --git a/pmd/etc/grammar/Java.jjt b/pmd/etc/grammar/Java.jjt
index 34ae6f1b93..c04dc77e6d 100644
--- a/pmd/etc/grammar/Java.jjt
+++ b/pmd/etc/grammar/Java.jjt
@@ -61,11 +61,11 @@ options {
   MULTI = true;
   VISITOR = true;
   NODE_USES_PARSER = true;
-  NODE_PACKAGE="net.sourceforge.pmd.ast";
+  NODE_PACKAGE="net.sourceforge.pmd.lang.java.ast";
 }
 
 PARSER_BEGIN(JavaParser)
-package net.sourceforge.pmd.ast;
+package net.sourceforge.pmd.lang.java.ast;
 import java.util.*;
 import net.sourceforge.pmd.PMD;
 public class JavaParser {
diff --git a/pmd/etc/grammar/JspParser.jjt b/pmd/etc/grammar/JspParser.jjt
index e62defd6d2..4c7dffcf87 100644
--- a/pmd/etc/grammar/JspParser.jjt
+++ b/pmd/etc/grammar/JspParser.jjt
@@ -22,7 +22,7 @@ PARSER_BEGIN(JspParser)
  * @author Pieter – Application Engineers NV/SA – http://www.ae.be
  */
 
-package net.sourceforge.pmd.jsp.ast;
+package net.sourceforge.pmd.lang.jsp.ast;
 
 public class JspParser {