[core] Rename Tokenizer to CpdLexer

See #4065

pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/MatlabLanguageModule.java

@@ -4,11 +4,11 @@
 
 package net.sourceforge.pmd.lang.matlab;
 
-import net.sourceforge.pmd.cpd.Tokenizer;
+import net.sourceforge.pmd.cpd.CpdLexer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.impl.CpdOnlyLanguageModuleBase;
-import net.sourceforge.pmd.lang.matlab.cpd.MatlabTokenizer;
+import net.sourceforge.pmd.lang.matlab.cpd.MatlabCpdLexer;
 
 /**
  * Defines the Language module for Matlab
@@ -29,7 +29,7 @@ public class MatlabLanguageModule extends CpdOnlyLanguageModuleBase {
     }
 
     @Override
-    public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
-        return new MatlabTokenizer();
+    public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
+        return new MatlabCpdLexer();
     }
 }

pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabCpdLexer.java

@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.matlab.cpd;
 
-import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
+import net.sourceforge.pmd.cpd.impl.JavaccCpdLexer;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
@@ -13,8 +13,10 @@ import net.sourceforge.pmd.lang.matlab.ast.MatlabTokenKinds;
 
 /**
  * The Matlab Tokenizer.
+ *
+ * <p>Note: This class has been called MatlabTokenizer in PMD 6</p>.
  */
-public class MatlabTokenizer extends JavaCCTokenizer {
+public class MatlabCpdLexer extends JavaccCpdLexer {
 
     @Override
     protected TokenManager<JavaccToken> makeLexerImpl(TextDocument doc) {

pmd-matlab/src/test/java/net/sourceforge/pmd/lang/matlab/cpd/MatlabCpdLexerTest.java

@@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test;
 
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
 
-class MatlabTokenizerTest extends CpdTextComparisonTest {
+class MatlabCpdLexerTest extends CpdTextComparisonTest {
 
-    MatlabTokenizerTest() {
+    MatlabCpdLexerTest() {
         super("matlab", ".m");
     }