diff --git a/RELEASE-NOTES-1.41 b/RELEASE-NOTES-1.41
index 25c2fe493db..4d85a411e6a 100644
--- a/RELEASE-NOTES-1.41
+++ b/RELEASE-NOTES-1.41
@@ -650,6 +650,9 @@ because of Phabricator reports.
   - SpecialRedirectWithAction
   - UnlistedSpecialPage
   - WantedQueryPage
+* Some title-related classes have been namespaced under MediaWiki\Title; the old
+  class names are now deprecated aliases:
+  - TitleValue
 * Various mediawiki.ui variables have been deprecated in favor of
   'mediawiki.skin.variables.less' Codex design tokens featuring replacements.
 * Hook handlers must now be specified either as a PHP callable, or as a PHP
diff --git a/autoload.php b/autoload.php
index afb8feca1d2..d4add5a04b7 100644
--- a/autoload.php
+++ b/autoload.php
@@ -2185,6 +2185,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Title\\TitleArray' => __DIR__ . '/includes/title/TitleArray.php',
 	'MediaWiki\\Title\\TitleArrayFromResult' => __DIR__ . '/includes/title/TitleArrayFromResult.php',
 	'MediaWiki\\Title\\TitleFactory' => __DIR__ . '/includes/title/TitleFactory.php',
+	'MediaWiki\\Title\\TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
 	'MediaWiki\\User\\ActorCache' => __DIR__ . '/includes/user/ActorCache.php',
 	'MediaWiki\\User\\ActorMigration' => __DIR__ . '/includes/user/ActorMigration.php',
 	'MediaWiki\\User\\ActorMigrationBase' => __DIR__ . '/includes/user/ActorMigrationBase.php',
diff --git a/includes/Category/CategoryViewer.php b/includes/Category/CategoryViewer.php
index 02374daa69c..f0d4f18a843 100644
--- a/includes/Category/CategoryViewer.php
+++ b/includes/Category/CategoryViewer.php
@@ -39,8 +39,8 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MWException;
-use TitleValue;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
 class CategoryViewer extends ContextSource {
diff --git a/includes/CommentFormatter/CommentParser.php b/includes/CommentFormatter/CommentParser.php
index 75689145fb7..fa1a73763bf 100644
--- a/includes/CommentFormatter/CommentParser.php
+++ b/includes/CommentFormatter/CommentParser.php
@@ -15,13 +15,13 @@ use MediaWiki\Linker\Linker;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\WikiMap\WikiMap;
 use NamespaceInfo;
 use Parser;
 use RepoGroup;
 use StringUtils;
 use TitleParser;
-use TitleValue;
 
 /**
  * The text processing backend for CommentFormatter.
diff --git a/includes/CommentFormatter/RowCommentIterator.php b/includes/CommentFormatter/RowCommentIterator.php
index 620a2e7ee76..3a0247889c4 100644
--- a/includes/CommentFormatter/RowCommentIterator.php
+++ b/includes/CommentFormatter/RowCommentIterator.php
@@ -5,7 +5,7 @@ namespace MediaWiki\CommentFormatter;
 use ArrayIterator;
 use IteratorIterator;
 use MediaWiki\CommentStore\CommentStore;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Traversable;
 
 /**
diff --git a/includes/Output/OutputPage.php b/includes/Output/OutputPage.php
index 74642356fee..4415f737553 100644
--- a/includes/Output/OutputPage.php
+++ b/includes/Output/OutputPage.php
@@ -53,6 +53,7 @@ use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\MWTimestamp;
 use Message;
 use MWDebug;
@@ -66,7 +67,6 @@ use RequestContext;
 use Sanitizer;
 use Skin;
 use TextContent;
-use TitleValue;
 use Wikimedia\AtEase\AtEase;
 use Wikimedia\LightweightObjectStore\ExpirationAwareness;
 use Wikimedia\Parsoid\Core\TOCData;
diff --git a/includes/Permissions/RestrictionStore.php b/includes/Permissions/RestrictionStore.php
index 506a8a42108..ef59784cb47 100644
--- a/includes/Permissions/RestrictionStore.php
+++ b/includes/Permissions/RestrictionStore.php
@@ -16,8 +16,8 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use stdClass;
-use TitleValue;
 use WANObjectCache;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\ILoadBalancer;
diff --git a/includes/Permissions/UserAuthority.php b/includes/Permissions/UserAuthority.php
index d107eba49c2..ef721181c8a 100644
--- a/includes/Permissions/UserAuthority.php
+++ b/includes/Permissions/UserAuthority.php
@@ -28,8 +28,8 @@ use MediaWiki\Block\BlockErrorFormatter;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Request\WebRequest;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
-use TitleValue;
 use User;
 use Wikimedia\Assert\Assert;
 use Wikimedia\DebugInfo\DebugInfoTrait;
diff --git a/includes/ResourceLoader/UserModule.php b/includes/ResourceLoader/UserModule.php
index e073283f714..8d70a586de5 100644
--- a/includes/ResourceLoader/UserModule.php
+++ b/includes/ResourceLoader/UserModule.php
@@ -24,7 +24,7 @@ namespace MediaWiki\ResourceLoader;
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Module for user customizations scripts.
diff --git a/includes/ResourceLoader/UserStylesModule.php b/includes/ResourceLoader/UserStylesModule.php
index 63e165036f3..3aeee03b21f 100644
--- a/includes/ResourceLoader/UserStylesModule.php
+++ b/includes/ResourceLoader/UserStylesModule.php
@@ -24,7 +24,7 @@ namespace MediaWiki\ResourceLoader;
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Module for user customizations styles.
diff --git a/includes/ResourceLoader/WikiModule.php b/includes/ResourceLoader/WikiModule.php
index 0e8bcbf1e1f..05eb9a4ba4c 100644
--- a/includes/ResourceLoader/WikiModule.php
+++ b/includes/ResourceLoader/WikiModule.php
@@ -32,8 +32,8 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MemoizedCallable;
-use TitleValue;
 use Wikimedia\Minify\CSSMin;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index d7ba907efd2..7f26bc85e3d 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IReadableDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index 8c2bedf285d..59bc8aa5fe7 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -29,6 +29,7 @@ use MediaWiki\CommentFormatter\CommentItem;
 use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 7f312206467..036880623b7 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -34,6 +34,7 @@ use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleFactory;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\TempUser\TempUserCreator;
 use MediaWiki\Utils\UrlUtils;
 use Wikimedia\ParamValidator\ParamValidator;
diff --git a/includes/api/ApiQueryWatchlistRaw.php b/includes/api/ApiQueryWatchlistRaw.php
index c0c48d7e4eb..d88bb8129a5 100644
--- a/includes/api/ApiQueryWatchlistRaw.php
+++ b/includes/api/ApiQueryWatchlistRaw.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\ParamValidator\TypeDef\UserDef;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 
diff --git a/includes/block/UnblockUser.php b/includes/block/UnblockUser.php
index 13277117535..24ead29d9e5 100644
--- a/includes/block/UnblockUser.php
+++ b/includes/block/UnblockUser.php
@@ -27,10 +27,10 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Status\Status;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use RevisionDeleteUser;
-use TitleValue;
 
 /**
  * Backend class for unblocking users
diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php
index 2891d17901f..d809a8d4baf 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -34,6 +34,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php
index ec1aaf88906..ce617493dc7 100644
--- a/includes/cache/LinkBatch.php
+++ b/includes/cache/LinkBatch.php
@@ -27,6 +27,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\ProperPageIdentity;
+use MediaWiki\Title\TitleValue;
 use Psr\Log\LoggerInterface;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\IConnectionProvider;
diff --git a/includes/cache/LinkCache.php b/includes/cache/LinkCache.php
index f8665115d2c..c95704ecdc3 100644
--- a/includes/cache/LinkCache.php
+++ b/includes/cache/LinkCache.php
@@ -27,6 +27,7 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageStoreRecord;
+use MediaWiki\Title\TitleValue;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 46df7d71329..7e8b0ba6fd2 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -29,6 +29,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * Object handling generic submission, CSRF protection, layout and
diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index dda54f94cb6..5fade0979e1 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -29,9 +29,9 @@ use MediaWiki\Html\Html;
 use MediaWiki\Page\PageReference;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Sanitizer;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Assert\Assert;
 
 /**
diff --git a/includes/linker/LinkTargetStore.php b/includes/linker/LinkTargetStore.php
index ec1cefcaf2a..abb5ac044c9 100644
--- a/includes/linker/LinkTargetStore.php
+++ b/includes/linker/LinkTargetStore.php
@@ -22,9 +22,9 @@ namespace MediaWiki\Linker;
 
 use BagOStuff;
 use InvalidArgumentException;
+use MediaWiki\Title\TitleValue;
 use RuntimeException;
 use stdClass;
-use TitleValue;
 use WANObjectCache;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/linker/Linker.php b/includes/linker/Linker.php
index 6a0e97bcd72..6dbeeb8e3d2 100644
--- a/includes/linker/Linker.php
+++ b/includes/linker/Linker.php
@@ -40,11 +40,11 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Message;
 use MessageLocalizer;
 use Parser;
 use RequestContext;
-use TitleValue;
 use User;
 use Wikimedia\Assert\Assert;
 use Wikimedia\IPUtils;
diff --git a/includes/page/RollbackPage.php b/includes/page/RollbackPage.php
index 12e1ccec263..3f6bc2e49a0 100644
--- a/includes/page/RollbackPage.php
+++ b/includes/page/RollbackPage.php
@@ -34,6 +34,7 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Storage\EditResult;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\ActorMigration;
 use MediaWiki\User\ActorNormalization;
 use MediaWiki\User\UserFactory;
@@ -42,7 +43,6 @@ use Message;
 use RecentChange;
 use StatusValue;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index 0f8cce5a200..0e144d5415b 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -39,6 +39,7 @@ use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Message;
 use MessageLocalizer;
 use MessageSpecifier;
@@ -48,7 +49,6 @@ use ReadOnlyError;
 use RequestContext;
 use SearchEngineFactory;
 use Skin;
-use TitleValue;
 use User;
 use UserNotLoggedIn;
 
diff --git a/includes/specials/SpecialAllPages.php b/includes/specials/SpecialAllPages.php
index 1bb86ca9cba..776eff9d690 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -31,8 +31,8 @@ use MediaWiki\Page\ExistingPageRecord;
 use MediaWiki\Page\PageStore;
 use MediaWiki\SpecialPage\IncludableSpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use SearchEngineFactory;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index fd837bd68cb..969f2372928 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -48,13 +48,13 @@ use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\SpecialPage\UnlistedSpecialPage;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Watchlist\WatchlistManager;
 use NamespaceInfo;
 use OOUIHTMLForm;
 use Parser;
 use ParserOutput;
 use TitleParser;
-use TitleValue;
 use UserNotLoggedIn;
 use WatchedItemStore;
 use WatchedItemStoreInterface;
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 6cc3176aeae..bf0f2950111 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -30,11 +30,11 @@ use MediaWiki\ExternalLinks\LinkFilter;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
 use MediaWiki\SpecialPage\QueryPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\UrlUtils;
 use Parser;
 use Skin;
 use stdClass;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index 831bdecba3c..9e5233f1bf6 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -35,13 +35,13 @@ use MediaWiki\Html\Html;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\SpecialPage\ChangesListSpecialPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Utils\MWTimestamp;
 use MessageCache;
 use OOUI\ButtonWidget;
 use OOUI\HtmlSnippet;
 use RecentChange;
-use TitleValue;
 use WatchedItemStoreInterface;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php
index 3b519668ed9..be932f4f999 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -31,11 +31,11 @@ use MediaWiki\Block\UnblockUserFactory;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserNamePrefixSearch;
 use MediaWiki\User\UserNameUtils;
 use MediaWiki\Watchlist\WatchlistManager;
-use TitleValue;
 use Wikimedia\IPUtils;
 
 /**
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 9b900651e61..01eea5d5b70 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -37,11 +37,11 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Request\DerivativeRequest;
 use MediaWiki\SpecialPage\ChangesListSpecialPage;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserOptionsLookup;
 use MediaWiki\Watchlist\WatchlistManager;
 use RecentChange;
-use TitleValue;
 use UserNotLoggedIn;
 use WatchedItem;
 use WatchedItemStoreInterface;
diff --git a/includes/specials/pagers/CategoryPager.php b/includes/specials/pagers/CategoryPager.php
index 313d6895ba6..bd31198a432 100644
--- a/includes/specials/pagers/CategoryPager.php
+++ b/includes/specials/pagers/CategoryPager.php
@@ -27,7 +27,7 @@ use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Title\Title;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php
index 0191e091109..4bfc17e4708 100644
--- a/includes/specials/pagers/NewFilesPager.php
+++ b/includes/specials/pagers/NewFilesPager.php
@@ -30,8 +30,8 @@ use MediaWiki\Html\FormOptions;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Permissions\GroupPermissionsLookup;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use RecentChange;
-use TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php
index 868fef62746..aec36b40d00 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -25,6 +25,7 @@ use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\IPUtils;
 
 /**
diff --git a/includes/title/NamespaceInfo.php b/includes/title/NamespaceInfo.php
index d7046b513a9..7024d18f49d 100644
--- a/includes/title/NamespaceInfo.php
+++ b/includes/title/NamespaceInfo.php
@@ -25,6 +25,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Title\TitleValue;
 
 /**
  * This is a utility class for dealing with namespaces that encodes all the "magic" behaviors of
diff --git a/includes/title/Title.php b/includes/title/Title.php
index 6d54aa03903..129109dd033 100644
--- a/includes/title/Title.php
+++ b/includes/title/Title.php
@@ -63,7 +63,6 @@ use RuntimeException;
 use Sanitizer;
 use stdClass;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/title/TitleParser.php b/includes/title/TitleParser.php
index 0ce5ece015a..f14fc110c80 100644
--- a/includes/title/TitleParser.php
+++ b/includes/title/TitleParser.php
@@ -21,6 +21,8 @@
  * @author Daniel Kinzler
  */
 
+use MediaWiki\Title\TitleValue;
+
 /**
  * A title parser service for %MediaWiki.
  *
diff --git a/includes/title/TitleValue.php b/includes/title/TitleValue.php
index f4282268d9a..e734dad7e83 100644
--- a/includes/title/TitleValue.php
+++ b/includes/title/TitleValue.php
@@ -20,6 +20,10 @@
  * @file
  * @author Daniel Kinzler
  */
+
+namespace MediaWiki\Title;
+
+use InvalidArgumentException;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageReference;
 use Wikimedia\Assert\Assert;
@@ -262,3 +266,9 @@ class TitleValue implements LinkTarget {
 			&& ( $other->getFragment() === $this->getFragment() );
 	}
 }
+
+/**
+ * Retain the old class name for backwards compatibility.
+ * @deprecated since 1.41
+ */
+class_alias( TitleValue::class, 'TitleValue' );
diff --git a/includes/watcheditem/WatchedItem.php b/includes/watcheditem/WatchedItem.php
index 75f8222140f..6dae9db2e37 100644
--- a/includes/watcheditem/WatchedItem.php
+++ b/includes/watcheditem/WatchedItem.php
@@ -21,6 +21,7 @@
 
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php
index 9c6ba1ea222..ac3df15cbd9 100644
--- a/includes/watcheditem/WatchedItemQueryService.php
+++ b/includes/watcheditem/WatchedItemQueryService.php
@@ -6,6 +6,7 @@ use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserOptionsLookup;
 use Wikimedia\Assert\Assert;
diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php
index 12174a0d6cc..164804c206a 100644
--- a/includes/watcheditem/WatchedItemStore.php
+++ b/includes/watcheditem/WatchedItemStore.php
@@ -7,6 +7,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Revision\RevisionLookup;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Assert\Assert;
diff --git a/maintenance/benchmarks/benchmarkTitleValue.php b/maintenance/benchmarks/benchmarkTitleValue.php
index 5b25acef297..0aeff2cf797 100644
--- a/maintenance/benchmarks/benchmarkTitleValue.php
+++ b/maintenance/benchmarks/benchmarkTitleValue.php
@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 require_once __DIR__ . '/../includes/Benchmarker.php';
 
diff --git a/maintenance/migrateLinksTable.php b/maintenance/migrateLinksTable.php
index a6476b8c1f2..bb2e0ea97b0 100644
--- a/maintenance/migrateLinksTable.php
+++ b/maintenance/migrateLinksTable.php
@@ -2,6 +2,8 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\Title\TitleValue;
+
 /**
  * Maintenance script that populates normalization column in links tables.
  *
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 0e2b1729257..b74d5b450ec 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -30,6 +30,7 @@ use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\IResultWrapper;
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index edfead608be..a9d6ecb43ea 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -39,6 +39,7 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\Utils\MWTimestamp;
diff --git a/tests/phpunit/includes/ParamValidator/TypeDef/TitleDefTest.php b/tests/phpunit/includes/ParamValidator/TypeDef/TitleDefTest.php
index dd021113ae5..2d2955d5cf6 100644
--- a/tests/phpunit/includes/ParamValidator/TypeDef/TitleDefTest.php
+++ b/tests/phpunit/includes/ParamValidator/TypeDef/TitleDefTest.php
@@ -5,7 +5,7 @@ namespace MediaWiki\ParamValidator\TypeDef;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Title\Title;
-use TitleValue;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\SimpleCallbacks;
 
diff --git a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
index d17bf563e21..8484bfc0249 100644
--- a/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
+++ b/tests/phpunit/includes/ResourceLoader/WikiModuleTest.php
@@ -20,10 +20,10 @@ use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\DerivativeContext;
 use MediaWiki\ResourceLoader\WikiModule;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\WikiMap\WikiMap;
 use ReflectionMethod;
 use ResourceLoaderTestCase;
-use TitleValue;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IReadableDatabase;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/includes/Revision/MutableRevisionRecordTest.php b/tests/phpunit/includes/Revision/MutableRevisionRecordTest.php
index 852abffbfd6..5816c8d0535 100644
--- a/tests/phpunit/includes/Revision/MutableRevisionRecordTest.php
+++ b/tests/phpunit/includes/Revision/MutableRevisionRecordTest.php
@@ -7,9 +7,9 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
 use MockTitleTrait;
-use TitleValue;
 use Wikimedia\Assert\PreconditionException;
 
 /**
diff --git a/tests/phpunit/includes/Revision/RenderedRevisionTest.php b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
index 65f51a9ca7a..eaf2274ed34 100644
--- a/tests/phpunit/includes/Revision/RenderedRevisionTest.php
+++ b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
@@ -19,12 +19,12 @@ use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Revision\SuppressedDataException;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use ParserOptions;
 use ParserOutput;
 use PHPUnit\Framework\MockObject\MockObject;
-use TitleValue;
 use Wikimedia\TestingAccessWrapper;
 use WikitextContent;
 
diff --git a/tests/phpunit/includes/Revision/RevisionArchiveRecordTest.php b/tests/phpunit/includes/Revision/RevisionArchiveRecordTest.php
index 9df0396145a..7268e5308f3 100644
--- a/tests/phpunit/includes/Revision/RevisionArchiveRecordTest.php
+++ b/tests/phpunit/includes/Revision/RevisionArchiveRecordTest.php
@@ -11,12 +11,12 @@ use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionSlots;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use stdClass;
 use TextContent;
-use TitleValue;
 use Wikimedia\Assert\PreconditionException;
 
 /**
diff --git a/tests/phpunit/includes/Revision/RevisionStoreRecordTest.php b/tests/phpunit/includes/Revision/RevisionStoreRecordTest.php
index aeb352b897d..a3c95ec3c78 100644
--- a/tests/phpunit/includes/Revision/RevisionStoreRecordTest.php
+++ b/tests/phpunit/includes/Revision/RevisionStoreRecordTest.php
@@ -11,12 +11,12 @@ use MediaWiki\Revision\RevisionSlots;
 use MediaWiki\Revision\RevisionStoreRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use stdClass;
 use TextContent;
-use TitleValue;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\Timestamp\TimestampException;
 
diff --git a/tests/phpunit/includes/actions/WatchActionTest.php b/tests/phpunit/includes/actions/WatchActionTest.php
index a3cb7fb8c21..950f60755b7 100644
--- a/tests/phpunit/includes/actions/WatchActionTest.php
+++ b/tests/phpunit/includes/actions/WatchActionTest.php
@@ -9,6 +9,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentityValue;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php
index 01d28edab4a..26b6a4150db 100644
--- a/tests/phpunit/includes/api/ApiComparePagesTest.php
+++ b/tests/phpunit/includes/api/ApiComparePagesTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 4f4fa91baa0..a2c1b7acb68 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -5,6 +5,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\MWTimestamp;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php
index 492e470bc5a..53f15b23771 100644
--- a/tests/phpunit/includes/api/ApiPageSetTest.php
+++ b/tests/phpunit/includes/api/ApiPageSetTest.php
@@ -7,6 +7,7 @@ use MediaWiki\Page\PageReference;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php
index d33a0952586..09f0c9de386 100644
--- a/tests/phpunit/includes/api/ApiParseTest.php
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -23,6 +23,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
index 40d9e83c0cb..50070137ff5 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
index 83369e88713..2297c507ceb 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserRigorOptions;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
index 7183041655e..dde7b327e59 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group medium
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
index 1653c5eca00..5af61c50c0e 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\TitleValue;
+
 /**
  * @group API
  * @group Database
diff --git a/tests/phpunit/includes/cache/LinkBatchTest.php b/tests/phpunit/includes/cache/LinkBatchTest.php
index e7e2857e1b7..532b84fe234 100644
--- a/tests/phpunit/includes/cache/LinkBatchTest.php
+++ b/tests/phpunit/includes/cache/LinkBatchTest.php
@@ -7,6 +7,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/tests/phpunit/includes/cache/LinkCacheTest.php b/tests/phpunit/includes/cache/LinkCacheTest.php
index 62738222d52..09c1a855389 100644
--- a/tests/phpunit/includes/cache/LinkCacheTest.php
+++ b/tests/phpunit/includes/cache/LinkCacheTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group Database
diff --git a/tests/phpunit/includes/debug/MWDebugTest.php b/tests/phpunit/includes/debug/MWDebugTest.php
index 1e899760f6d..05ed3db2848 100644
--- a/tests/phpunit/includes/debug/MWDebugTest.php
+++ b/tests/phpunit/includes/debug/MWDebugTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\AtEase\AtEase;
 
 class MWDebugTest extends MediaWikiIntegrationTestCase {
diff --git a/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php b/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
index 8abf66087a8..46fea1d40b1 100644
--- a/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksDeletionUpdateTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate;
 use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers \MediaWiki\Deferred\LinksUpdate\LinksDeletionUpdate
diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php
index e309aad9da6..dda8b68383b 100644
--- a/tests/phpunit/includes/deferred/LinksUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -7,6 +7,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/includes/filerepo/file/FileTest.php b/tests/phpunit/includes/filerepo/file/FileTest.php
index 21f8b8afc85..136b51b84fd 100644
--- a/tests/phpunit/includes/filerepo/file/FileTest.php
+++ b/tests/phpunit/includes/filerepo/file/FileTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentityValue;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\WikiMap\WikiMap;
 
 class FileTest extends MediaWikiMediaTestCase {
diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
index e12fcda512b..9842ea39ae0 100644
--- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 
diff --git a/tests/phpunit/includes/language/LanguageConverterTest.php b/tests/phpunit/includes/language/LanguageConverterTest.php
index a7ba58f24e6..f6dc28d5920 100644
--- a/tests/phpunit/includes/language/LanguageConverterTest.php
+++ b/tests/phpunit/includes/language/LanguageConverterTest.php
@@ -5,6 +5,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserOptionsLookup;
 
 /**
diff --git a/tests/phpunit/includes/linker/LinkRendererTest.php b/tests/phpunit/includes/linker/LinkRendererTest.php
index eadeb122179..e2854ce6dc3 100644
--- a/tests/phpunit/includes/linker/LinkRendererTest.php
+++ b/tests/phpunit/includes/linker/LinkRendererTest.php
@@ -7,6 +7,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers MediaWiki\Linker\LinkRenderer
diff --git a/tests/phpunit/includes/linker/LinkTargetStoreTest.php b/tests/phpunit/includes/linker/LinkTargetStoreTest.php
index cd01d20fe5b..2f81595a252 100644
--- a/tests/phpunit/includes/linker/LinkTargetStoreTest.php
+++ b/tests/phpunit/includes/linker/LinkTargetStoreTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group Database
diff --git a/tests/phpunit/includes/logging/BlockLogFormatterTest.php b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
index d51243d993a..6250506b9f9 100644
--- a/tests/phpunit/includes/logging/BlockLogFormatterTest.php
+++ b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\TitleValue;
+
 /**
  * @covers BlockLogFormatter
  */
diff --git a/tests/phpunit/includes/page/PageStoreTest.php b/tests/phpunit/includes/page/PageStoreTest.php
index c5a31a19cae..5c6a00711fe 100644
--- a/tests/phpunit/includes/page/PageStoreTest.php
+++ b/tests/phpunit/includes/page/PageStoreTest.php
@@ -12,9 +12,9 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageRecord;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
 use MockTitleTrait;
-use TitleValue;
 use Wikimedia\Assert\PreconditionException;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
diff --git a/tests/phpunit/includes/parser/ParserOutputTest.php b/tests/phpunit/includes/parser/ParserOutputTest.php
index 317a35be3db..2d57c05b0d9 100644
--- a/tests/phpunit/includes/parser/ParserOutputTest.php
+++ b/tests/phpunit/includes/parser/ParserOutputTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Parser\ParserOutputStringSets;
 use MediaWiki\Tests\Parser\ParserCacheSerializationTestCases;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Bcp47Code\Bcp47CodeValue;
 use Wikimedia\Parsoid\Core\SectionMetadata;
diff --git a/tests/phpunit/includes/skins/SkinTest.php b/tests/phpunit/includes/skins/SkinTest.php
index 0ca2f239473..efc253e7883 100644
--- a/tests/phpunit/includes/skins/SkinTest.php
+++ b/tests/phpunit/includes/skins/SkinTest.php
@@ -8,6 +8,7 @@ use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityLookup;
 use MediaWiki\User\UserIdentityValue;
diff --git a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
index e325f5c8a59..824f42abbec 100644
--- a/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
+++ b/tests/phpunit/includes/title/MediaWikiTitleCodecTest.php
@@ -25,6 +25,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers MediaWikiTitleCodec
diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php
index f96dd760f4a..cdcbce268b0 100644
--- a/tests/phpunit/includes/title/NamespaceInfoTest.php
+++ b/tests/phpunit/includes/title/NamespaceInfoTest.php
@@ -9,6 +9,7 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 class NamespaceInfoTest extends MediaWikiIntegrationTestCase {
 	use TestAllServiceOptionsUsed;
diff --git a/tests/phpunit/includes/title/TitleTest.php b/tests/phpunit/includes/title/TitleTest.php
index 4e3690dd0a8..ea6d027cfcb 100644
--- a/tests/phpunit/includes/title/TitleTest.php
+++ b/tests/phpunit/includes/title/TitleTest.php
@@ -7,6 +7,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Assert\PreconditionException;
 
diff --git a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php
index 18228b4aaa3..8471f676d39 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceIntegrationTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\MainConfigNames;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserOptionsLookup;
 
 /**
diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index 31795ce1336..06533509f20 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -10,6 +10,7 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Rdbms\DBConnRef;
diff --git a/tests/phpunit/integration/includes/CommentFormatter/CommentFormatterTest.php b/tests/phpunit/integration/includes/CommentFormatter/CommentFormatterTest.php
index b8c8598c5c7..75be9731e5c 100644
--- a/tests/phpunit/integration/includes/CommentFormatter/CommentFormatterTest.php
+++ b/tests/phpunit/integration/includes/CommentFormatter/CommentFormatterTest.php
@@ -12,9 +12,9 @@ use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Tests\Unit\CommentFormatter\CommentFormatterTestUtils;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
-use TitleValue;
 
 /**
  * Trivial comment formatting with a mocked parser. Can't be a unit test because
diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php
index c211a58520a..74fbb69d29c 100644
--- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php
+++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php
@@ -28,12 +28,12 @@ use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Tests\Rest\RestTestTrait;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiIntegrationTestCase;
 use NullStatsdDataFactory;
 use ParserCache;
 use PHPUnit\Framework\MockObject\MockObject;
-use TitleValue;
 use Wikimedia\Message\ITextFormatter;
 use Wikimedia\Message\MessageValue;
 use Wikimedia\Parsoid\Config\DataAccess;
diff --git a/tests/phpunit/unit/includes/CommentFormatter/CommentBatchTest.php b/tests/phpunit/unit/includes/CommentFormatter/CommentBatchTest.php
index 47ce025b71c..a4966e21c9b 100644
--- a/tests/phpunit/unit/includes/CommentFormatter/CommentBatchTest.php
+++ b/tests/phpunit/unit/includes/CommentFormatter/CommentBatchTest.php
@@ -5,8 +5,8 @@ namespace MediaWiki\Tests\Unit\CommentFormatter;
 use MediaWiki\CommentFormatter\CommentBatch;
 use MediaWiki\CommentFormatter\CommentFormatter;
 use MediaWiki\CommentFormatter\CommentItem;
+use MediaWiki\Title\TitleValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * Trivial unit test with the universe mocked.
diff --git a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
index b2a8e455aa8..0bd5ac2aa6f 100644
--- a/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
+++ b/tests/phpunit/unit/includes/Rest/Handler/SearchHandlerTest.php
@@ -21,6 +21,7 @@ use MediaWiki\Search\Entity\SearchResultThumbnail;
 use MediaWiki\Search\SearchResultThumbnailProvider;
 use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserOptionsLookup;
 use MockSearchResultSet;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -31,7 +32,6 @@ use SearchResultSet;
 use SearchSuggestion;
 use SearchSuggestionSet;
 use TitleFormatter;
-use TitleValue;
 use Wikimedia\Message\MessageValue;
 
 /**
diff --git a/tests/phpunit/unit/includes/cache/CacheKeyHelperTest.php b/tests/phpunit/unit/includes/cache/CacheKeyHelperTest.php
index ceb2eafacb0..51be82ba804 100644
--- a/tests/phpunit/unit/includes/cache/CacheKeyHelperTest.php
+++ b/tests/phpunit/unit/includes/cache/CacheKeyHelperTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group Cache
diff --git a/tests/phpunit/unit/includes/cache/LinkBatchFactoryTest.php b/tests/phpunit/unit/includes/cache/LinkBatchFactoryTest.php
index 99e0549c051..f948b67bd37 100644
--- a/tests/phpunit/unit/includes/cache/LinkBatchFactoryTest.php
+++ b/tests/phpunit/unit/includes/cache/LinkBatchFactoryTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWiki\Title\TitleValue;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/tests/phpunit/unit/includes/linker/LinksMigrationTest.php b/tests/phpunit/unit/includes/linker/LinksMigrationTest.php
index 1d4469024be..de612647ce6 100644
--- a/tests/phpunit/unit/includes/linker/LinksMigrationTest.php
+++ b/tests/phpunit/unit/includes/linker/LinksMigrationTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Linker\LinkTargetLookup;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers MediaWiki\Linker\LinksMigration
diff --git a/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php b/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
index 1efcb41c8ce..b1b8232aad3 100644
--- a/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
+++ b/tests/phpunit/unit/includes/page/File/BadFileLookupTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Page\File\BadFileLookup;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @coversDefaultClass \MediaWiki\Page\File\BadFileLookup
diff --git a/tests/phpunit/unit/includes/title/TitleTest.php b/tests/phpunit/unit/includes/title/TitleTest.php
index 3689878f2fe..fc69d4c6bf7 100644
--- a/tests/phpunit/unit/includes/title/TitleTest.php
+++ b/tests/phpunit/unit/includes/title/TitleTest.php
@@ -26,9 +26,9 @@ use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWikiUnitTestCase;
-use TitleValue;
 
 /**
  * @covers MediaWiki\Title\Title
diff --git a/tests/phpunit/unit/includes/title/TitleValueTest.php b/tests/phpunit/unit/includes/title/TitleValueTest.php
index ce0e7bd401d..979a827160f 100644
--- a/tests/phpunit/unit/includes/title/TitleValueTest.php
+++ b/tests/phpunit/unit/includes/title/TitleValueTest.php
@@ -23,6 +23,7 @@ use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @covers TitleValue
diff --git a/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php b/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
index 471ea145cb9..b9d8e3d4753 100644
--- a/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
+++ b/tests/phpunit/unit/includes/watcheditem/NoWriteWatchedItemStoreUnitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\Rdbms\DBReadOnlyError;
 
diff --git a/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
index c590b082b1c..e73183128e6 100644
--- a/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
+++ b/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\User\UserOptionsLookup;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/phpunit/unit/includes/watcheditem/WatchedItemUnitTest.php b/tests/phpunit/unit/includes/watcheditem/WatchedItemUnitTest.php
index a8bdf205d8b..907a51962a3 100644
--- a/tests/phpunit/unit/includes/watcheditem/WatchedItemUnitTest.php
+++ b/tests/phpunit/unit/includes/watcheditem/WatchedItemUnitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
diff --git a/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
index bed2040b73e..1cf2525bf5f 100644
--- a/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
+++ b/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
@@ -9,6 +9,7 @@ use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 use MediaWiki\User\TalkPageNotificationManager;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;