From c572cb88d7c74a5b8b2edddc972bc18e7a9fb251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Mon, 13 Feb 2023 15:18:37 +0100
Subject: [PATCH] Rename package cpd.internal to cpd.impl

---
 .../sourceforge/pmd/cpd/{internal => impl}/AntlrTokenizer.java  | 2 +-
 .../sourceforge/pmd/cpd/{internal => impl}/JavaCCTokenizer.java | 2 +-
 .../sourceforge/pmd/cpd/{internal => impl}/TokenizerBase.java   | 2 +-
 .../pmd/lang/ast/impl/javacc/JavaccTokenDocument.java           | 2 +-
 pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java | 2 +-
 .../main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java  | 2 +-
 .../java/net/sourceforge/pmd/lang/dart/cpd/DartTokenizer.java   | 2 +-
 .../net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java  | 2 +-
 .../main/java/net/sourceforge/pmd/lang/go/cpd/GoTokenizer.java  | 2 +-
 .../java/net/sourceforge/pmd/lang/java/cpd/JavaTokenizer.java   | 2 +-
 .../pmd/lang/ecmascript/cpd/EcmascriptTokenizer.java            | 2 +-
 .../java/net/sourceforge/pmd/lang/jsp/cpd/JSPTokenizer.java     | 2 +-
 .../net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java    | 2 +-
 .../java/net/sourceforge/pmd/lang/lua/cpd/LuaTokenizer.java     | 2 +-
 .../net/sourceforge/pmd/lang/matlab/cpd/MatlabTokenizer.java    | 2 +-
 .../main/java/net/sourceforge/pmd/cpd/ModelicaTokenizer.java    | 2 +-
 .../pmd/lang/objectivec/cpd/ObjectiveCTokenizer.java            | 2 +-
 .../src/main/java/net/sourceforge/pmd/cpd/PLSQLTokenizer.java   | 2 +-
 .../net/sourceforge/pmd/lang/python/cpd/PythonTokenizer.java    | 2 +-
 .../java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java | 2 +-
 .../main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java  | 2 +-
 .../java/net/sourceforge/pmd/lang/xml/cpd/XmlTokenizer.java     | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)
 rename pmd-core/src/main/java/net/sourceforge/pmd/cpd/{internal => impl}/AntlrTokenizer.java (95%)
 rename pmd-core/src/main/java/net/sourceforge/pmd/cpd/{internal => impl}/JavaCCTokenizer.java (84%)
 rename pmd-core/src/main/java/net/sourceforge/pmd/cpd/{internal => impl}/TokenizerBase.java (97%)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/AntlrTokenizer.java
similarity index 95%
rename from pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java
rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/AntlrTokenizer.java
index d5a3472281..0d15d2f659 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/AntlrTokenizer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/AntlrTokenizer.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd.internal;
+package net.sourceforge.pmd.cpd.impl;
 
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/JavaCCTokenizer.java
similarity index 84%
rename from pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java
rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/JavaCCTokenizer.java
index 3a629d5af4..e6feb5bed9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/JavaCCTokenizer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/JavaCCTokenizer.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd.internal;
+package net.sourceforge.pmd.cpd.impl;
 
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/TokenizerBase.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/TokenizerBase.java
similarity index 97%
rename from pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/TokenizerBase.java
rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/TokenizerBase.java
index 1cd04359d1..3196849e49 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/internal/TokenizerBase.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/impl/TokenizerBase.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd.internal;
+package net.sourceforge.pmd.cpd.impl;
 
 import java.io.IOException;
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
index 6b13d723d4..5887805ec4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
@@ -10,7 +10,7 @@ import java.util.List;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.ast.impl.TokenDocument;
 import net.sourceforge.pmd.lang.document.TextDocument;
 
diff --git a/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
index bb9f5c2811..043696bb27 100644
--- a/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
+++ b/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
@@ -8,7 +8,7 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
-import net.sourceforge.pmd.cpd.internal.TokenizerBase;
+import net.sourceforge.pmd.cpd.impl.TokenizerBase;
 import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.TokenManager;
diff --git a/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java b/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java
index 22fd33a9a2..1719019e4c 100644
--- a/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java
+++ b/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/cpd/CsTokenizer.java
@@ -8,7 +8,7 @@ import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
 import net.sourceforge.pmd.cpd.Tokenizer;
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.cpd.token.internal.BaseTokenFilter;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
diff --git a/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/cpd/DartTokenizer.java b/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/cpd/DartTokenizer.java
index 2a0fc4a1b9..2daf6ec443 100644
--- a/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/cpd/DartTokenizer.java
+++ b/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/cpd/DartTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.dart.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.cpd.token.internal.BaseTokenFilter;
 import net.sourceforge.pmd.lang.TokenManager;
diff --git a/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
index fd9d03a244..1bbe22cf51 100644
--- a/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
+++ b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.gherkin.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.lang.gherkin.ast.GherkinLexer;
 
 /**
diff --git a/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/cpd/GoTokenizer.java b/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/cpd/GoTokenizer.java
index 54f86a77a9..a4d9526a52 100644
--- a/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/cpd/GoTokenizer.java
+++ b/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/cpd/GoTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.go.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.lang.go.ast.GolangLexer;
 
 public class GoTokenizer extends AntlrTokenizer {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/cpd/JavaTokenizer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/cpd/JavaTokenizer.java
index ef475c2b78..c0f884bbfe 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/cpd/JavaTokenizer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/cpd/JavaTokenizer.java
@@ -10,7 +10,7 @@ import java.util.LinkedList;
 import net.sourceforge.pmd.cpd.TokenEntry;
 import net.sourceforge.pmd.cpd.TokenFactory;
 import net.sourceforge.pmd.cpd.Tokenizer;
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptTokenizer.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptTokenizer.java
index a1e08e2e61..34a0d42f30 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptTokenizer.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.ecmascript.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/cpd/JSPTokenizer.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/cpd/JSPTokenizer.java
index dd6892708f..1a6b8044ab 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/cpd/JSPTokenizer.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/cpd/JSPTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.jsp.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java
index 63aa140a95..c46c8be666 100644
--- a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java
+++ b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.kotlin.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken;
diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/cpd/LuaTokenizer.java
index 6f569e711a..6d7942247c 100644
--- a/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/cpd/LuaTokenizer.java
+++ b/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/cpd/LuaTokenizer.java
@@ -8,7 +8,7 @@ import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
 import net.sourceforge.pmd.cpd.Tokenizer;
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.TokenManager;
diff --git a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabTokenizer.java b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabTokenizer.java
index 1a275cd4ef..269deed52b 100644
--- a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabTokenizer.java
+++ b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.matlab.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/cpd/ModelicaTokenizer.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/cpd/ModelicaTokenizer.java
index 140d9a941d..a51a8518b4 100644
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/cpd/ModelicaTokenizer.java
+++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/cpd/ModelicaTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.cpd.token.JavaCCTokenFilter;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
diff --git a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/cpd/ObjectiveCTokenizer.java b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/cpd/ObjectiveCTokenizer.java
index 2e21fdc7c8..fb17635fce 100644
--- a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/cpd/ObjectiveCTokenizer.java
+++ b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/cpd/ObjectiveCTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.objectivec.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/cpd/PLSQLTokenizer.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/cpd/PLSQLTokenizer.java
index e6ca50c0ec..bc35e3c957 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/cpd/PLSQLTokenizer.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/cpd/PLSQLTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
diff --git a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/cpd/PythonTokenizer.java b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/cpd/PythonTokenizer.java
index b9194d0720..49c301a128 100644
--- a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/cpd/PythonTokenizer.java
+++ b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/cpd/PythonTokenizer.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.python.cpd;
 
 import java.util.regex.Pattern;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
diff --git a/pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java b/pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java
index 868a4b0034..ae4ed9d5b0 100644
--- a/pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java
+++ b/pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.swift.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.lang.swift.ast.SwiftLexer;
 
 /**
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java
index f79bcf48cb..f7c669333b 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java
@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.vf.cpd;
 
-import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaEscapeTranslator;
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/cpd/XmlTokenizer.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/cpd/XmlTokenizer.java
index e15b9d6b22..5b24f1ef1f 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/cpd/XmlTokenizer.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/cpd/XmlTokenizer.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.xml.cpd;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 
-import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
 import net.sourceforge.pmd.lang.xml.antlr4.XMLLexer;
 
 public class XmlTokenizer extends AntlrTokenizer {