diff --git a/core/core.api.php b/core/core.api.php
index 0e9e0835d9c37cd18b417dbbf74a52748c49f727..9bd8ae99b7b5cbb0be02922162bb0f2121a546dc 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -761,9 +761,9 @@
  *
  * A typical service definition in a *.services.yml file looks like this:
  * @code
- * path_alias.manager:
+ * path.alias_manager:
  *   class: Drupal\path_alias\AliasManager
- *   arguments: ['@path_alias.repository', '@path_alias.whitelist', '@language_manager']
+ *   arguments: ['@path.crud', '@path_alias.whitelist', '@language_manager']
  * @endcode
  * Some services use other services as factories; a typical service definition
  * is:
diff --git a/core/core.services.yml b/core/core.services.yml
index 61f6eef8ef0ce8f432e60cb7eaa9234cd79f8151..4dd909dbf63eb10b0f8fbc84b18d40622596b15b 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1206,7 +1206,7 @@ services:
       - { name: event_subscriber }
   path_subscriber:
     class: Drupal\Core\EventSubscriber\PathSubscriber
-    arguments: ['@path_alias.manager', '@path.current']
+    arguments: ['@path.alias_manager', '@path.current']
     deprecated: 'The "%service_id%" service is deprecated. Use "path_alias.subscriber" instead. See https://drupal.org/node/3092086'
   route_access_response_subscriber:
     class: Drupal\Core\EventSubscriber\RouteAccessResponseSubscriber
@@ -1340,7 +1340,7 @@ services:
       - { name: route_processor_outbound, priority: 200 }
   path_processor_alias:
     class: Drupal\Core\PathProcessor\PathProcessorAlias
-    arguments: ['@path_alias.manager']
+    arguments: ['@path.alias_manager']
     deprecated: 'The "%service_id%" service is deprecated. Use "path_alias.path_processor" instead. See https://drupal.org/node/3092086'
   route_processor_csrf:
     class: Drupal\Core\Access\RouteProcessorCsrf
diff --git a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
index 8af509847605985a23d537bf076acb9a49e5861e..f25bc49b4ac539c64c4431ae559b9e4258147beb 100644
--- a/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
@@ -12,10 +12,10 @@
 /**
  * Provides a path subscriber that converts path aliases.
  *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- *   \Drupal\path_alias\EventSubscriber\PathAliasSubscriber instead.
+ *   @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+ *   Use \Drupal\path_alias\EventSubscriber\PathAliasSubscriber.
  *
- * @see https://www.drupal.org/node/3092086
+ *   @see https://www.drupal.org/node/3092086
  */
 class PathSubscriber implements EventSubscriberInterface {
 
diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index 5673f6627be53ebe56fcc30fb4e9119dc7d33d4d..4c95089369f251f7e8d0519315b80415a888ba80 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -12,10 +12,10 @@
 /**
  * The default alias manager implementation.
  *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- *   \Drupal\path_alias\AliasManager instead.
+ *   @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+ *   Use \Drupal\path_alias\AliasManager.
  *
- * @see https://www.drupal.org/node/3092086
+ *   @see https://www.drupal.org/node/3092086
  */
 class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
 
diff --git a/core/lib/Drupal/Core/Path/AliasRepository.php b/core/lib/Drupal/Core/Path/AliasRepository.php
index d6f3717b76525c2ecff9c0e6793909d3941d54f0..7c28161fdfc0d374500fd614858894b8bd9e74cf 100644
--- a/core/lib/Drupal/Core/Path/AliasRepository.php
+++ b/core/lib/Drupal/Core/Path/AliasRepository.php
@@ -10,10 +10,10 @@
 /**
  * Provides the default path alias lookup operations.
  *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- *   \Drupal\path_alias\AliasRepository instead.
+ *   @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+ *   Use \Drupal\path_alias\AliasRepository.
  *
- * @see https://www.drupal.org/node/3092086
+ *   @see https://www.drupal.org/node/3092086
  */
 class AliasRepository implements AliasRepositoryInterface {
 
diff --git a/core/lib/Drupal/Core/Path/AliasWhitelist.php b/core/lib/Drupal/Core/Path/AliasWhitelist.php
index 79f2ba6dc624c48f6e7311a81ec9d3f1ba636738..ff6c193f67de6f26bf87dfa9e2677168b96c8ce1 100644
--- a/core/lib/Drupal/Core/Path/AliasWhitelist.php
+++ b/core/lib/Drupal/Core/Path/AliasWhitelist.php
@@ -11,10 +11,10 @@
 /**
  * Extends CacheCollector to build the path alias whitelist over time.
  *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- *   \Drupal\path_alias\AliasWhitelist instead.
+ *   @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+ *   Use \Drupal\path_alias\AliasWhitelist.
  *
- * @see https://www.drupal.org/node/3092086
+ *   @see https://www.drupal.org/node/3092086
  */
 class AliasWhitelist extends CacheCollector implements AliasWhitelistInterface {
 
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
index bae2028f32321ea1b7dee148c463decf1bf3e8ef..de7f29c6a70f88bf714b3b8d976fe3096bbd7c35 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
@@ -9,10 +9,10 @@
 /**
  * Processes the inbound path using path alias lookups.
  *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use
- *   \Drupal\path_alias\PathProcessor\AliasPathProcessor.
+ *   @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0.
+ *   Use \Drupal\path_alias\PathProcessor\AliasPathProcessor.
  *
- * @see https://www.drupal.org/node/3092086
+ *   @see https://www.drupal.org/node/3092086
  */
 class PathProcessorAlias implements InboundPathProcessorInterface, OutboundPathProcessorInterface {
 
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 3e17d0beda58a311fe8cc0077515ce7569655f6b..eadfa65f528ee8811ad4711d132ae31b9335cff7 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -47,7 +47,6 @@ class ContentModerationStateTest extends KernelTestBase {
     'content_translation',
     'text',
     'workflows',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/locale/tests/src/Functional/LocalePathTest.php b/core/modules/locale/tests/src/Functional/LocalePathTest.php
index 036b95747011ea53a9999b7910f01f5b6173f9fc..9b1584e44682c71ddb9daf8485d0b118f9af7906 100644
--- a/core/modules/locale/tests/src/Functional/LocalePathTest.php
+++ b/core/modules/locale/tests/src/Functional/LocalePathTest.php
@@ -106,10 +106,10 @@ public function testPathLanguageConfiguration() {
 
     // Check priority of language for alias by source path.
     $path_alias = $this->createPathAlias('/node/' . $node->id(), '/' . $custom_path, LanguageInterface::LANGCODE_NOT_SPECIFIED);
-    $lookup_path = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $node->id(), 'en');
+    $lookup_path = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $node->id(), 'en');
     $this->assertEqual('/' . $english_path, $lookup_path, 'English language alias has priority.');
     // Same check for language 'xx'.
-    $lookup_path = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $node->id(), $prefix);
+    $lookup_path = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $node->id(), $prefix);
     $this->assertEqual('/' . $custom_language_path, $lookup_path, 'Custom language alias has priority.');
     $path_alias->delete();
 
diff --git a/core/modules/path/src/PathAliasListBuilder.php b/core/modules/path/src/PathAliasListBuilder.php
index 4c6ca4622c3001a707d3d387d981c8441f0b72ec..0d6dc539e7e9ae13cab55b7ad538110045dd32d9 100644
--- a/core/modules/path/src/PathAliasListBuilder.php
+++ b/core/modules/path/src/PathAliasListBuilder.php
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\path_alias\AliasManagerInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\Url;
 use Drupal\path\Form\PathFilterForm;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -18,7 +18,7 @@
 /**
  * Defines a class to build a listing of path_alias entities.
  *
- * @see \Drupal\path_alias\Entity\PathAlias
+ * @see \Drupal\Core\Path\Entity\PathAlias
  */
 class PathAliasListBuilder extends EntityListBuilder {
 
@@ -46,7 +46,7 @@ class PathAliasListBuilder extends EntityListBuilder {
   /**
    * The path alias manager.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -63,7 +63,7 @@ class PathAliasListBuilder extends EntityListBuilder {
    *   The form builder.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
-   * @param \Drupal\path_alias\AliasManagerInterface $alias_manager
+   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The path alias manager.
    */
   public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, Request $current_request, FormBuilderInterface $form_builder, LanguageManagerInterface $language_manager, AliasManagerInterface $alias_manager) {
@@ -85,7 +85,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
       $container->get('request_stack')->getCurrentRequest(),
       $container->get('form_builder'),
       $container->get('language_manager'),
-      $container->get('path_alias.manager')
+      $container->get('path.alias_manager')
     );
   }
 
diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php
index 0836df17abca51e541d9aa0ae84170ac3e2d2800..a791d7afeb0afef3cc390b2530ca7ae1286fa569 100644
--- a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php
+++ b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php
@@ -26,7 +26,7 @@ protected function computeValue() {
 
     $entity = $this->getEntity();
     if (!$entity->isNew()) {
-      /** @var \Drupal\path_alias\AliasRepositoryInterface $path_alias_repository */
+      /** @var \Drupal\Core\Path\AliasRepositoryInterface $path_alias_repository */
       $path_alias_repository = \Drupal::service('path_alias.repository');
 
       if ($path_alias = $path_alias_repository->lookupBySystemPath('/' . $entity->toUrl()->getInternalPath(), $this->getLangcode())) {
diff --git a/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php b/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
index 79e6400355fb16b4d70fc0a6142835799fc6824d..b2e7e0d758a253414ca47437268e2816c1998fa1 100644
--- a/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
+++ b/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
@@ -14,9 +14,9 @@ abstract class UrlAliasBase extends DrupalSqlBase {
    */
   public function query() {
     // The order of the migration is significant since
-    // \Drupal\path_alias\AliasRepository::lookupPathAlias() orders by pid
-    // before returning a result. Postgres does not automatically order by
-    // primary key therefore we need to add a specific order by.
+    // \Drupal\Core\Path\AliasRepository::lookupPathAlias() orders by pid before
+    // returning a result. Postgres does not automatically order by primary key
+    // therefore we need to add a specific order by.
     return $this->select('url_alias', 'ua')->fields('ua')->orderBy('pid');
   }
 
diff --git a/core/modules/path/tests/src/Functional/PathAliasTest.php b/core/modules/path/tests/src/Functional/PathAliasTest.php
index 0ef6b99304bc75b38e99dd4b1ac3f5fdb33aa32f..54c200873dcd8852393c93943468c38412cd6644 100644
--- a/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -120,7 +120,7 @@ public function testAdminAlias() {
     $this->assertText($node1->label(), 'Changed alias works.');
     $this->assertResponse(200);
 
-    $this->container->get('path_alias.manager')->cacheClear();
+    $this->container->get('path.alias_manager')->cacheClear();
     // Confirm that previous alias no longer works.
     $this->drupalGet($previous);
     $this->assertNoText($node1->label(), 'Previous alias no longer works.');
diff --git a/core/modules/path/tests/src/Functional/PathLanguageTest.php b/core/modules/path/tests/src/Functional/PathLanguageTest.php
index a5982e15d8b4aab0f3e17318b1f37d3067eb3832..7f2167108cbb31b360562c8c8a84453cc268f00f 100644
--- a/core/modules/path/tests/src/Functional/PathLanguageTest.php
+++ b/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -101,7 +101,7 @@ public function testAliasTranslation() {
     $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
 
     // Clear the path lookup cache.
-    $this->container->get('path_alias.manager')->cacheClear();
+    $this->container->get('path.alias_manager')->cacheClear();
 
     // Languages are cached on many levels, and we need to clear those caches.
     $this->container->get('language_manager')->reset();
@@ -172,18 +172,18 @@ public function testAliasTranslation() {
 
     // The alias manager has an internal path lookup cache. Check to see that
     // it has the appropriate contents at this point.
-    $this->container->get('path_alias.manager')->cacheClear();
-    $french_node_path = $this->container->get('path_alias.manager')->getPathByAlias('/' . $french_alias, 'fr');
+    $this->container->get('path.alias_manager')->cacheClear();
+    $french_node_path = $this->container->get('path.alias_manager')->getPathByAlias('/' . $french_alias, 'fr');
     $this->assertEqual($french_node_path, '/node/' . $english_node_french_translation->id(), 'Normal path works.');
     // Second call should return the same path.
-    $french_node_path = $this->container->get('path_alias.manager')->getPathByAlias('/' . $french_alias, 'fr');
+    $french_node_path = $this->container->get('path.alias_manager')->getPathByAlias('/' . $french_alias, 'fr');
     $this->assertEqual($french_node_path, '/node/' . $english_node_french_translation->id(), 'Normal path is the same.');
 
     // Confirm that the alias works.
-    $french_node_alias = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
+    $french_node_alias = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
     $this->assertEqual($french_node_alias, '/' . $french_alias, 'Alias works.');
     // Second call should return the same alias.
-    $french_node_alias = $this->container->get('path_alias.manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
+    $french_node_alias = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
     $this->assertEqual($french_node_alias, '/' . $french_alias, 'Alias is the same.');
 
     // Confirm that the alias is removed if the translation is deleted.
diff --git a/core/modules/path/tests/src/Kernel/PathItemTest.php b/core/modules/path/tests/src/Kernel/PathItemTest.php
index 240b6cf54a7bd1965c83f7968fdc07d6531717a8..3398116d454c74b051cde3fe9892001f226e8d1a 100644
--- a/core/modules/path/tests/src/Kernel/PathItemTest.php
+++ b/core/modules/path/tests/src/Kernel/PathItemTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
    * Test creating, loading, updating and deleting aliases through PathItem.
    */
   public function testPathItem() {
-    /** @var \Drupal\path_alias\AliasRepositoryInterface $alias_repository */
+    /** @var \Drupal\Core\Path\AliasRepositoryInterface $alias_repository */
     $alias_repository = \Drupal::service('path_alias.repository');
 
     $node_storage = \Drupal::entityTypeManager()->getStorage('node');
diff --git a/core/modules/path_alias/src/Entity/PathAlias.php b/core/modules/path_alias/src/Entity/PathAlias.php
index aabbaaff1e1cae9b1b0aa4f91dd71bc528cb1628..209d160d54607a40b53700994e47454250a29044 100644
--- a/core/modules/path_alias/src/Entity/PathAlias.php
+++ b/core/modules/path_alias/src/Entity/PathAlias.php
@@ -106,7 +106,7 @@ public function preSave(EntityStorageInterface $storage) {
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
-    $alias_manager = \Drupal::service('path_alias.manager');
+    $alias_manager = \Drupal::service('path.alias_manager');
     $alias_manager->cacheClear($this->getPath());
     if ($update) {
       $alias_manager->cacheClear($this->original->getPath());
@@ -119,7 +119,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
   public static function postDelete(EntityStorageInterface $storage, array $entities) {
     parent::postDelete($storage, $entities);
 
-    $alias_manager = \Drupal::service('path_alias.manager');
+    $alias_manager = \Drupal::service('path.alias_manager');
     foreach ($entities as $entity) {
       $alias_manager->cacheClear($entity->getPath());
     }
diff --git a/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php b/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
index 42f789db28e9c921a9fa8ae3688928bccb3b272e..800c8e86c980d4d85a49dfba93a2f967739def1a 100644
--- a/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
+++ b/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
@@ -119,7 +119,7 @@ protected function assertUrlOutboundAlter($original, $final) {
    */
   protected function assertUrlInboundAlter($original, $final) {
     // Test inbound altering.
-    $result = $this->container->get('path_alias.manager')->getPathByAlias($original);
+    $result = $this->container->get('path.alias_manager')->getPathByAlias($original);
     return $this->assertIdentical($result, $final, new FormattableMarkup('Altered inbound URL %original, expected %final, and got %result.', ['%original' => $original, '%final' => $final, '%result' => $result]));
   }
 
diff --git a/core/modules/path_alias/tests/src/Kernel/AliasTest.php b/core/modules/path_alias/tests/src/Kernel/AliasTest.php
index 083a4cc2c85e1aed1479e6319b74a34b8dac7f93..b9c3cc358e01afc5967ce738800c5ca56751a725 100644
--- a/core/modules/path_alias/tests/src/Kernel/AliasTest.php
+++ b/core/modules/path_alias/tests/src/Kernel/AliasTest.php
@@ -12,7 +12,7 @@
 /**
  * Tests path alias CRUD and lookup functionality.
  *
- * @coversDefaultClass \Drupal\path_alias\AliasRepository
+ * @coversDefaultClass \Drupal\Core\Path\AliasRepository
  *
  * @group path_alias
  */
@@ -61,12 +61,12 @@ public function testLookupByAlias() {
   }
 
   /**
-   * @covers \Drupal\path_alias\AliasManager::getPathByAlias
-   * @covers \Drupal\path_alias\AliasManager::getAliasByPath
+   * @covers \Drupal\Core\Path\AliasManager::getPathByAlias
+   * @covers \Drupal\Core\Path\AliasManager::getAliasByPath
    */
   public function testLookupPath() {
     // Create AliasManager and Path object.
-    $aliasManager = $this->container->get('path_alias.manager');
+    $aliasManager = $this->container->get('path.alias_manager');
 
     // Test the situation where the source is the same for multiple aliases.
     // Start with a language-neutral alias, which we will override.
diff --git a/core/modules/path_alias/tests/src/Kernel/PathHooksTest.php b/core/modules/path_alias/tests/src/Kernel/PathHooksTest.php
index 80e2683a4095058313203fb137930ecade0ce240..2a7b867431748d3273585c4dc36084a07c964f9d 100644
--- a/core/modules/path_alias/tests/src/Kernel/PathHooksTest.php
+++ b/core/modules/path_alias/tests/src/Kernel/PathHooksTest.php
@@ -45,7 +45,7 @@ public function testPathHooks() {
     $alias_manager = $this->prophesize(AliasManagerInterface::class);
     $alias_manager->cacheClear(Argument::any())->shouldBeCalledTimes(1);
     $alias_manager->cacheClear($path_alias->getPath())->shouldBeCalledTimes(1);
-    \Drupal::getContainer()->set('path_alias.manager', $alias_manager->reveal());
+    \Drupal::getContainer()->set('path.alias_manager', $alias_manager->reveal());
     $path_alias->save();
 
     $new_source = '/' . $this->randomMachineName();
@@ -56,7 +56,7 @@ public function testPathHooks() {
     $alias_manager->cacheClear(Argument::any())->shouldBeCalledTimes(2);
     $alias_manager->cacheClear($path_alias->getPath())->shouldBeCalledTimes(1);
     $alias_manager->cacheClear($new_source)->shouldBeCalledTimes(1);
-    \Drupal::getContainer()->set('path_alias.manager', $alias_manager->reveal());
+    \Drupal::getContainer()->set('path.alias_manager', $alias_manager->reveal());
     $path_alias->setPath($new_source);
     $path_alias->save();
 
@@ -64,7 +64,7 @@ public function testPathHooks() {
     $alias_manager = $this->prophesize(AliasManagerInterface::class);
     $alias_manager->cacheClear(Argument::any())->shouldBeCalledTimes(1);
     $alias_manager->cacheClear($new_source)->shouldBeCalledTimes(1);
-    \Drupal::getContainer()->set('path_alias.manager', $alias_manager->reveal());
+    \Drupal::getContainer()->set('path.alias_manager', $alias_manager->reveal());
     $path_alias->delete();
   }
 
diff --git a/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php b/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
index e260fb6834a3b044cc58d32d1aab5179d5fb2666..c0b767480eb2b15774ecd321b8466f624481bfa6 100644
--- a/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
+++ b/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\path_alias\AliasRepositoryInterface;
+use Drupal\Core\Path\AliasRepositoryInterface;
 use Drupal\path_alias\AliasManager;
 use Drupal\Tests\UnitTestCase;
 
@@ -31,7 +31,7 @@ class AliasManagerTest extends UnitTestCase {
   /**
    * Alias repository.
    *
-   * @var \Drupal\path_alias\AliasRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Path\AliasRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $aliasRepository;
 
diff --git a/core/modules/system/src/Form/SiteInformationForm.php b/core/modules/system/src/Form/SiteInformationForm.php
index a74545fa90ce328854ff07924f814b4687ad763f..4e4e1571fd54946ab0e81394055f30d8e6b14704 100644
--- a/core/modules/system/src/Form/SiteInformationForm.php
+++ b/core/modules/system/src/Form/SiteInformationForm.php
@@ -3,11 +3,11 @@
 namespace Drupal\system\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Path\PathValidatorInterface;
 use Drupal\Core\Routing\RequestContext;
-use Drupal\path_alias\AliasManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -20,7 +20,7 @@ class SiteInformationForm extends ConfigFormBase {
   /**
    * The path alias manager.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -43,7 +43,7 @@ class SiteInformationForm extends ConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
-   * @param \Drupal\path_alias\AliasManagerInterface $alias_manager
+   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The path alias manager.
    * @param \Drupal\Core\Path\PathValidatorInterface $path_validator
    *   The path validator.
@@ -52,6 +52,7 @@ class SiteInformationForm extends ConfigFormBase {
    */
   public function __construct(ConfigFactoryInterface $config_factory, AliasManagerInterface $alias_manager, PathValidatorInterface $path_validator, RequestContext $request_context) {
     parent::__construct($config_factory);
+
     $this->aliasManager = $alias_manager;
     $this->pathValidator = $path_validator;
     $this->requestContext = $request_context;
@@ -63,7 +64,7 @@ public function __construct(ConfigFactoryInterface $config_factory, AliasManager
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
-      $container->get('path_alias.manager'),
+      $container->get('path.alias_manager'),
       $container->get('path.validator'),
       $container->get('router.request_context')
     );
diff --git a/core/modules/system/src/Plugin/Condition/RequestPath.php b/core/modules/system/src/Plugin/Condition/RequestPath.php
index 6b5801cf1a3686e5abe5c223dd3a8ccb6a761a7e..1f73624774bed40f6143f3b73568715f2e979961 100644
--- a/core/modules/system/src/Plugin/Condition/RequestPath.php
+++ b/core/modules/system/src/Plugin/Condition/RequestPath.php
@@ -4,10 +4,10 @@
 
 use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Path\PathMatcherInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\path_alias\AliasManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -24,7 +24,7 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
   /**
    * An alias manager to find the alias for the current system path.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -52,7 +52,7 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
   /**
    * Constructs a RequestPath condition plugin.
    *
-   * @param \Drupal\path_alias\AliasManagerInterface $alias_manager
+   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   An alias manager to find the alias for the current system path.
    * @param \Drupal\Core\Path\PathMatcherInterface $path_matcher
    *   The path matcher service.
@@ -80,7 +80,7 @@ public function __construct(AliasManagerInterface $alias_manager, PathMatcherInt
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
-      $container->get('path_alias.manager'),
+      $container->get('path.alias_manager'),
       $container->get('path.matcher'),
       $container->get('request_stack'),
       $container->get('path.current'),
diff --git a/core/modules/system/src/Tests/Routing/MockAliasManager.php b/core/modules/system/src/Tests/Routing/MockAliasManager.php
index dcbfbe7162bc0832ba1c949109f340694a752384..09f36366fc6725e4c8fceaed05d9d8535efc1537 100644
--- a/core/modules/system/src/Tests/Routing/MockAliasManager.php
+++ b/core/modules/system/src/Tests/Routing/MockAliasManager.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\system\Tests\Routing;
 
-use Drupal\path_alias\AliasManagerInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 
 /**
  * An easily configurable mock alias manager.
diff --git a/core/modules/views/src/Plugin/views/argument_default/Raw.php b/core/modules/views/src/Plugin/views/argument_default/Raw.php
index f44215b7fafe3c3c105079e17f1f64ff405e4989..2491bd83c0da76f1d1494fb74e58aaf5d432121a 100644
--- a/core/modules/views/src/Plugin/views/argument_default/Raw.php
+++ b/core/modules/views/src/Plugin/views/argument_default/Raw.php
@@ -5,8 +5,8 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\Path\CurrentPathStack;
-use Drupal\path_alias\AliasManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -24,7 +24,7 @@ class Raw extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
   /**
    * The alias manager.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -44,13 +44,14 @@ class Raw extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\path_alias\AliasManagerInterface $alias_manager
+   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The alias manager.
    * @param \Drupal\Core\Path\CurrentPathStack $current_path
    *   The current path.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasManagerInterface $alias_manager, CurrentPathStack $current_path) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
+
     $this->aliasManager = $alias_manager;
     $this->currentPath = $current_path;
   }
@@ -63,7 +64,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('path_alias.manager'),
+      $container->get('path.alias_manager'),
       $container->get('path.current')
     );
   }
diff --git a/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php b/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
index c3c7dd140d526258eca06bd134f6f8494ae4d62e..cc8f2c78df7ef654c4c167ce940757c1270af821 100644
--- a/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\views\Unit\Plugin\argument_default;
 
 use Drupal\Core\Path\CurrentPathStack;
-use Drupal\path_alias\AliasManagerInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\argument_default\Raw;
 use Symfony\Component\HttpFoundation\Request;
@@ -34,7 +33,7 @@ public function testGetArgument() {
     $view->expects($this->any())
       ->method('getRequest')
       ->will($this->returnValue($request));
-    $alias_manager = $this->createMock(AliasManagerInterface::class);
+    $alias_manager = $this->createMock('Drupal\Core\Path\AliasManagerInterface');
     $alias_manager->expects($this->never())
       ->method('getAliasByPath');
 
@@ -72,7 +71,7 @@ public function testGetArgument() {
     $this->assertEquals(NULL, $raw->getArgument());
 
     // Setup an alias manager with a path alias.
-    $alias_manager = $this->createMock(AliasManagerInterface::class);
+    $alias_manager = $this->createMock('Drupal\Core\Path\AliasManagerInterface');
     $alias_manager->expects($this->any())
       ->method('getAliasByPath')
       ->with($this->equalTo('/test/example'))
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index da5c0bb7e7be992c3a8d6cd4eaa24ff265fe398e..dea9361b4885016f3a5ec7f05a55d3f5d8855122 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -323,7 +323,7 @@ function views_ui_views_analyze(ViewExecutable $view) {
       continue;
     }
     if ($display->hasPath() && $path = $display->getOption('path')) {
-      $normal_path = \Drupal::service('path_alias.manager')->getPathByAlias($path);
+      $normal_path = \Drupal::service('path.alias_manager')->getPathByAlias($path);
       if ($path != $normal_path) {
         $ret[] = Analyzer::formatMessage(t('You have configured display %display with a path which is an path alias as well. This might lead to unwanted effects so better use an internal path.', ['%display' => $display->display['display_title']]), 'warning');
       }
diff --git a/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php b/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
index fdab25ecb7eb3b02936bbe9a1b82600c588219fb..e44d36b02ad45364afa7b7b642672b4c730107b7 100644
--- a/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
+++ b/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\workspaces\EventSubscriber;
 
-use Drupal\path_alias\AliasManagerInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Routing\CacheableRouteProviderInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
@@ -20,7 +20,7 @@ class WorkspaceRequestSubscriber implements EventSubscriberInterface {
   /**
    * The alias manager that caches alias lookups based on the request.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -48,7 +48,7 @@ class WorkspaceRequestSubscriber implements EventSubscriberInterface {
   /**
    * Constructs a new WorkspaceRequestSubscriber instance.
    *
-   * @param \Drupal\path_alias\AliasManagerInterface $alias_manager
+   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The alias manager.
    * @param \Drupal\Core\Path\CurrentPathStack $current_path
    *   The current path.
diff --git a/core/modules/workspaces/src/WorkspaceManager.php b/core/modules/workspaces/src/WorkspaceManager.php
index 541ca88564a4172477cf65d30b6b596a980c9db7..499c5cd786a45c45fd4b8afa419e505255e4c407 100644
--- a/core/modules/workspaces/src/WorkspaceManager.php
+++ b/core/modules/workspaces/src/WorkspaceManager.php
@@ -265,7 +265,7 @@ protected function doSwitchWorkspace($workspace) {
 
     // Clear the static cache for path aliases. We can't inject the path alias
     // manager service because it would create a circular dependency.
-    \Drupal::service('path_alias.manager')->cacheClear();
+    \Drupal::service('path.alias_manager')->cacheClear();
   }
 
   /**
diff --git a/core/modules/workspaces/tests/src/Kernel/EntityReferenceSupportedNewEntitiesConstraintValidatorTest.php b/core/modules/workspaces/tests/src/Kernel/EntityReferenceSupportedNewEntitiesConstraintValidatorTest.php
index ae5ceb8ea5d2e45bb5e9a8add247d52505b97ec0..5cef79df930d94f29adba31100f8fd09b52b004b 100644
--- a/core/modules/workspaces/tests/src/Kernel/EntityReferenceSupportedNewEntitiesConstraintValidatorTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/EntityReferenceSupportedNewEntitiesConstraintValidatorTest.php
@@ -25,7 +25,6 @@ class EntityReferenceSupportedNewEntitiesConstraintValidatorTest extends KernelT
     'user',
     'workspaces',
     'entity_test',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
index bfd23ef8e41add404d3ecf873700537046dc51d0..e59b350731aa0abbdf62080c14c53270d4a46a32 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
@@ -25,7 +25,6 @@ class WorkspaceAccessTest extends KernelTestBase {
     'system',
     'workspaces',
     'workspace_access_test',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
index 36b837feacfd7bc0691e362a33e7297cbe4c804d..80c655bd42d82246bf8eb88b6d7bb87153e9ca6b 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
@@ -53,7 +53,6 @@ class WorkspaceCRUDTest extends KernelTestBase {
     'filter',
     'node',
     'text',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
index 6466a803583acb52360427d510894046d0441f07..b2f0d42d2a1759ff6219c3b39e9336458339435b 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
@@ -67,7 +67,6 @@ class WorkspaceIntegrationTest extends KernelTestBase {
     'views',
     'language',
     'content_translation',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceMergerTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceMergerTest.php
index 59cc86ddb6df58319cebad9a257ca050275a2b00..2a3342f9964a440537977a1ae108fc71225b69f3 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceMergerTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceMergerTest.php
@@ -45,7 +45,6 @@ class WorkspaceMergerTest extends KernelTestBase {
     'text',
     'user',
     'system',
-    'path_alias',
   ];
 
   /**
diff --git a/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php b/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php
index 3aba7fb2af556159892e0122127086731651e138..e5f109832d0cae7bc227ff03335a0aba78474f2e 100644
--- a/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php
+++ b/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\workspaces\Unit;
 
-use Drupal\path_alias\AliasManagerInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Routing\CacheableRouteProviderInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
@@ -20,7 +20,7 @@
 class WorkspaceRequestSubscriberTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
diff --git a/core/modules/workspaces/workspaces.services.yml b/core/modules/workspaces/workspaces.services.yml
index 1db8c49ebffad662f812a0e0ce2d50d9e43f6135..ee7b573becac95d0cbf9c00ddb88f831e5fe4dfa 100644
--- a/core/modules/workspaces/workspaces.services.yml
+++ b/core/modules/workspaces/workspaces.services.yml
@@ -40,7 +40,7 @@ services:
       - { name: 'event_subscriber' }
   workspaces.workspace_subscriber:
     class: Drupal\workspaces\EventSubscriber\WorkspaceRequestSubscriber
-    arguments: ['@path_alias.manager', '@path.current', '@router.route_provider', '@workspaces.manager']
+    arguments: ['@path.alias_manager', '@path.current', '@router.route_provider', '@workspaces.manager']
     tags:
       - { name: event_subscriber }
 
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
index 6835cc3bd02525d3dbdbfd1f318b71c18bc5d96d..acd87a0ba9a382add0aeecdfa38cd3ee28becc96 100644
--- a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
+++ b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\Exception\FileException;
 use Drupal\Core\File\FileSystemInterface;
-use Drupal\path_alias\AliasManagerInterface;
+use Drupal\Core\Path\AliasManagerInterface;
 use Drupal\Core\State\StateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -23,7 +23,7 @@ class InstallHelper implements ContainerInjectionInterface {
   /**
    * The path alias manager.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface
+   * @var \Drupal\Core\Path\AliasManagerInterface
    */
   protected $aliasManager;
 
@@ -99,7 +99,7 @@ class InstallHelper implements ContainerInjectionInterface {
   /**
    * Constructs a new InstallHelper object.
    *
-   * @param \Drupal\path_alias\AliasManagerInterface $aliasManager
+   * @param \Drupal\Core\Path\AliasManagerInterface $aliasManager
    *   The path alias manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   Entity type manager.
@@ -127,7 +127,7 @@ public function __construct(AliasManagerInterface $aliasManager, EntityTypeManag
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('path_alias.manager'),
+      $container->get('path.alias_manager'),
       $container->get('entity_type.manager'),
       $container->get('module_handler'),
       $container->get('state'),
diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
index 17006fc3e38813b83729bea9db932016e6c0085e..91bec84427c002348ee18469f47da6773101657b 100644
--- a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
+++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
@@ -28,7 +28,7 @@ class DefaultConfigTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['system', 'user', 'path_alias'];
+  public static $modules = ['system', 'user'];
 
   /**
    * The following config entries are changed on module install.
diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
index 12569a6ca72d429b231484a43e4ca4f8471a3680..f9b56859d44f4d6679dac1cb6efdafec65dfab8c 100644
--- a/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
@@ -63,7 +63,7 @@ protected function setUp() {
 
     // Set a mock alias manager in the container.
     $this->aliasManager = new MockAliasManager();
-    $this->container->set('path_alias.manager', $this->aliasManager);
+    $this->container->set('path.alias_manager', $this->aliasManager);
 
     // Set the test request stack in the container.
     $this->requestStack = new RequestStack();
diff --git a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index 6daa3964c8d7048230ae29b6af98e7552aa66b4e..7ab002d9c06a1a01776f3f82b3f6cadcc193c909 100644
--- a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -576,8 +576,8 @@ public function testRouteCaching() {
 
     // A path with a path alias.
     $this->createPathAlias('/path/add/one', '/path/add-one');
-    /** @var \Drupal\path_alias\AliasManagerInterface $alias_manager */
-    $alias_manager = \Drupal::service('path_alias.manager');
+    /** @var \Drupal\Core\Path\AliasManagerInterface $alias_manager */
+    $alias_manager = \Drupal::service('path.alias_manager');
     $alias_manager->cacheClear();
 
     $path = '/path/add-one';
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
index d9cb77aea9c4973d4877ce6395dc5d8aaa42c51d..63b94ff4638d2c6ba7d2cdf96fc47b6ed876cbb6 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
@@ -68,7 +67,7 @@ public function testContainerWithLazyServices() {
    */
   public function testContainerWithLazyServicesWithoutProxyClass() {
     $container = new ContainerBuilder();
-    $container->register('path.current', CurrentPathStack::class)
+    $container->register('alias_whitelist', 'Drupal\Core\Path\AliasWhitelist')
       ->setLazy(TRUE);
 
     $this->expectException(InvalidArgumentException::class);
diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
index 0233f71e1df9019c3806c674cf6f08ec29ef899a..ce401b125576fb9928a2c4a2269f6b3b4ad0ed3e 100644
--- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -4,16 +4,16 @@
 
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\PathProcessor\PathProcessorAlias;
 use Drupal\Core\PathProcessor\PathProcessorDecode;
 use Drupal\Core\PathProcessor\PathProcessorFront;
 use Drupal\Core\PathProcessor\PathProcessorManager;
 use Drupal\language\HttpKernel\PathProcessorLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
-use Drupal\path_alias\AliasManager;
-use Drupal\path_alias\PathProcessor\AliasPathProcessor;
-use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 
+use Drupal\Tests\UnitTestCase;
+
 /**
  * Tests processing of the inbound path.
  *
@@ -87,7 +87,7 @@ protected function setUp() {
   public function testProcessInbound() {
 
     // Create an alias manager stub.
-    $alias_manager = $this->getMockBuilder(AliasManager::class)
+    $alias_manager = $this->getMockBuilder('Drupal\Core\Path\AliasManager')
       ->disableOriginalConstructor()
       ->getMock();
 
@@ -148,7 +148,7 @@ public function testProcessInbound() {
       ->getMock();
 
     // Create the processors.
-    $alias_processor = new AliasPathProcessor($alias_manager);
+    $alias_processor = new PathProcessorAlias($alias_manager);
     $decode_processor = new PathProcessorDecode();
     $front_processor = new PathProcessorFront($config_factory_stub);
     $language_processor = new PathProcessorLanguage($config_factory_stub, $this->languageManager, $negotiator, $current_user, $config_subscriber);
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 35ebc81c818160d4f7318d6752216598b8933cb3..c01aafac0d7422acd4dc1be292534345b4e1e70b 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -5,12 +5,12 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\PathProcessor\PathProcessorAlias;
 use Drupal\Core\PathProcessor\PathProcessorManager;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Routing\RequestContext;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Routing\UrlGenerator;
-use Drupal\path_alias\PathProcessor\AliasPathProcessor;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 use Symfony\Component\HttpFoundation\Request;
@@ -43,7 +43,7 @@ class UrlGeneratorTest extends UnitTestCase {
   /**
    * The alias manager.
    *
-   * @var \Drupal\path_alias\AliasManager|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Path\AliasManager|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $aliasManager;
 
@@ -143,7 +143,7 @@ protected function setUp() {
       ->will($this->returnValueMap($routes_names_return_map));
 
     // Create an alias manager stub.
-    $alias_manager = $this->getMockBuilder('Drupal\path_alias\AliasManager')
+    $alias_manager = $this->getMockBuilder('Drupal\Core\Path\AliasManager')
       ->disableOriginalConstructor()
       ->getMock();
 
@@ -160,7 +160,7 @@ protected function setUp() {
     $this->context = new RequestContext();
     $this->context->fromRequestStack($this->requestStack);
 
-    $processor = new AliasPathProcessor($this->aliasManager);
+    $processor = new PathProcessorAlias($this->aliasManager);
     $processor_manager = new PathProcessorManager();
     $processor_manager->addOutbound($processor, 1000);
     $this->processorManager = $processor_manager;
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 5843bae302a7122e30595f329800fc8ebd02a4b0..4094a48d5732d6afd0da540c51eff724bb98313d 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -42,7 +42,7 @@ class UrlTest extends UnitTestCase {
   /**
    * The path alias manager.
    *
-   * @var \Drupal\path_alias\AliasManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Path\AliasManagerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $pathAliasManager;
 
@@ -101,7 +101,7 @@ protected function setUp() {
       ->method('generateFromRoute')
       ->will($this->returnValueMap($generate_from_route_map));
 
-    $this->pathAliasManager = $this->createMock('Drupal\path_alias\AliasManagerInterface');
+    $this->pathAliasManager = $this->createMock('Drupal\Core\Path\AliasManagerInterface');
     $this->pathAliasManager->expects($this->any())
       ->method('getPathByAlias')
       ->will($this->returnValueMap($alias_map));
@@ -112,7 +112,7 @@ protected function setUp() {
     $this->container = new ContainerBuilder();
     $this->container->set('router.no_access_checks', $this->router);
     $this->container->set('url_generator', $this->urlGenerator);
-    $this->container->set('path_alias.manager', $this->pathAliasManager);
+    $this->container->set('path.alias_manager', $this->pathAliasManager);
     $this->container->set('path.validator', $this->pathValidator);
     \Drupal::setContainer($this->container);
   }
diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index 88d6387aabd50baa8a13061f18e9aefb0928740c..9d3d49ed51c734158e4e072624c7ef7cef39a713 100644
--- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -190,6 +190,15 @@ public static function getSkippedDeprecations() {
       // The following deprecation is listed for Twig 2 compatibility when unit
       // testing using \Symfony\Component\ErrorHandler\DebugClassLoader.
       'The "Twig\Environment::getTemplateClass()" method is considered internal. It may change without further notice. You should not extend it from "Drupal\Core\Template\TwigEnvironment".',
+      // These deprecations are triggered when instantiating path alias
+      // services. The new versions live in the "path_alias" module.
+      // @todo Remove in https://www.drupal.org/node/3092090.
+      'The "path.alias_manager" service is deprecated. Use "path_alias.manager" instead. See https://drupal.org/node/3092086',
+      'The \Drupal\Core\EventSubscriber\PathSubscriber class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\EventSubscriber\PathAliasSubscriber. See https://drupal.org/node/3092086',
+      'The \Drupal\Core\PathProcessor\PathProcessorAlias class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\PathProcessor\AliasPathProcessor. See https://drupal.org/node/3092086',
+      'The \Drupal\Core\Path\AliasManager class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasManager. See https://drupal.org/node/3092086',
+      'The \Drupal\Core\Path\AliasRepository class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasRepository. See https://drupal.org/node/3092086',
+      'The \Drupal\Core\Path\AliasWhitelist class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasWhitelist. See https://drupal.org/node/3092086',
       '"Symfony\Component\DomCrawler\Crawler::text()" will normalize whitespaces by default in Symfony 5.0, set the second "$normalizeWhitespace" argument to false to retrieve the non-normalized version of the text.',
     ];
   }