diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index 638b019c50..921cd6335b 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -17,6 +17,27 @@
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>antlr-cleanup</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
+                                    <property name="lang-name" value="Lua" />
+                                    <property name="lang-terse-name" value="lua" />
+                                </ant>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/ast/Lua.g4
similarity index 100%
rename from pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4
rename to pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/ast/Lua.g4
diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java
index effae4f797..0c18e5d6da 100644
--- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java
+++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java
@@ -9,7 +9,7 @@ import org.antlr.v4.runtime.CharStream;
 import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager;
-import net.sourceforge.pmd.lang.lua.antlr4.LuaLexer;
+import net.sourceforge.pmd.lang.lua.ast.LuaLexer;
 
 /**
  * The Lua Tokenizer