diff --git a/includes/ResourceLoaderULSJsonMessageModule.php b/includes/ResourceLoaderULSJsonMessageModule.php
index a5941854..ab3a4399 100644
--- a/includes/ResourceLoaderULSJsonMessageModule.php
+++ b/includes/ResourceLoaderULSJsonMessageModule.php
@@ -9,22 +9,22 @@
 
 namespace UniversalLanguageSelector;
 
-use ResourceLoaderContext;
-use ResourceLoaderModule;
+use MediaWiki\ResourceLoader\Context;
+use MediaWiki\ResourceLoader\Module;
 use Xml;
 
 /**
  * ResourceLoader module for client-side loading of json-based localization.
  */
-class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
+class ResourceLoaderULSJsonMessageModule extends Module {
 	/**
 	 * Part of the ResourceLoader module interface.
 	 * Declares the core ext.uls.i18n module as a dependency.
 	 * @suppress PhanParamSignatureRealMismatchParamType, UnusedSuppression -- T308443
-	 * @param ResourceLoaderContext|null $context
+	 * @param Context|null $context
 	 * @return string[] Module names.
 	 */
-	public function getDependencies( ResourceLoaderContext $context = null ) {
+	public function getDependencies( Context $context = null ) {
 		return [ 'ext.uls.i18n' ];
 	}
 
@@ -38,10 +38,10 @@ class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
 
 	/**
 	 * @suppress PhanParamSignatureRealMismatchParamType, UnusedSuppression -- T308443
-	 * @param ResourceLoaderContext $context
+	 * @param Context $context
 	 * @return array
 	 */
-	public function getDefinitionSummary( ResourceLoaderContext $context ) {
+	public function getDefinitionSummary( Context $context ) {
 		$code = $context->getLanguage();
 		$fileHashes = array_map(
 			[ __CLASS__, 'safeFileHash' ],
@@ -59,10 +59,10 @@ class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
 	 * Get the message strings for the current UI language. Uses
 	 * mw.uls.loadLocalization to register them on the frontend.
 	 * @suppress PhanParamSignatureRealMismatchParamType, UnusedSuppression -- T308443
-	 * @param ResourceLoaderContext $context
+	 * @param Context $context
 	 * @return string JavaScript code.
 	 */
-	public function getScript( ResourceLoaderContext $context ) {
+	public function getScript( Context $context ) {
 		$code = $context->getLanguage();
 		$params = [ $code, ULSJsonMessageLoader::getMessages( $code ) ];
 
diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php
index 3efc3989..3b2ac66b 100644
--- a/includes/ResourceLoaderULSModule.php
+++ b/includes/ResourceLoaderULSModule.php
@@ -23,14 +23,14 @@ namespace UniversalLanguageSelector;
 
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\MediaWikiServices;
-use ResourceLoader;
-use ResourceLoaderContext;
-use ResourceLoaderModule;
+use MediaWiki\ResourceLoader\Context;
+use MediaWiki\ResourceLoader\Module;
+use MediaWiki\ResourceLoader\ResourceLoader;
 
 /**
  * ResourceLoader module for UniversalLanguageSelector
  */
-class ResourceLoaderULSModule extends ResourceLoaderModule {
+class ResourceLoaderULSModule extends Module {
 	/** @var string[] */
 	protected $targets = [ 'desktop', 'mobile' ];
 
@@ -51,10 +51,10 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
 
 	/**
 	 * @suppress PhanParamSignatureRealMismatchParamType, UnusedSuppression -- T308443
-	 * @param ResourceLoaderContext $context
+	 * @param Context $context
 	 * @return string JavaScript code
 	 */
-	public function getScript( ResourceLoaderContext $context ) {
+	public function getScript( Context $context ) {
 		$languageCode = $context->getLanguage();
 		return ResourceLoader::makeConfigSetScript( $this->getData( $languageCode ) );
 	}
diff --git a/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php b/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php
index 5ef90202..7446b53b 100644
--- a/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php
+++ b/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php
@@ -2,6 +2,7 @@
 
 namespace UniversalLanguageSelector\Tests;
 
+use MediaWiki\ResourceLoader\Context;
 use UniversalLanguageSelector\ResourceLoaderULSJsonMessageModule;
 
 /**
@@ -15,7 +16,7 @@ class ResourceLoaderULSJsonMessageModuleTest extends \PHPUnit\Framework\TestCase
 	public function testAllReturnValues() {
 		$instance = new ResourceLoaderULSJsonMessageModule();
 
-		$context = $this->createMock( \ResourceLoaderContext::class );
+		$context = $this->createMock( Context::class );
 		$context->method( 'getLanguage' )
 			->willReturn( 'en' );
 
diff --git a/tests/phpunit/ResourceLoaderULSModuleTest.php b/tests/phpunit/ResourceLoaderULSModuleTest.php
index 832c49cb..406b5b88 100644
--- a/tests/phpunit/ResourceLoaderULSModuleTest.php
+++ b/tests/phpunit/ResourceLoaderULSModuleTest.php
@@ -2,6 +2,7 @@
 
 namespace UniversalLanguageSelector\Tests;
 
+use MediaWiki\ResourceLoader\Context;
 use UniversalLanguageSelector\ResourceLoaderULSModule;
 
 /**
@@ -15,7 +16,7 @@ class ResourceLoaderULSModuleTest extends \PHPUnit\Framework\TestCase {
 	public function testAllReturnValues() {
 		$instance = new ResourceLoaderULSModule();
 
-		$context = $this->createMock( \ResourceLoaderContext::class );
+		$context = $this->createMock( Context::class );
 		$context->method( 'getLanguage' )
 			->willReturn( 'en' );