diff --git a/docs/config-schema.yaml b/docs/config-schema.yaml
index 0aa0142485b..523822362d9 100644
--- a/docs/config-schema.yaml
+++ b/docs/config-schema.yaml
@@ -3344,7 +3344,7 @@ config-schema:
             **Example: Using an alternate subclass**
             ```
             $wgResourceModules['ext.myExtension'] = [
-              'class' => WikiModule::class,
+              'class' => \MediaWiki\ResourceLoader\WikiModule::class,
             ];
             ```
             **Example: Deprecated module**
diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index bb98ef4ce19..3d8aa2710a1 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -350,7 +350,7 @@
 							}
 						},
 						{
-							"description": "A ResourceLoader ImageModule definition",
+							"description": "An ImageModule definition",
 							"additionalProperties": false,
 							"properties": {
 								"class": {
@@ -398,7 +398,7 @@
 							}
 						},
 						{
-							"description": "An arbitrary ResourceLoaderModule definition by class",
+							"description": "An arbitrary ResourceLoader Module definition by class",
 							"properties": {
 								"class": {
 									"type": "string",
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index a0efd586ba3..90cfc7d513d 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -174,7 +174,7 @@
 					"type": "object",
 					"anyOf": [
 						{
-							"description": "A ResourceLoader FileModule definition",
+							"description": "A FileModule definition",
 							"additionalProperties": false,
 							"properties": {
 								"localBasePath": {
@@ -321,7 +321,7 @@
 							}
 						},
 						{
-							"description": "A ResourceLoader WikiModule definition",
+							"description": "A WikiModule definition",
 							"additionalProperties": false,
 							"properties": {
 								"class": {
@@ -363,7 +363,7 @@
 							}
 						},
 						{
-							"description": "A ResourceLoaderImageModule definition",
+							"description": "An ImageModule definition",
 							"additionalProperties": false,
 							"properties": {
 								"class": {
diff --git a/includes/MainConfigSchema.php b/includes/MainConfigSchema.php
index a073dba1451..0523f073a67 100644
--- a/includes/MainConfigSchema.php
+++ b/includes/MainConfigSchema.php
@@ -5206,7 +5206,7 @@ class MainConfigSchema {
 	 *
 	 * ```
 	 * $wgResourceModules['ext.myExtension'] = [
-	 *   'class' => WikiModule::class,
+	 *   'class' => \MediaWiki\ResourceLoader\WikiModule::class,
 	 * ];
 	 * ```
 	 *
diff --git a/includes/ResourceLoader/CodexModule.php b/includes/ResourceLoader/CodexModule.php
index 9cc0b208b9e..00cc99b7ef1 100644
--- a/includes/ResourceLoader/CodexModule.php
+++ b/includes/ResourceLoader/CodexModule.php
@@ -61,7 +61,7 @@ class CodexModule extends FileModule {
 	 *     "packageFiles": [
 	 *         {
 	 *             "name": "icons.json",
-	 *             "callback": "ResourceLoaderCodexModule::getIcons",
+	 *             "callback": "MediaWiki\\ResourceLoader\\CodexModule::getIcons",
 	 *             "callbackParam": [
 	 *                 "cdxIconClear",
 	 *                 "cdxIconTrash"
diff --git a/includes/ResourceLoader/Hook/ResourceLoaderSiteModulePagesHook.php b/includes/ResourceLoader/Hook/ResourceLoaderSiteModulePagesHook.php
index 245b678d2f4..a97b65ef2c6 100644
--- a/includes/ResourceLoader/Hook/ResourceLoaderSiteModulePagesHook.php
+++ b/includes/ResourceLoader/Hook/ResourceLoaderSiteModulePagesHook.php
@@ -13,7 +13,7 @@ interface ResourceLoaderSiteModulePagesHook {
 	/**
 	 * Change which wiki pages comprise the `site` module in given skin.
 	 *
-	 * This hook is called from ResourceLoaderSiteModule.
+	 * This hook is called from MediaWiki\ResourceLoader\SiteModule.
 	 *
 	 * @since 1.35
 	 * @param string $skin Current skin key
diff --git a/includes/ResourceLoader/ResourceLoader.php b/includes/ResourceLoader/ResourceLoader.php
index ba942e09713..3c37834d74e 100644
--- a/includes/ResourceLoader/ResourceLoader.php
+++ b/includes/ResourceLoader/ResourceLoader.php
@@ -451,7 +451,7 @@ class ResourceLoader implements LoggerAwareInterface {
 			}
 		}
 
-		// Batched version of ResourceLoaderWikiModule::getTitleInfo
+		// Batched version of WikiModule::getTitleInfo
 		$dbr = wfGetDB( DB_REPLICA );
 		WikiModule::preloadTitleInfo( $context, $dbr, $moduleNames );
 
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index f8a24713109..0d00e4f74a0 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -152,7 +152,7 @@ class WebInstallerOutput {
 		] );
 		$module->setConfig( $resourceLoader->getConfig() );
 
-		// Based on: ResourceLoaderFileModule::getStyles (without the DB query)
+		// Based on MediaWiki\ResourceLoader\FileModule::getStyles, without the DB query
 		$styles = ResourceLoader::makeCombinedStyles(
 			$module->readStyleFiles(
 				$module->getStyleFiles( $rlContext ),
diff --git a/load.php b/load.php
index c2435874e94..e2eb9650f8a 100644
--- a/load.php
+++ b/load.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * The web entry point for ResourceLoader, which serves static CSS/JavaScript
- * via ResourceLoaderModule subclasses.
+ * The web entry point for @ref ResourceLoader, which serves static CSS/JavaScript
+ * via @ref MediaWiki\ResourceLoader\Module Module subclasses.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by