diff --git a/components/DataLiberation/URL/PHP/class-phpurlintextprocessor.php b/components/DataLiberation/URL/PHP/class-phpurlintextprocessor.php
index 8a8b3d382..e4429c8e5 100644
--- a/components/DataLiberation/URL/PHP/class-phpurlintextprocessor.php
+++ b/components/DataLiberation/URL/PHP/class-phpurlintextprocessor.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
 
 namespace WordPress\DataLiberation\URL;
 
diff --git a/components/DataLiberation/URL/class-urlintextprocessor.php b/components/DataLiberation/URL/class-urlintextprocessor.php
deleted file mode 100644
index 39bfc3521..000000000
--- a/components/DataLiberation/URL/class-urlintextprocessor.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace WordPress\DataLiberation\URL;
-
-require_once __DIR__ . '/PHP/class-phpurlintextprocessor.php';
-
-class URLInTextProcessor extends PHPURLInTextProcessor {}
diff --git a/components/DataLiberation/URL/loaders/class-urlintextprocessor.php b/components/DataLiberation/URL/loaders/class-urlintextprocessor.php
new file mode 100644
index 000000000..c52faa72d
--- /dev/null
+++ b/components/DataLiberation/URL/loaders/class-urlintextprocessor.php
@@ -0,0 +1,11 @@
+<?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/PHP/class-wp-html-php-processor.php b/components/HTML/PHP/class-wp-html-php-processor.php
index 5645ac928..eaa6492f2 100644
--- a/components/HTML/PHP/class-wp-html-php-processor.php
+++ b/components/HTML/PHP/class-wp-html-php-processor.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
 /**
  * HTML API: WP_HTML_Processor class
  *
diff --git a/components/HTML/PHP/class-wp-html-php-tag-processor.php b/components/HTML/PHP/class-wp-html-php-tag-processor.php
index d35ecc346..80b6db788 100644
--- a/components/HTML/PHP/class-wp-html-php-tag-processor.php
+++ b/components/HTML/PHP/class-wp-html-php-tag-processor.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
 /**
  * HTML API: WP_HTML_Tag_Processor class
  *
diff --git a/components/HTML/class-wp-html-tag-processor.php b/components/HTML/class-wp-html-tag-processor.php
deleted file mode 100644
index 3109e6fea..000000000
--- a/components/HTML/class-wp-html-tag-processor.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Public HTML tag processor loader.
- *
- * @package WordPress
- * @subpackage HTML-API
- */
-
-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/HTML/class-wp-html-processor.php b/components/HTML/loaders/class-wp-html-processor.php
similarity index 57%
rename from components/HTML/class-wp-html-processor.php
rename to components/HTML/loaders/class-wp-html-processor.php
index 474d11fd9..b9d7f7b2e 100644
--- a/components/HTML/class-wp-html-processor.php
+++ b/components/HTML/loaders/class-wp-html-processor.php
@@ -10,6 +10,10 @@
 	require_once __DIR__ . '/class-wp-html-tag-processor.php';
 }
 
-require_once __DIR__ . '/PHP/class-wp-html-php-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
new file mode 100644
index 000000000..77d1ab079
--- /dev/null
+++ b/components/HTML/loaders/class-wp-html-tag-processor.php
@@ -0,0 +1,15 @@
+<?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/PHP/class-phpxmlprocessor.php b/components/XML/PHP/class-phpxmlprocessor.php
index a986cc05f..5fe609100 100644
--- a/components/XML/PHP/class-phpxmlprocessor.php
+++ b/components/XML/PHP/class-phpxmlprocessor.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:disable WordPress.Files.FileName.InvalidClassFileName
 
 namespace WordPress\XML;
 
diff --git a/components/XML/class-xmlprocessor.php b/components/XML/class-xmlprocessor.php
deleted file mode 100644
index eaccbc80b..000000000
--- a/components/XML/class-xmlprocessor.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace WordPress\XML;
-
-require_once __DIR__ . '/PHP/class-phpxmlprocessor.php';
-
-class XMLProcessor extends PHPXMLProcessor {}
diff --git a/components/XML/loaders/class-xmlprocessor.php b/components/XML/loaders/class-xmlprocessor.php
new file mode 100644
index 000000000..b3025bb61
--- /dev/null
+++ b/components/XML/loaders/class-xmlprocessor.php
@@ -0,0 +1,11 @@
+<?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 {}