diff --git a/extension.json b/extension.json
index 7a68f12ee..1f6dbea89 100644
--- a/extension.json
+++ b/extension.json
@@ -140,52 +140,8 @@
 		"AbuseFilterAliases": "AbuseFilter.alias.php"
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\AbuseFilter\\Maintenance\\": "maintenance/",
-		"MediaWiki\\Extension\\AbuseFilter\\Api\\": "includes/Api/",
-		"MediaWiki\\Extension\\AbuseFilter\\VariableGenerator\\": "includes/VariableGenerator/",
-		"MediaWiki\\Extension\\AbuseFilter\\Hooks\\": "includes/Hooks/",
-		"MediaWiki\\Extension\\AbuseFilter\\LogFormatter\\": "includes/LogFormatter/",
-		"MediaWiki\\Extension\\AbuseFilter\\Parser\\": "includes/Parser/",
-		"MediaWiki\\Extension\\AbuseFilter\\Filter\\": "includes/Filter/",
-		"MediaWiki\\Extension\\AbuseFilter\\Pager\\": "includes/Pager/",
-		"MediaWiki\\Extension\\AbuseFilter\\Special\\": "includes/Special/",
-		"MediaWiki\\Extension\\AbuseFilter\\View\\": "includes/View/",
-		"MediaWiki\\Extension\\AbuseFilter\\Watcher\\": "includes/Watcher/",
-		"MediaWiki\\Extension\\AbuseFilter\\Consequences\\": "includes/Consequences/",
-		"MediaWiki\\Extension\\AbuseFilter\\ChangeTags\\": "includes/ChangeTags/",
-		"MediaWiki\\Extension\\AbuseFilter\\Variables\\": "includes/Variables/"
-	},
-	"AutoloadClasses": {
-		"AbuseFilter": "includes/AbuseFilter.php",
-		"AbuseFilterHooks": "includes/AbuseFilterHooks.php",
-		"AbuseFilterPreAuthenticationProvider": "includes/AbuseFilterPreAuthenticationProvider.php",
-		"AbuseFilterChangesList": "includes/AbuseFilterChangesList.php",
-		"TableDiffFormatterFullContext": "includes/TableDiffFormatterFullContext.php",
-		"MediaWiki\\Extension\\AbuseFilter\\GlobalNameUtils": "includes/GlobalNameUtils.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterLookup": "includes/FilterLookup.php",
-		"MediaWiki\\Extension\\AbuseFilter\\KeywordsManager": "includes/KeywordsManager.php",
-		"MediaWiki\\Extension\\AbuseFilter\\AbuseFilterPermissionManager": "includes/AbuseFilterPermissionManager.php",
-		"MediaWiki\\Extension\\AbuseFilter\\EchoNotifier": "includes/EchoNotifier.php",
-		"MediaWiki\\Extension\\AbuseFilter\\ThrottleFilterPresentationModel": "includes/ThrottleFilterPresentationModel.php",
-		"MediaWiki\\Extension\\AbuseFilter\\SpecsFormatter": "includes/SpecsFormatter.php",
-		"MediaWiki\\Extension\\AbuseFilter\\TextExtractor": "includes/TextExtractor.php",
-		"MediaWiki\\Extension\\AbuseFilter\\AbuseFilterServices": "includes/AbuseFilterServices.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterProfiler": "includes/FilterProfiler.php",
-		"MediaWiki\\Extension\\AbuseFilter\\BlockAutopromoteStore": "includes/BlockAutopromoteStore.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterUser": "includes/FilterUser.php",
-		"MediaWiki\\Extension\\AbuseFilter\\CentralDBManager": "includes/CentralDBManager.php",
-		"MediaWiki\\Extension\\AbuseFilter\\CentralDBNotAvailableException": "includes/CentralDBNotAvailableException.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterValidator": "includes/FilterValidator.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterCompare": "includes/FilterCompare.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterImporter": "includes/FilterImporter.php",
-		"MediaWiki\\Extension\\AbuseFilter\\EditBoxBuilder": "includes/EditBoxBuilder.php",
-		"MediaWiki\\Extension\\AbuseFilter\\EditBoxBuilderFactory": "includes/EditBoxBuilderFactory.php",
-		"MediaWiki\\Extension\\AbuseFilter\\InvalidImportDataException": "includes/InvalidImportDataException.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterStore": "includes/FilterStore.php",
-		"MediaWiki\\Extension\\AbuseFilter\\AbuseLogger": "includes/AbuseLogger.php",
-		"MediaWiki\\Extension\\AbuseFilter\\AbuseLoggerFactory": "includes/AbuseLoggerFactory.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterRunner": "includes/FilterRunner.php",
-		"MediaWiki\\Extension\\AbuseFilter\\FilterRunnerFactory": "includes/FilterRunnerFactory.php"
+		"MediaWiki\\Extension\\AbuseFilter\\": "includes/",
+		"MediaWiki\\Extension\\AbuseFilter\\Maintenance\\": "maintenance/"
 	},
 	"TestAutoloadClasses": {
 		"AbuseFilterConsequencesTest": "tests/phpunit/AbuseFilterConsequencesTest.php",
@@ -271,7 +227,7 @@
 		"localBasePath": "modules",
 		"remoteExtPath": "AbuseFilter/modules"
 	},
-	"callback": "AbuseFilterHooks::onRegistration",
+	"callback": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onRegistration",
 	"HookHandlers": {
 		"ToolLinks": {
 			"class": "MediaWiki\\Extension\\AbuseFilter\\Hooks\\Handlers\\ToolLinksHandler",
@@ -294,24 +250,24 @@
 		}
 	},
 	"Hooks": {
-		"EditFilterMergedContent": "AbuseFilterHooks::onEditFilterMergedContent",
+		"EditFilterMergedContent": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onEditFilterMergedContent",
 		"GetAutoPromoteGroups": "AutoPromoteGroups",
-		"TitleMove": "AbuseFilterHooks::onTitleMove",
-		"ArticleDelete": "AbuseFilterHooks::onArticleDelete",
-		"RecentChange_save": "AbuseFilterHooks::onRecentChangeSave",
+		"TitleMove": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onTitleMove",
+		"ArticleDelete": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onArticleDelete",
+		"RecentChange_save": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onRecentChangeSave",
 		"ListDefinedTags": "ChangeTags",
 		"ChangeTagsListActive": "ChangeTags",
 		"LoadExtensionSchemaUpdates": "SchemaChanges",
 		"ContributionsToolLinks": "ToolLinks",
 		"HistoryPageToolLinks": "ToolLinks",
 		"UndeletePageToolLinks": "ToolLinks",
-		"UploadVerifyUpload": "AbuseFilterHooks::onUploadVerifyUpload",
-		"UploadStashFile": "AbuseFilterHooks::onUploadStashFile",
-		"PageSaveComplete": "AbuseFilterHooks::onPageSaveComplete",
-		"RenameUserSQL": "AbuseFilterHooks::onRenameUserSQL",
-		"UserMergeAccountFields": "AbuseFilterHooks::onUserMergeAccountFields",
-		"BeforeCreateEchoEvent": "AbuseFilterHooks::onBeforeCreateEchoEvent",
-		"ParserOutputStashForEdit": "AbuseFilterHooks::onParserOutputStashForEdit",
+		"UploadVerifyUpload": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onUploadVerifyUpload",
+		"UploadStashFile": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onUploadStashFile",
+		"PageSaveComplete": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onPageSaveComplete",
+		"RenameUserSQL": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onRenameUserSQL",
+		"UserMergeAccountFields": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onUserMergeAccountFields",
+		"BeforeCreateEchoEvent": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onBeforeCreateEchoEvent",
+		"ParserOutputStashForEdit": "MediaWiki\\Extension\\AbuseFilter\\AbuseFilterHooks::onParserOutputStashForEdit",
 		"UnitTestsAfterDatabaseSetup": "Tests",
 		"UnitTestsBeforeDatabaseTeardown": "Tests"
 	},
diff --git a/includes/AbuseFilter.php b/includes/AbuseFilter.php
index 43b1c9b64..4fb0c789d 100644
--- a/includes/AbuseFilter.php
+++ b/includes/AbuseFilter.php
@@ -1,8 +1,13 @@
 <?php
 
-use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
+namespace MediaWiki\Extension\AbuseFilter;
+
 use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder;
 use MediaWiki\Revision\RevisionRecord;
+use RequestContext;
+use Status;
+use Title;
+use User;
 
 /**
  * This class contains most of the business logic of AbuseFilter. It consists of
@@ -112,3 +117,5 @@ class AbuseFilter {
 		);
 	}
 }
+
+class_alias( AbuseFilter::class, 'AbuseFilter' );
diff --git a/includes/AbuseFilterChangesList.php b/includes/AbuseFilterChangesList.php
index ba84d51bd..bcaee22af 100644
--- a/includes/AbuseFilterChangesList.php
+++ b/includes/AbuseFilterChangesList.php
@@ -1,6 +1,15 @@
 <?php
 
+namespace MediaWiki\Extension\AbuseFilter;
+
+use HtmlArmor;
+use Linker;
+use LogFormatter;
 use MediaWiki\Revision\RevisionRecord;
+use OldChangesList;
+use RecentChange;
+use Skin;
+use SpecialPage;
 
 class AbuseFilterChangesList extends OldChangesList {
 
diff --git a/includes/AbuseFilterHooks.php b/includes/AbuseFilterHooks.php
index 10da64c1c..db2f994ab 100644
--- a/includes/AbuseFilterHooks.php
+++ b/includes/AbuseFilterHooks.php
@@ -1,13 +1,28 @@
 <?php
 
-use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
-use MediaWiki\Extension\AbuseFilter\EchoNotifier;
-use MediaWiki\Extension\AbuseFilter\ThrottleFilterPresentationModel;
+namespace MediaWiki\Extension\AbuseFilter;
+
+use ApiMessage;
+use Content;
+use DeferredUpdates;
+use EchoAttributeManager;
+use EchoUserLocator;
+use IContextSource;
+use InvalidArgumentException;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\User\UserIdentity;
+use ParserOutput;
+use RecentChange;
+use RenameuserSQL;
+use Status;
+use Title;
+use UploadBase;
+use User;
+use WikiMap;
+use WikiPage;
 
 class AbuseFilterHooks {
 
@@ -74,7 +89,7 @@ class AbuseFilterHooks {
 				'$wgAbuseFilterLocallyDisabledGlobalActions. You can now specify which actions to disable. ' .
 				'If you had set the former to true, you should set to true all of the actions in ' .
 				'$wgAbuseFilterRestrictions (if you were manually setting the variable) or ' .
-				'AbuseFilter::DANGEROUS_ACTIONS. ' .
+				'ConsequencesRegistry::DANGEROUS_ACTIONS. ' .
 				'If you had set it to false (or left the default), just remove it from your wiki settings.'
 			);
 			if ( $wgAbuseFilterDisallowGlobalLocalBlocks === true ) {
diff --git a/includes/AbuseFilterPreAuthenticationProvider.php b/includes/AbuseFilterPreAuthenticationProvider.php
index 32e4504c1..e4b6f06e3 100644
--- a/includes/AbuseFilterPreAuthenticationProvider.php
+++ b/includes/AbuseFilterPreAuthenticationProvider.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace MediaWiki\Extension\AbuseFilter;
+
 use MediaWiki\Auth\AbstractPreAuthenticationProvider;
 use MediaWiki\Auth\AuthenticationRequest;
-use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\MediaWikiServices;
+use SpecialPage;
+use StatusValue;
+use User;
 
 class AbuseFilterPreAuthenticationProvider extends AbstractPreAuthenticationProvider {
 	/**
diff --git a/includes/AbuseLogger.php b/includes/AbuseLogger.php
index 5ae1f9481..44cda1904 100644
--- a/includes/AbuseLogger.php
+++ b/includes/AbuseLogger.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use AbuseFilter;
 use CheckUserHooks;
 use DeferredUpdates;
 use ExtensionRegistry;
diff --git a/includes/Api/QueryAbuseLog.php b/includes/Api/QueryAbuseLog.php
index 47fa06ff6..b8ca8042f 100644
--- a/includes/Api/QueryAbuseLog.php
+++ b/includes/Api/QueryAbuseLog.php
@@ -25,11 +25,11 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Api;
 
-use AbuseFilter;
 use ApiBase;
 use ApiQuery;
 use ApiQueryBase;
 use InvalidArgumentException;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\CentralDBNotAvailableException;
 use MediaWiki\Extension\AbuseFilter\GlobalNameUtils;
diff --git a/includes/FilterLookup.php b/includes/FilterLookup.php
index 888dabd39..165dd7058 100644
--- a/includes/FilterLookup.php
+++ b/includes/FilterLookup.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use AbuseFilter;
 use DBAccessObjectUtils;
 use IDBAccessObject;
 use MediaWiki\Extension\AbuseFilter\Filter\Filter;
diff --git a/includes/FilterStore.php b/includes/FilterStore.php
index 6230aeed3..0c0133a05 100644
--- a/includes/FilterStore.php
+++ b/includes/FilterStore.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter;
 
-use AbuseFilter;
 use ManualLogEntry;
 use MediaWiki\Extension\AbuseFilter\ChangeTags\ChangeTagsManager;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
diff --git a/includes/Hooks/AbuseFilterBuilderHook.php b/includes/Hooks/AbuseFilterBuilderHook.php
index 0354709b0..a7303e9ca 100644
--- a/includes/Hooks/AbuseFilterBuilderHook.php
+++ b/includes/Hooks/AbuseFilterBuilderHook.php
@@ -6,7 +6,7 @@ interface AbuseFilterBuilderHook {
 	/**
 	 * Hook runner for the `AbuseFilter-builder` hook
 	 *
-	 * Allows overwriting of the builder values returned by AbuseFilter::getBuilderValues
+	 * Allows overwriting of the parser keywords
 	 *
 	 * @param array &$realValues Builder values
 	 * @return bool|void True or no return value to continue or false to abort
diff --git a/includes/Pager/AbuseFilterExaminePager.php b/includes/Pager/AbuseFilterExaminePager.php
index 7f2ac6e48..bdd9a946e 100644
--- a/includes/Pager/AbuseFilterExaminePager.php
+++ b/includes/Pager/AbuseFilterExaminePager.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Pager;
 
-use AbuseFilterChangesList;
 use ActorMigration;
+use MediaWiki\Extension\AbuseFilter\AbuseFilterChangesList;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewExamine;
 use RecentChange;
 use ReverseChronologicalPager;
diff --git a/includes/Pager/AbuseFilterHistoryPager.php b/includes/Pager/AbuseFilterHistoryPager.php
index 737d53c7b..46f5b4cde 100644
--- a/includes/Pager/AbuseFilterHistoryPager.php
+++ b/includes/Pager/AbuseFilterHistoryPager.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Pager;
 
-use AbuseFilter;
 use HtmlArmor;
 use Linker;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\View\AbuseFilterViewHistory;
 use MediaWiki\Linker\LinkRenderer;
diff --git a/includes/Special/SpecialAbuseLog.php b/includes/Special/SpecialAbuseLog.php
index baabbbece..586252dee 100644
--- a/includes/Special/SpecialAbuseLog.php
+++ b/includes/Special/SpecialAbuseLog.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\AbuseFilter\Special;
 
-use AbuseFilter;
 use DifferenceEngine;
 use ExtensionRegistry;
 use Html;
@@ -11,6 +10,7 @@ use InvalidArgumentException;
 use Linker;
 use ManualLogEntry;
 use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesRegistry;
diff --git a/includes/TableDiffFormatterFullContext.php b/includes/TableDiffFormatterFullContext.php
index e962e9cfe..1ca460b2e 100644
--- a/includes/TableDiffFormatterFullContext.php
+++ b/includes/TableDiffFormatterFullContext.php
@@ -1,8 +1,14 @@
 <?php
 
+namespace MediaWiki\Extension\AbuseFilter;
+
+use Diff;
+use TableDiffFormatter;
+
 /**
  * Like TableDiffFormatter, but will always render the full context
  * (even for empty diffs).
+ * @todo Consider moving to MW core (as a separate class, or as an option to TableDiffFormatter)
  *
  * @private
  */
diff --git a/includes/TextExtractor.php b/includes/TextExtractor.php
index 05e2058d7..2fbaaa363 100644
--- a/includes/TextExtractor.php
+++ b/includes/TextExtractor.php
@@ -70,7 +70,7 @@ class TextExtractor {
 	 * This uses Content::getNativeData() if $content is an instance of TextContent,
 	 * or Content::getTextForSearchIndex() otherwise.
 	 *
-	 * The hook 'AbuseFilter::contentToString' can be used to override this
+	 * The hook AbuseFilterContentToString can be used to override this
 	 * behavior.
 	 *
 	 * @param Content $content
diff --git a/includes/View/AbuseFilterViewDiff.php b/includes/View/AbuseFilterViewDiff.php
index 9cb17de0a..54117cee4 100644
--- a/includes/View/AbuseFilterViewDiff.php
+++ b/includes/View/AbuseFilterViewDiff.php
@@ -2,17 +2,17 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use AbuseFilter;
 use Diff;
 use DifferenceEngine;
 use IContextSource;
 use Linker;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\SpecsFormatter;
+use MediaWiki\Extension\AbuseFilter\TableDiffFormatterFullContext;
 use MediaWiki\Linker\LinkRenderer;
 use OOUI;
 use stdClass;
-use TableDiffFormatterFullContext;
 use Xml;
 
 /**
diff --git a/includes/View/AbuseFilterViewEdit.php b/includes/View/AbuseFilterViewEdit.php
index fc640394e..6ed719bcc 100644
--- a/includes/View/AbuseFilterViewEdit.php
+++ b/includes/View/AbuseFilterViewEdit.php
@@ -403,7 +403,7 @@ class AbuseFilterViewEdit extends AbuseFilterView {
 			if ( $throttledActions ) {
 				$throttledActions = array_map(
 					function ( $filterAction ) {
-						// TODO: This is AbuseFilter::getActionDisplay, but not escaped
+						// TODO: This is SpecsFormatter::getActionDisplay, but not escaped
 						return $this->msg( 'abusefilter-action-' . $filterAction )->text();
 					},
 					$throttledActions
diff --git a/includes/View/AbuseFilterViewExamine.php b/includes/View/AbuseFilterViewExamine.php
index 93666b79a..f1e34498e 100644
--- a/includes/View/AbuseFilterViewExamine.php
+++ b/includes/View/AbuseFilterViewExamine.php
@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use AbuseFilter;
-use AbuseFilterChangesList;
 use ChangesList;
 use HTMLForm;
 use IContextSource;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
+use MediaWiki\Extension\AbuseFilter\AbuseFilterChangesList;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\EditBoxBuilderFactory;
 use MediaWiki\Extension\AbuseFilter\FilterLookup;
diff --git a/includes/View/AbuseFilterViewTestBatch.php b/includes/View/AbuseFilterViewTestBatch.php
index eca8009f1..591fe3b0f 100644
--- a/includes/View/AbuseFilterViewTestBatch.php
+++ b/includes/View/AbuseFilterViewTestBatch.php
@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Extension\AbuseFilter\View;
 
-use AbuseFilterChangesList;
 use ActorMigration;
 use HTMLForm;
 use IContextSource;
+use MediaWiki\Extension\AbuseFilter\AbuseFilterChangesList;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterPermissionManager;
 use MediaWiki\Extension\AbuseFilter\EditBoxBuilderFactory;
 use MediaWiki\Extension\AbuseFilter\Parser\ParserFactory as AfParserFactory;
diff --git a/maintenance/AddMissingLoggingEntries.php b/maintenance/AddMissingLoggingEntries.php
index 47902e638..fe742170f 100644
--- a/maintenance/AddMissingLoggingEntries.php
+++ b/maintenance/AddMissingLoggingEntries.php
@@ -122,7 +122,7 @@ class AddMissingLoggingEntries extends LoggedUpdateMaintenance {
 				continue;
 			}
 
-			// This copies the code in AbuseFilter::doSaveFilter
+			// This copies the code in FilterStore
 			$logEntry = new ManualLogEntry( 'abusefilter', 'modify' );
 			$logEntry->setPerformer( $user );
 			$logEntry->setTarget( SpecialAbuseFilter::getTitleForSubpage( $row->afh_filter ) );
diff --git a/maintenance/UpdateVarDumps.php b/maintenance/UpdateVarDumps.php
index cfd2005ed..66a6eb22e 100644
--- a/maintenance/UpdateVarDumps.php
+++ b/maintenance/UpdateVarDumps.php
@@ -525,7 +525,7 @@ class UpdateVarDumps extends LoggedUpdateMaintenance {
 	private function doUpdateText( IResultWrapper $res, ExternalStoreAccess $esAccess ) {
 		$orphaned = [];
 		foreach ( $res as $row ) {
-			// This is copied from AbuseFilter::loadVarDump
+			// This is copied from the old AbuseFilter::loadVarDump
 			$oldFlags = explode( ',', $row->old_flags );
 			$text = $row->old_text;
 			if ( in_array( 'external', $oldFlags ) ) {
@@ -565,7 +565,7 @@ class UpdateVarDumps extends LoggedUpdateMaintenance {
 			$varArray = $this->updateVariables( $varArray );
 			// Recreating flags will also ensure that we don't add 'nativeDataArray'
 			$newFlags = [ 'utf-8' ];
-			// This is copied from AbuseFilter::storeVarDump
+			// This is copied from the old AbuseFilter::storeVarDump
 			$toStore = FormatJson::encode( $varArray );
 			if ( in_array( 'gzip', $oldFlags ) && function_exists( 'gzdeflate' ) ) {
 				$toStore = gzdeflate( $toStore );
diff --git a/tests/phpunit/AbuseFilterConsequencesTest.php b/tests/phpunit/AbuseFilterConsequencesTest.php
index 16789a649..4d846cb59 100644
--- a/tests/phpunit/AbuseFilterConsequencesTest.php
+++ b/tests/phpunit/AbuseFilterConsequencesTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\Extension\AbuseFilter\AbuseFilterHooks;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
 use MediaWiki\MediaWikiServices;
@@ -38,12 +39,12 @@ use PHPUnit\Framework\MockObject\MockObject;
  * @group Database
  * @group Large
  *
- * @covers AbuseFilter
+ * @covers \MediaWiki\Extension\AbuseFilter\AbuseFilter
  * @covers \MediaWiki\Extension\AbuseFilter\FilterRunner
- * @covers AbuseFilterHooks
+ * @covers \MediaWiki\Extension\AbuseFilter\AbuseFilterHooks
  * @covers \MediaWiki\Extension\AbuseFilter\VariableGenerator\VariableGenerator
  * @covers \MediaWiki\Extension\AbuseFilter\VariableGenerator\RunVariableGenerator
- * @covers AbuseFilterPreAuthenticationProvider
+ * @covers \MediaWiki\Extension\AbuseFilter\AbuseFilterPreAuthenticationProvider
  * @covers \MediaWiki\Extension\AbuseFilter\Parser\AbuseFilterParser
  * @covers \MediaWiki\Extension\AbuseFilter\ChangeTags\ChangeTagger
  * @covers \MediaWiki\Extension\AbuseFilter\BlockAutopromoteStore
diff --git a/tests/phpunit/AbuseFilterCreateAccountTestTrait.php b/tests/phpunit/AbuseFilterCreateAccountTestTrait.php
index 2daf686e0..f774cd5c4 100644
--- a/tests/phpunit/AbuseFilterCreateAccountTestTrait.php
+++ b/tests/phpunit/AbuseFilterCreateAccountTestTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Extension\AbuseFilter\AbuseFilterPreAuthenticationProvider;
+
 /**
  * This trait can be used to create accounts in integration tests.
  * NOTE: The implementing classes MUST extend MediaWikiIntegrationTestCase
diff --git a/tests/phpunit/AbuseFilterDBTest.php b/tests/phpunit/AbuseFilterDBTest.php
index eaea899d3..066ffa5f9 100644
--- a/tests/phpunit/AbuseFilterDBTest.php
+++ b/tests/phpunit/AbuseFilterDBTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Extension\AbuseFilter\AbuseFilter;
 use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesExecutor;
 use MediaWiki\Extension\AbuseFilter\Consequences\ConsequencesLookup;
diff --git a/tests/phpunit/unit/Parser/AFPDataTest.php b/tests/phpunit/unit/Parser/AFPDataTest.php
index 918149338..0457ab4ac 100644
--- a/tests/phpunit/unit/Parser/AFPDataTest.php
+++ b/tests/phpunit/unit/Parser/AFPDataTest.php
@@ -29,7 +29,7 @@ use MediaWiki\Extension\AbuseFilter\Parser\AFPException;
 /**
  * @group Test
  * @group AbuseFilter
- * @group MediaWiki\Extension\AbuseFilter\Parser\AbuseFilterParser
+ * @group AbuseFilterParser
  */
 class AFPDataTest extends ParserTestCase {
 	/**
@@ -115,7 +115,7 @@ class AFPDataTest extends ParserTestCase {
 	 * filters. Other casts are already covered in parserTests.
 	 *
 	 * @param AFPData $orig
-	 * @param string $newType One of the MediaWiki\Extension\AbuseFilter\Parser\AFPData::D* constants
+	 * @param string $newType One of the AFPData::D* constants
 	 * @param AFPData|null $expected If null, we expect an exception due to unsupported data type
 	 * @covers \MediaWiki\Extension\AbuseFilter\Parser\AFPData::castTypes
 	 * @dataProvider provideMissingCastTypes
@@ -211,7 +211,7 @@ class AFPDataTest extends ParserTestCase {
 	}
 
 	/**
-	 * Ensure that we don't allow DUNDEFINED in MediaWiki\Extension\AbuseFilter\Parser\AFPData::equals
+	 * Ensure that we don't allow DUNDEFINED in AFPData::equals
 	 *
 	 * @param AFPData $lhs
 	 * @param AFPData $rhs