diff --git a/includes/Api/ApiCoreThank.php b/includes/Api/ApiCoreThank.php
index 57a22668..40384037 100644
--- a/includes/Api/ApiCoreThank.php
+++ b/includes/Api/ApiCoreThank.php
@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Extension\Thanks\Api;
 
-use ApiBase;
-use ApiMain;
 use DatabaseLogEntry;
 use LogEntry;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Notifications\DiscussionParser;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Thanks\Storage\Exceptions\InvalidLogType;
diff --git a/includes/Api/ApiFlowThank.php b/includes/Api/ApiFlowThank.php
index 860a3d85..5b3b0b01 100644
--- a/includes/Api/ApiFlowThank.php
+++ b/includes/Api/ApiFlowThank.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\Thanks\Api;
 
-use ApiBase;
-use ApiMain;
 use Flow\Container;
 use Flow\Conversion\Utils;
 use Flow\Exception\FlowException;
 use Flow\Model\PostRevision;
 use Flow\Model\UUID;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Thanks\Storage\LogStore;
 use MediaWiki\Permissions\PermissionManager;
diff --git a/includes/Api/ApiThank.php b/includes/Api/ApiThank.php
index 7be8b569..9c9f22e0 100644
--- a/includes/Api/ApiThank.php
+++ b/includes/Api/ApiThank.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Thanks\Api;
 
-use ApiBase;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Thanks\Storage\LogStore;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Title\Title;
diff --git a/includes/EchoHooks.php b/includes/EchoHooks.php
index a61f5bb7..eeb30dc1 100644
--- a/includes/EchoHooks.php
+++ b/includes/EchoHooks.php
@@ -2,12 +2,12 @@
 
 namespace MediaWiki\Extension\Thanks;
 
-use ExtensionRegistry;
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Hooks\BeforeCreateEchoEventHook;
 use MediaWiki\Extension\Notifications\Hooks\EchoGetBundleRulesHook;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\UserLocator;
+use MediaWiki\Registration\ExtensionRegistry;
 
 /**
  * Hooks for Thanks extension
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 728c2c78..c264863b 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,13 +4,12 @@
 
 namespace MediaWiki\Extension\Thanks;
 
-use ApiModuleManager;
 use Article;
 use DatabaseLogEntry;
 use DifferenceEngine;
-use ExtensionRegistry;
 use LogEventsList;
 use LogPage;
+use MediaWiki\Api\ApiModuleManager;
 use MediaWiki\Api\Hook\ApiMain__moduleManagerHook;
 use MediaWiki\Auth\Hook\LocalUserCreatedHook;
 use MediaWiki\Block\Hook\GetAllBlockActionsHook;
@@ -33,6 +32,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Output\Hook\BeforePageDisplayHook;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\PermissionManager;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\SpecialPage\SpecialPage;
diff --git a/includes/SpecialThanks.php b/includes/SpecialThanks.php
index addbce06..4fc2eead 100644
--- a/includes/SpecialThanks.php
+++ b/includes/SpecialThanks.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Extension\Thanks;
 
-use ApiMain;
-use ApiUsageException;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Request\DerivativeRequest;
diff --git a/includes/Storage/LogStore.php b/includes/Storage/LogStore.php
index 45401a66..c410430d 100644
--- a/includes/Storage/LogStore.php
+++ b/includes/Storage/LogStore.php
@@ -3,12 +3,12 @@
 namespace MediaWiki\Extension\Thanks\Storage;
 
 use DatabaseLogEntry;
-use ExtensionRegistry;
 use ManualLogEntry;
 use MediaWiki\CheckUser\Hooks;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Extension\Thanks\Storage\Exceptions\InvalidLogType;
 use MediaWiki\Extension\Thanks\Storage\Exceptions\LogDeleted;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\User;
 use Wikimedia\Rdbms\IConnectionProvider;
diff --git a/includes/ThanksQueryHelper.php b/includes/ThanksQueryHelper.php
index c2758088..9cf2ddd5 100644
--- a/includes/ThanksQueryHelper.php
+++ b/includes/ThanksQueryHelper.php
@@ -1,11 +1,11 @@
 <?php
 namespace MediaWiki\Extension\Thanks;
 
-use DBAccessObjectUtils;
-use IDBAccessObject;
 use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
+use Wikimedia\Rdbms\DBAccessObjectUtils;
 use Wikimedia\Rdbms\IConnectionProvider;
+use Wikimedia\Rdbms\IDBAccessObject;
 
 /**
  * Query module
diff --git a/tests/phpunit/ApiCoreThankIntegrationTest.php b/tests/phpunit/ApiCoreThankIntegrationTest.php
index f66414ba..eeb42cf7 100644
--- a/tests/phpunit/ApiCoreThankIntegrationTest.php
+++ b/tests/phpunit/ApiCoreThankIntegrationTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\User\User;
diff --git a/tests/phpunit/ApiCoreThankUnitTest.php b/tests/phpunit/ApiCoreThankUnitTest.php
index 12195245..a589d563 100644
--- a/tests/phpunit/ApiCoreThankUnitTest.php
+++ b/tests/phpunit/ApiCoreThankUnitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Extension\Thanks\Api\ApiCoreThank;
 use MediaWiki\Tests\Api\ApiTestCase;
diff --git a/tests/phpunit/ApiFlowThankIntegrationTest.php b/tests/phpunit/ApiFlowThankIntegrationTest.php
index 0fcce69e..cdd13551 100644
--- a/tests/phpunit/ApiFlowThankIntegrationTest.php
+++ b/tests/phpunit/ApiFlowThankIntegrationTest.php
@@ -5,6 +5,7 @@ use Flow\Model\PostRevision;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
 use MediaWiki\Deferred\DeferredUpdates;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;