diff --git a/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector b/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
index 225ac24895a..278536c0633 100644
--- a/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
+++ b/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
@@ -1 +1 @@
-org.apache.tika.parser.html.HtmlEncodingDetector
\ No newline at end of file
+org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
index 8f83960dcd6..eee3dce0c19 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
@@ -42,6 +42,7 @@
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParserDecorator;
 import org.apache.tika.parser.html.HtmlEncodingDetector;
+import org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector;
 import org.apache.tika.parser.txt.Icu4jEncodingDetector;
 import org.apache.tika.parser.txt.TXTParser;
 import org.apache.tika.parser.txt.UniversalEncodingDetector;
@@ -55,7 +56,7 @@ public void testDefault() {
         assertTrue(detector instanceof CompositeEncodingDetector);
         List<EncodingDetector> detectors = ((CompositeEncodingDetector) detector).getDetectors();
         assertEquals(3, detectors.size());
-        assertTrue(detectors.get(0) instanceof HtmlEncodingDetector);
+        assertTrue(detectors.get(0) instanceof StandardHtmlEncodingDetector);
         assertTrue(detectors.get(1) instanceof UniversalEncodingDetector);
         assertTrue(detectors.get(2) instanceof Icu4jEncodingDetector);
     }
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
index 8f4de2258fd..5167c2dc01d 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
@@ -19,9 +19,9 @@
     <!-- Explicitly request default parsers -->
     <parsers/>
     <encodingDetectors>
-        <!-- All detectors except HtmlEncodingDetector -->
+        <!-- All detectors except StandardHtmlEncodingDetector -->
         <encodingDetector class="org.apache.tika.detect.DefaultEncodingDetector">
-            <encodingDetector-exclude class="org.apache.tika.parser.html.HtmlEncodingDetector"/>
+            <encodingDetector-exclude class="org.apache.tika.parser.html.charsetdetector.StandardHtmlEncodingDetector"/>
         </encodingDetector>
         <!-- One other detector, to check ordering -->
         <encodingDetector class="org.apache.tika.detect.NonDetectingEncodingDetector"/>