diff --git a/extension.json b/extension.json
index 7542e1813..c5aead20c 100644
--- a/extension.json
+++ b/extension.json
@@ -52,15 +52,15 @@
 		"EchoPushNotificationRequest": "MediaWiki\\Extension\\Notifications\\Push\\NotificationRequestJob"
 	},
 	"SpecialPages": {
-		"Notifications": "SpecialNotifications",
+		"Notifications": "MediaWiki\\Extension\\Notifications\\Special\\SpecialNotifications",
 		"DisplayNotificationsConfiguration": {
-			"class": "SpecialDisplayNotificationsConfiguration",
+			"class": "MediaWiki\\Extension\\Notifications\\Special\\SpecialDisplayNotificationsConfiguration",
 			"services": [
 				"EchoAttributeManager",
 				"UserOptionsManager"
 			]
 		},
-		"NotificationsMarkRead": "SpecialNotificationsMarkRead"
+		"NotificationsMarkRead": "MediaWiki\\Extension\\Notifications\\Special\\SpecialNotificationsMarkRead"
 	},
 	"AvailableRights": [
 		"manage-all-push-subscriptions"
@@ -1117,15 +1117,11 @@
 		"MWEchoEmailBatch": "includes/EmailBatch.php",
 		"MWEchoEventLogging": "includes/EventLogging.php",
 		"MWEchoNotifUser": "includes/NotifUser.php",
-		"NotificationPager": "includes/special/NotificationPager.php",
 		"ProcessEchoEmailBatch": "maintenance/processEchoEmailBatch.php",
 		"RecomputeNotifCounts": "maintenance/recomputeNotifCounts.php",
 		"RemoveInvalidNotification": "maintenance/removeInvalidNotification.php",
 		"RemoveOrphanedEvents": "maintenance/removeOrphanedEvents.php",
 		"ResourceLoaderEchoImageModule": "includes/ResourceLoaderEchoImageModule.php",
-		"SpecialDisplayNotificationsConfiguration": "includes/special/SpecialDisplayNotificationsConfiguration.php",
-		"SpecialNotifications": "includes/special/SpecialNotifications.php",
-		"SpecialNotificationsMarkRead": "includes/special/SpecialNotificationsMarkRead.php",
 		"UpdateEchoSchemaForSuppression": "maintenance/updateEchoSchemaForSuppression.php",
 		"EchoUpdatePerUserBlacklist": "maintenance/updatePerUserBlacklist.php",
 		"EchoPush\\PushNotifier": "includes/Push/PushNotifier.php",
diff --git a/includes/Formatters/SpecialNotificationsFormatter.php b/includes/Formatters/SpecialNotificationsFormatter.php
index e20130ea5..77c80be75 100644
--- a/includes/Formatters/SpecialNotificationsFormatter.php
+++ b/includes/Formatters/SpecialNotificationsFormatter.php
@@ -3,10 +3,10 @@
 namespace MediaWiki\Extension\Notifications\Formatters;
 
 use Html;
+use MediaWiki\Extension\Notifications\Special\SpecialNotificationsMarkRead;
 use MWTimestamp;
 use OOUI\IconWidget;
 use OutputPage;
-use SpecialNotificationsMarkRead;
 use Xml;
 
 /**
diff --git a/includes/special/NotificationPager.php b/includes/Special/NotificationPager.php
similarity index 91%
rename from includes/special/NotificationPager.php
rename to includes/Special/NotificationPager.php
index cfa4b75fc..67ff83dba 100644
--- a/includes/special/NotificationPager.php
+++ b/includes/Special/NotificationPager.php
@@ -1,5 +1,14 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Special;
+
+use EchoNotification;
+use EchoServices;
+use Exception;
+use IContextSource;
+use MWEchoDbFactory;
+use ReverseChronologicalPager;
+
 /**
  * This pager is used by Special:Notifications (NO-JS).
  * The heavy-lifting is done by IndexPager (grand-parent to this class).
diff --git a/includes/special/SpecialDisplayNotificationsConfiguration.php b/includes/Special/SpecialDisplayNotificationsConfiguration.php
similarity index 98%
rename from includes/special/SpecialDisplayNotificationsConfiguration.php
rename to includes/Special/SpecialDisplayNotificationsConfiguration.php
index 00bc01dac..7f78dc1d2 100644
--- a/includes/special/SpecialDisplayNotificationsConfiguration.php
+++ b/includes/Special/SpecialDisplayNotificationsConfiguration.php
@@ -1,7 +1,14 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Special;
+
+use EchoAttributeManager;
+use Html;
 use MediaWiki\Extension\Notifications\Hooks as EchoHooks;
 use MediaWiki\User\UserOptionsManager;
+use OOUIHTMLForm;
+use UnlistedSpecialPage;
+use User;
 
 class SpecialDisplayNotificationsConfiguration extends UnlistedSpecialPage {
 	/**
diff --git a/includes/special/SpecialNotifications.php b/includes/Special/SpecialNotifications.php
similarity index 97%
rename from includes/special/SpecialNotifications.php
rename to includes/Special/SpecialNotifications.php
index 4ae78a62b..249f4623c 100644
--- a/includes/special/SpecialNotifications.php
+++ b/includes/Special/SpecialNotifications.php
@@ -1,6 +1,14 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Special;
+
+use EchoDataOutputFormatter;
+use EchoSeenTime;
+use Html;
 use MediaWiki\Extension\Notifications\OOUI\LabelIconWidget;
+use MWEchoEventLogging;
+use OOUI;
+use SpecialPage;
 
 class SpecialNotifications extends SpecialPage {
 
diff --git a/includes/special/SpecialNotificationsMarkRead.php b/includes/Special/SpecialNotificationsMarkRead.php
similarity index 95%
rename from includes/special/SpecialNotificationsMarkRead.php
rename to includes/Special/SpecialNotificationsMarkRead.php
index ad501677a..a3e7d6c9a 100644
--- a/includes/special/SpecialNotificationsMarkRead.php
+++ b/includes/Special/SpecialNotificationsMarkRead.php
@@ -1,5 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Special;
+
+use FormSpecialPage;
+use HTMLForm;
+use MWEchoNotifUser;
+use SpecialPage;
+
 /**
  * Form for marking notifications as read by ID.
  *
@@ -47,8 +54,7 @@ class SpecialNotificationsMarkRead extends FormSpecialPage {
 				'default' => $this->par,
 				'filter-callback' => static function ( $value, $alldata ) {
 					// Allow for a single value or a set of values
-					$result = explode( ',', $value );
-					return $result;
+					return explode( ',', $value );
 				},
 				'validation-callback' => function ( $value, $alldata ) {
 					if ( $value === [ 'ALL' ] ) {