diff --git a/components/DataLiberation/URL/class-urlintextprocessor.php b/components/DataLiberation/URL/class-urlintextprocessor.php
index e4429c8e5..b3ae911e5 100644
--- a/components/DataLiberation/URL/class-urlintextprocessor.php
+++ b/components/DataLiberation/URL/class-urlintextprocessor.php
@@ -1,4 +1,4 @@
-<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
+<?php
 
 namespace WordPress\DataLiberation\URL;
 
@@ -106,7 +106,7 @@
  *
  * This reflects how URLs actually appear in text blocks where whitespace often terminates a link.
  */
-class PHPURLInTextProcessor {
+class URLInTextProcessor {
 
 	private $text;
 	private $url_starts_at;
diff --git a/components/DataLiberation/URL/loaders/class-urlintextprocessor.php b/components/DataLiberation/URL/loaders/class-urlintextprocessor.php
deleted file mode 100644
index c52faa72d..000000000
--- a/components/DataLiberation/URL/loaders/class-urlintextprocessor.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace WordPress\DataLiberation\URL;
-
-if ( file_exists( __DIR__ . '/../class-urlintextprocessor.php' ) ) {
-	require_once __DIR__ . '/../class-urlintextprocessor.php';
-} else {
-	require_once __DIR__ . '/../PHP/class-phpurlintextprocessor.php';
-}
-
-class URLInTextProcessor extends PHPURLInTextProcessor {}
diff --git a/components/HTML/class-wp-html-processor.php b/components/HTML/class-wp-html-processor.php
index eaa6492f2..60739af99 100644
--- a/components/HTML/class-wp-html-processor.php
+++ b/components/HTML/class-wp-html-processor.php
@@ -1,4 +1,4 @@
-<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
+<?php
 /**
  * HTML API: WP_HTML_Processor class
  *
@@ -140,7 +140,7 @@
  * @see WP_HTML_Tag_Processor
  * @see https://html.spec.whatwg.org/
  */
-class WP_HTML_PHP_Processor extends WP_HTML_Tag_Processor {
+class WP_HTML_Processor extends WP_HTML_Tag_Processor {
 	/**
 	 * The maximum number of bookmarks allowed to exist at any given time.
 	 *
diff --git a/components/HTML/class-wp-html-tag-processor.php b/components/HTML/class-wp-html-tag-processor.php
index 80b6db788..60f1dbd53 100644
--- a/components/HTML/class-wp-html-tag-processor.php
+++ b/components/HTML/class-wp-html-tag-processor.php
@@ -1,4 +1,4 @@
-<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
+<?php
 /**
  * HTML API: WP_HTML_Tag_Processor class
  *
@@ -408,7 +408,7 @@
  *              Introduces "special" elements which act like void elements, e.g. TITLE, STYLE.
  *              Allows scanning through all tokens and processing modifiable text, where applicable.
  */
-class WP_HTML_PHP_Tag_Processor {
+class WP_HTML_Tag_Processor {
 	/**
 	 * The maximum number of bookmarks allowed to exist at
 	 * any given time.
diff --git a/components/HTML/loaders/class-wp-html-processor.php b/components/HTML/loaders/class-wp-html-processor.php
deleted file mode 100644
index b9d7f7b2e..000000000
--- a/components/HTML/loaders/class-wp-html-processor.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Public HTML processor loader.
- *
- * @package WordPress
- * @subpackage HTML-API
- */
-
-if ( ! class_exists( 'WP_HTML_Tag_Processor', false ) ) {
-	require_once __DIR__ . '/class-wp-html-tag-processor.php';
-}
-
-if ( file_exists( __DIR__ . '/../class-wp-html-processor.php' ) ) {
-	require_once __DIR__ . '/../class-wp-html-processor.php';
-} else {
-	require_once __DIR__ . '/../PHP/class-wp-html-php-processor.php';
-}
-
-class WP_HTML_Processor extends WP_HTML_PHP_Processor {}
diff --git a/components/HTML/loaders/class-wp-html-tag-processor.php b/components/HTML/loaders/class-wp-html-tag-processor.php
deleted file mode 100644
index 77d1ab079..000000000
--- a/components/HTML/loaders/class-wp-html-tag-processor.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Public HTML tag processor loader.
- *
- * @package WordPress
- * @subpackage HTML-API
- */
-
-if ( file_exists( __DIR__ . '/../class-wp-html-tag-processor.php' ) ) {
-	require_once __DIR__ . '/../class-wp-html-tag-processor.php';
-} else {
-	require_once __DIR__ . '/../PHP/class-wp-html-php-tag-processor.php';
-}
-
-class WP_HTML_Tag_Processor extends WP_HTML_PHP_Tag_Processor {}
diff --git a/components/XML/class-xmlprocessor.php b/components/XML/class-xmlprocessor.php
index 5fe609100..ca6f4d5a6 100644
--- a/components/XML/class-xmlprocessor.php
+++ b/components/XML/class-xmlprocessor.php
@@ -1,4 +1,4 @@
-<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
+<?php
 
 namespace WordPress\XML;
 
@@ -341,7 +341,7 @@
  *
  * @since WP_VERSION
  */
-class PHPXMLProcessor {
+class XMLProcessor {
 	/**
 	 * The maximum number of bookmarks allowed to exist at
 	 * any given time.
diff --git a/components/XML/loaders/class-xmlprocessor.php b/components/XML/loaders/class-xmlprocessor.php
deleted file mode 100644
index b3025bb61..000000000
--- a/components/XML/loaders/class-xmlprocessor.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace WordPress\XML;
-
-if ( file_exists( __DIR__ . '/../class-xmlprocessor.php' ) ) {
-	require_once __DIR__ . '/../class-xmlprocessor.php';
-} else {
-	require_once __DIR__ . '/../PHP/class-phpxmlprocessor.php';
-}
-
-class XMLProcessor extends PHPXMLProcessor {}