diff --git a/core/core.services.yml b/core/core.services.yml
index 3d63c2fb27..3eaacf9ea2 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -711,7 +711,7 @@ services:
     tags:
       - { name: persist }
   current_route_match:
-     class: Drupal\Core\Routing\CurrentRouteMatch
+     class: Drupal\Component\Routing\CurrentRouteMatch
      arguments: ['@request_stack']
   event_dispatcher:
     class: Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 58c0c7f2f3..e810383c61 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -241,7 +241,7 @@ public static function requestStack() {
   /**
    * Retrieves the currently active route match object.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   The currently active route match object.
    */
   public static function routeMatch() {
diff --git a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php b/core/lib/Drupal/Component/Routing/CurrentRouteMatch.php
similarity index 95%
rename from core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
rename to core/lib/Drupal/Component/Routing/CurrentRouteMatch.php
index 195a48d574..a8a39f6f47 100644
--- a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
+++ b/core/lib/Drupal/Component/Routing/CurrentRouteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -80,7 +80,7 @@ public function getRawParameters() {
   /**
    * Returns the route match for the current request.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   The current route match object.
    */
   public function getCurrentRouteMatch() {
@@ -93,7 +93,7 @@ public function getCurrentRouteMatch() {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   A request object.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   A route match object created from the request.
    */
   protected function getRouteMatch(Request $request) {
diff --git a/core/lib/Drupal/Component/Routing/LICENSE.txt b/core/lib/Drupal/Component/Routing/LICENSE.txt
new file mode 100644
index 0000000000..94fb84639c
--- /dev/null
+++ b/core/lib/Drupal/Component/Routing/LICENSE.txt
@@ -0,0 +1,339 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+         END OF TERMS AND CONDITIONS
+
+      How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/core/lib/Drupal/Core/Routing/NullRouteMatch.php b/core/lib/Drupal/Component/Routing/NullRouteMatch.php
similarity index 95%
rename from core/lib/Drupal/Core/Routing/NullRouteMatch.php
rename to core/lib/Drupal/Component/Routing/NullRouteMatch.php
index 05fd684149..29e0659256 100644
--- a/core/lib/Drupal/Core/Routing/NullRouteMatch.php
+++ b/core/lib/Drupal/Component/Routing/NullRouteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 use Symfony\Component\HttpFoundation\ParameterBag;
 
diff --git a/core/lib/Drupal/Component/Routing/README.txt b/core/lib/Drupal/Component/Routing/README.txt
new file mode 100644
index 0000000000..8fa3e4b119
--- /dev/null
+++ b/core/lib/Drupal/Component/Routing/README.txt
@@ -0,0 +1,12 @@
+The Drupal Routing Component
+
+Thanks for using this Drupal component.
+
+You can participate in its development on Drupal.org, through our issue system:
+https://www.drupal.org/project/issues/drupal
+
+You can get the full Drupal repo here:
+https://www.drupal.org/project/drupal/git-instructions
+
+You can browse the full Drupal repo here:
+https://git.drupalcode.org/project/drupal
diff --git a/core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php b/core/lib/Drupal/Component/Routing/ResettableStackedRouteMatchInterface.php
similarity index 82%
rename from core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php
rename to core/lib/Drupal/Component/Routing/ResettableStackedRouteMatchInterface.php
index 6f926fe3cb..85ee09f64e 100644
--- a/core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php
+++ b/core/lib/Drupal/Component/Routing/ResettableStackedRouteMatchInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 /**
  * Defines an interface for a resettable stack of route matches.
  *
- * @todo Move this method to \Drupal\Core\Routing\StackedRouteMatchInterface in
+ * @todo Move this method to \Drupal\Component\Routing\StackedRouteMatchInterface in
  *   https://www.drupal.org/node/2659952.
  */
 interface ResettableStackedRouteMatchInterface extends StackedRouteMatchInterface {
diff --git a/core/lib/Drupal/Core/Routing/RouteMatch.php b/core/lib/Drupal/Component/Routing/RouteMatch.php
similarity index 97%
rename from core/lib/Drupal/Core/Routing/RouteMatch.php
rename to core/lib/Drupal/Component/Routing/RouteMatch.php
index 10c444758f..1da0e363ce 100644
--- a/core/lib/Drupal/Core/Routing/RouteMatch.php
+++ b/core/lib/Drupal/Component/Routing/RouteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -70,7 +70,7 @@ public function __construct($route_name, Route $route, array $parameters = [], a
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   A request object.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   A new RouteMatch object if there's a matched route for the request.
    *   A new NullRouteMatch object otherwise (e.g., on a 404 page or when
    *   invoked prior to routing).
diff --git a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php b/core/lib/Drupal/Component/Routing/RouteMatchInterface.php
similarity index 89%
rename from core/lib/Drupal/Core/Routing/RouteMatchInterface.php
rename to core/lib/Drupal/Component/Routing/RouteMatchInterface.php
index 7e8113c192..261112c53e 100644
--- a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php
+++ b/core/lib/Drupal/Component/Routing/RouteMatchInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 /**
  * Provides an interface for classes representing the result of routing.
@@ -51,7 +51,7 @@ public function getRouteObject();
    *   The parameter value. NULL if the route doesn't define the parameter or
    *   if the parameter value can't be determined from the request.
    *
-   * @see \Drupal\Core\Routing\RouteMatchInterface::getRawParameter()
+   * @see \Drupal\Component\Routing\RouteMatchInterface::getRawParameter()
    */
   public function getParameter($parameter_name);
 
@@ -67,7 +67,7 @@ public function getParameter($parameter_name);
    * @return \Symfony\Component\HttpFoundation\ParameterBag
    *   The parameter bag.
    *
-   * @see \Drupal\Core\Routing\RouteMatchInterface::getRawParameters()
+   * @see \Drupal\Component\Routing\RouteMatchInterface::getRawParameters()
    */
   public function getParameters();
 
@@ -82,7 +82,7 @@ public function getParameters();
    *   the parameter or if the raw parameter value can't be determined from the
    *   request.
    *
-   * @see \Drupal\Core\Routing\RouteMatchInterface::getParameter()
+   * @see \Drupal\Component\Routing\RouteMatchInterface::getParameter()
    */
   public function getRawParameter($parameter_name);
 
@@ -92,7 +92,7 @@ public function getRawParameter($parameter_name);
    * @return \Symfony\Component\HttpFoundation\ParameterBag
    *   The parameter bag.
    *
-   * @see \Drupal\Core\Routing\RouteMatchInterface::getParameters()
+   * @see \Drupal\Component\Routing\RouteMatchInterface::getParameters()
    */
   public function getRawParameters();
 
diff --git a/core/lib/Drupal/Core/Routing/StackedRouteMatchInterface.php b/core/lib/Drupal/Component/Routing/StackedRouteMatchInterface.php
similarity index 76%
rename from core/lib/Drupal/Core/Routing/StackedRouteMatchInterface.php
rename to core/lib/Drupal/Component/Routing/StackedRouteMatchInterface.php
index c20796fe86..9f3e357dce 100644
--- a/core/lib/Drupal/Core/Routing/StackedRouteMatchInterface.php
+++ b/core/lib/Drupal/Component/Routing/StackedRouteMatchInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Routing;
+namespace Drupal\Component\Routing;
 
 use Symfony\Component\HttpFoundation\Request;
 
@@ -14,21 +14,21 @@ interface StackedRouteMatchInterface extends RouteMatchInterface {
   /**
    * Gets the current route match.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    */
   public function getCurrentRouteMatch();
 
   /**
    * Gets the master route match..
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    */
   public function getMasterRouteMatch();
 
   /**
    * Returns the parent route match of the current.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface|null
+   * @return \Drupal\Component\Routing\RouteMatchInterface|null
    *   The parent route match or NULL, if it the master route match.
    */
   public function getParentRouteMatch();
@@ -39,7 +39,7 @@ public function getParentRouteMatch();
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface|null
+   * @return \Drupal\Component\Routing\RouteMatchInterface|null
    *   The matching route match, or NULL if there is no matching one.
    */
   public function getRouteMatchFromRequest(Request $request);
diff --git a/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactory.php b/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactory.php
index 2bf807149d..570203ff9a 100644
--- a/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactory.php
+++ b/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactory.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Access;
 
 use Drupal\Component\Utility\ArgumentsResolver;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactoryInterface.php b/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactoryInterface.php
index c62c5276b9..bc806759a3 100644
--- a/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactoryInterface.php
+++ b/core/lib/Drupal/Core/Access/AccessArgumentsResolverFactoryInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Access;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -14,7 +14,7 @@ interface AccessArgumentsResolverFactoryInterface {
   /**
    * Returns the arguments resolver to use when running access checks.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object to be checked.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account being checked.
diff --git a/core/lib/Drupal/Core/Access/AccessManager.php b/core/lib/Drupal/Core/Access/AccessManager.php
index d2b7e55f99..08067f5e79 100644
--- a/core/lib/Drupal/Core/Access/AccessManager.php
+++ b/core/lib/Drupal/Core/Access/AccessManager.php
@@ -4,8 +4,8 @@
 
 use Drupal\Core\ParamConverter\ParamConverterManagerInterface;
 use Drupal\Core\ParamConverter\ParamNotConvertedException;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Component\Utility\ArgumentsResolverInterface;
diff --git a/core/lib/Drupal/Core/Access/AccessManagerInterface.php b/core/lib/Drupal/Core/Access/AccessManagerInterface.php
index 2ea6a6a9c2..83663a6b4c 100644
--- a/core/lib/Drupal/Core/Access/AccessManagerInterface.php
+++ b/core/lib/Drupal/Core/Access/AccessManagerInterface.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides an interface for attaching and running access check services.
@@ -60,7 +60,7 @@ public function checkRequest(Request $request, AccountInterface $account = NULL,
    *
    * Determines whether the route is accessible or not.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   (optional) Run access checks for this account. Defaults to the current
diff --git a/core/lib/Drupal/Core/Access/CsrfAccessCheck.php b/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
index 48e75acb58..8f8489b059 100644
--- a/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
+++ b/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Access;
 
 use Drupal\Core\Routing\Access\AccessInterface as RoutingAccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -40,7 +40,7 @@ public function __construct(CsrfTokenGenerator $csrf_token) {
    *   The route to check against.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object.
    *
    * @return \Drupal\Core\Access\AccessResultInterface
diff --git a/core/lib/Drupal/Core/Access/CustomAccessCheck.php b/core/lib/Drupal/Core/Access/CustomAccessCheck.php
index 353d09cd80..f659f193e0 100644
--- a/core/lib/Drupal/Core/Access/CustomAccessCheck.php
+++ b/core/lib/Drupal/Core/Access/CustomAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Controller\ControllerResolverInterface;
 use Drupal\Core\Routing\Access\AccessInterface as RoutingAccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -52,7 +52,7 @@ public function __construct(ControllerResolverInterface $controller_resolver, Ac
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object to be checked.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account being checked.
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
index d22a6c367c..38261003f2 100644
--- a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Authentication;
 
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php
index 10b9f638a8..76e2429ae8 100644
--- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php
+++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Breadcrumb;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines an interface for classes that build breadcrumbs.
@@ -12,7 +12,7 @@ interface BreadcrumbBuilderInterface {
   /**
    * Whether this breadcrumb builder should be used to build the breadcrumb.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return bool
@@ -24,7 +24,7 @@ public function applies(RouteMatchInterface $route_match);
   /**
    * Builds the breadcrumb.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return \Drupal\Core\Breadcrumb\Breadcrumb
diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
index f418a5ee22..5afb693575 100644
--- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
+++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Breadcrumb;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides a breadcrumb manager.
diff --git a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
index 0438925ee4..6c39f861bb 100644
--- a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Cache\Context;
 
 use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines the RouteCacheContext service, for "per route" caching.
@@ -15,14 +15,14 @@ class RouteCacheContext implements CacheContextInterface {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a new RouteCacheContext class.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
index d5846fea20..3cb53d98ad 100644
--- a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
+++ b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Core\Controller\ArgumentResolver;
 
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index 20df5e8efb..b50139cf2f 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -3,8 +3,8 @@
 namespace Drupal\Core\Controller;
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/core/lib/Drupal/Core/Controller/FormController.php b/core/lib/Drupal/Core/Controller/FormController.php
index d994fa86d9..e879f38a55 100644
--- a/core/lib/Drupal/Core/Controller/FormController.php
+++ b/core/lib/Drupal/Core/Controller/FormController.php
@@ -5,7 +5,7 @@
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormState;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
@@ -65,7 +65,7 @@ public function __construct(ArgumentResolverInterface $argument_resolver, FormBu
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
    * @return array
@@ -103,7 +103,7 @@ public function getContentResult(Request $request, RouteMatchInterface $route_ma
    *     _form: Drupal\example\Form\ExampleForm
    * @endcode
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object from which to extract a form definition string.
    *
    * @return string
@@ -114,7 +114,7 @@ public function getContentResult(Request $request, RouteMatchInterface $route_ma
   /**
    * Returns the object used to build the form.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param string $form_arg
    *   Either a class name or a service ID.
diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php
index 6dd27ee1e1..1d83c25edd 100644
--- a/core/lib/Drupal/Core/Controller/HtmlFormController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Controller;
 
 use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index 8636f1d442..273c752b61 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Routing\UrlGeneratorTrait;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
@@ -210,7 +210,7 @@ public function addTitle($entity_type_id) {
   /**
    * Provides a generic add title callback for entities with bundles.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param string $entity_type_id
    *   The entity type ID.
@@ -239,7 +239,7 @@ public function addBundleTitle(RouteMatchInterface $route_match, $entity_type_id
   /**
    * Provides a generic title callback for a single entity.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) An entity, passed in directly from the request attributes.
@@ -256,7 +256,7 @@ public function title(RouteMatchInterface $route_match, EntityInterface $_entity
   /**
    * Provides a generic edit title callback.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) An entity, passed in directly from the request attributes.
@@ -273,7 +273,7 @@ public function editTitle(RouteMatchInterface $route_match, EntityInterface $_en
   /**
    * Provides a generic delete title callback.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) An entity, passed in directly from the request attributes, and
@@ -291,7 +291,7 @@ public function deleteTitle(RouteMatchInterface $route_match, EntityInterface $_
   /**
    * Determines the entity.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) The entity, set in
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
index 8ca8cf66cd..4d568749bc 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -45,7 +45,7 @@ class EntityAccessCheck implements AccessInterface {
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
index 1d95dfe8d5..8c930d56e5 100644
--- a/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
+++ b/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -25,7 +25,7 @@ class EntityBundleAccessCheck implements AccessInterface {
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php
index ec85243f44..dfe58701d8 100644
--- a/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php
+++ b/core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -56,7 +56,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
index e0e24a2f9e..190420196b 100644
--- a/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
+++ b/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -52,7 +52,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Ent
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parameterized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 0a6c97baf5..14ab35c07e 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Base class for entity forms.
diff --git a/core/lib/Drupal/Core/Entity/EntityFormInterface.php b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
index 9cd1041c86..047b14a805 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\BaseFormIdInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 
 /**
@@ -60,7 +60,7 @@ public function setEntity(EntityInterface $entity);
   /**
    * Determines which entity will be used by this form from a RouteMatch object.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param string $entity_type_id
    *   The entity type identifier.
diff --git a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
index 395fbd017e..7b2bf5556a 100644
--- a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Controller\FormController;
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
 /**
diff --git a/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
index f63ade66ac..a8ab8788a1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -34,7 +34,7 @@ class MainContentViewSubscriber implements EventSubscriberInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -58,7 +58,7 @@ class MainContentViewSubscriber implements EventSubscriberInterface {
    *
    * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
    *   The class resolver service.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param array $main_content_renderers
    *   The available main content renderer service IDs, keyed by format.
diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index bda3291846..c8f60ab789 100644
--- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\Core\Messenger\MessengerInterface;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\MaintenanceModeInterface;
diff --git a/core/lib/Drupal/Core/Form/FormAjaxResponseBuilder.php b/core/lib/Drupal/Core/Form/FormAjaxResponseBuilder.php
index 404d1b7d23..690aa0949d 100644
--- a/core/lib/Drupal/Core/Form/FormAjaxResponseBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormAjaxResponseBuilder.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\UpdateBuildIdCommand;
 use Drupal\Core\Render\MainContent\MainContentRendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -27,7 +27,7 @@ class FormAjaxResponseBuilder implements FormAjaxResponseBuilderInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -36,7 +36,7 @@ class FormAjaxResponseBuilder implements FormAjaxResponseBuilderInterface {
    *
    * @param \Drupal\Core\Render\MainContent\MainContentRendererInterface $ajax_renderer
    *   The ajax renderer.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param Drupal\Component\Routing\RouteMatcheInterface $route_match
    *   The current route match.
    */
   public function __construct(MainContentRendererInterface $ajax_renderer, RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php
index 1974865053..62a59e1da3 100644
--- a/core/lib/Drupal/Core/Form/FormBase.php
+++ b/core/lib/Drupal/Core/Form/FormBase.php
@@ -75,7 +75,7 @@ abstract class FormBase implements FormInterface, ContainerInjectionInterface {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -164,7 +164,7 @@ protected function getRequest() {
   /**
    * Gets the route match.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    */
   protected function getRouteMatch() {
     if (!$this->routeMatch) {
diff --git a/core/lib/Drupal/Core/Menu/LocalActionDefault.php b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
index 5e161ec1de..e76524bdcf 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/core/lib/Drupal/Core/Menu/LocalActionInterface.php b/core/lib/Drupal/Core/Menu/LocalActionInterface.php
index 81ff308ae8..0f377af593 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Menu;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines an interface for menu local actions.
@@ -20,7 +20,7 @@ public function getRouteName();
   /**
    * Returns the route parameters needed to render a link for the local action.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return array
@@ -38,7 +38,7 @@ public function getWeight();
   /**
    * Returns options for rendering a link for the local action.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return array
diff --git a/core/lib/Drupal/Core/Menu/LocalActionManager.php b/core/lib/Drupal/Core/Menu/LocalActionManager.php
index a95f445dad..b7dd8ea583 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionManager.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
 use Drupal\Core\Plugin\Factory\ContainerFactory;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Url;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -80,7 +80,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -119,7 +119,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    *   An object to use in resolving route arguments.
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   The request stack.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
    *   The route provider.
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
index 49a7a2cc68..285740347a 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
index 31e0fd77d0..88e42d414d 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Menu;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines an interface for menu local tasks.
@@ -37,7 +37,7 @@ public function getTitle();
   /**
    * Returns the route parameters needed to render a link for the local task.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return array
@@ -56,7 +56,7 @@ public function getWeight();
   /**
    * Returns options for rendering a link to the local task.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return array
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index d20bef0054..fc05a1bde2 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -15,7 +15,7 @@
 use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
 use Drupal\Core\Plugin\Factory\ContainerFactory;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
@@ -83,7 +83,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -129,7 +129,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    *   An object to use in resolving route arguments.
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   The request object to use for building titles and paths for plugin instances.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\CurrentRouteMatch $route_match
    *   The current route match.
    * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
    *   The route provider to load routes by name.
diff --git a/core/lib/Drupal/Core/Menu/MenuActiveTrail.php b/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
index 353a8143d9..19dbfee540 100644
--- a/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
+++ b/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\CacheCollector;
 use Drupal\Core\Lock\LockBackendInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides the default implementation of the active menu trail service.
@@ -25,7 +25,7 @@ class MenuActiveTrail extends CacheCollector implements MenuActiveTrailInterface
   /**
    * The route match object for the current page.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -34,7 +34,7 @@ class MenuActiveTrail extends CacheCollector implements MenuActiveTrailInterface
    *
    * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager
    *   The menu link plugin manager.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   A route match object for finding the active link.
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache backend.
diff --git a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
index 70ef668bf8..e1cbdce42e 100644
--- a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
+++ b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Menu\LocalActionManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides a block to display the local actions.
@@ -28,7 +28,7 @@ class LocalActionsBlock extends BlockBase implements ContainerFactoryPluginInter
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -43,7 +43,7 @@ class LocalActionsBlock extends BlockBase implements ContainerFactoryPluginInter
    *   The plugin implementation definition.
    * @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager
    *   A local action manager.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, LocalActionManagerInterface $local_action_manager, RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalTasksBlock.php b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalTasksBlock.php
index 6a518ef3ef..028eb14ee4 100644
--- a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalTasksBlock.php
+++ b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalTasksBlock.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Menu\LocalTaskManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -31,7 +31,7 @@ class LocalTasksBlock extends BlockBase implements ContainerFactoryPluginInterfa
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -46,7 +46,7 @@ class LocalTasksBlock extends BlockBase implements ContainerFactoryPluginInterfa
    *   The plugin implementation definition.
    * @param \Drupal\Core\Menu\LocalTaskManagerInterface $local_task_manager
    *   The local task manager.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, LocalTaskManagerInterface $local_task_manager, RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index 758013f494..71e0803ac2 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -429,7 +429,7 @@ function hook_contextual_links_plugins_alter(array &$contextual_links) {
  *
  * @param \Drupal\Core\Breadcrumb\Breadcrumb $breadcrumb
  *   A breadcrumb object returned by BreadcrumbBuilderInterface::build().
- * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+ * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
  *   The current route match.
  * @param array $context
  *   May include the following key:
@@ -439,7 +439,7 @@ function hook_contextual_links_plugins_alter(array &$contextual_links) {
  *
  * @ingroup menu
  */
-function hook_system_breadcrumb_alter(\Drupal\Core\Breadcrumb\Breadcrumb &$breadcrumb, \Drupal\Core\Routing\RouteMatchInterface $route_match, array $context) {
+function hook_system_breadcrumb_alter(\Drupal\Core\Breadcrumb\Breadcrumb &$breadcrumb, \Drupal\Component\Routing\RouteMatchInterface $route_match, array $context) {
   // Add an item to the end of the breadcrumb.
   $breadcrumb->addLink(\Drupal\Core\Link::createFromRoute(t('Text'), 'example_route_name'));
 }
diff --git a/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
index debf3b0a85..8e77772bc8 100644
--- a/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
+++ b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\PageCache\ResponsePolicy;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,14 +18,14 @@ class DenyNoCacheRoutes implements ResponsePolicyInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a deny node preview page cache policy.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Path/PathMatcher.php b/core/lib/Drupal/Core/Path/PathMatcher.php
index cc4f2cccfd..77d593979e 100644
--- a/core/lib/Drupal/Core/Path/PathMatcher.php
+++ b/core/lib/Drupal/Core/Path/PathMatcher.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Path;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
@@ -42,7 +42,7 @@ class PathMatcher implements PathMatcherInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -51,7 +51,7 @@ class PathMatcher implements PathMatcherInterface {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(ConfigFactoryInterface $config_factory, RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
index 5ef8900ca2..ddef08a6f2 100644
--- a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Ajax\PrependCommand;
 use Drupal\Core\Render\ElementInfoManagerInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
index eed30b4b02..8c5e12b56a 100644
--- a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\OpenDialogCommand;
 use Drupal\Core\Controller\TitleResolverInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Render\RendererInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -77,7 +77,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
    *
    * @param array &$options
    *   The 'target' option, if set, is used, and then removed from $options.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   When no 'target' option is set in $options, $route_match is used instead
    *   to determine the target.
    *
diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 13e9c7675f..0ca3040671 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Render\MainContent;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Display\PageVariantInterface;
@@ -14,7 +15,6 @@
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Render\RenderEvents;
-use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -175,7 +175,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
    *   The render array representing the main content.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object, for context.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match, for context.
    *
    * @return array
diff --git a/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php b/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php
index aa8b60c86a..ba91db2d32 100644
--- a/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php
+++ b/core/lib/Drupal/Core/Render/MainContent/MainContentRendererInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Render\MainContent;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -22,7 +22,7 @@ interface MainContentRendererInterface {
    *   The render array representing the main content.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object, for context.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match, for context.
    *
    * @return \Symfony\Component\HttpFoundation\Response
diff --git a/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php b/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
index d250d57329..0783273865 100644
--- a/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\OpenModalDialogCommand;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/lib/Drupal/Core/Render/MainContent/OffCanvasRenderer.php b/core/lib/Drupal/Core/Render/MainContent/OffCanvasRenderer.php
index 086e84f929..37d3e0ed93 100644
--- a/core/lib/Drupal/Core/Render/MainContent/OffCanvasRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/OffCanvasRenderer.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Ajax\OpenOffCanvasDialogCommand;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
index 3f279c03d8..d710139497 100644
--- a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
+++ b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -40,7 +40,7 @@ class PageDisplayVariantSelectionEvent extends Event implements RefinableCacheab
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -56,7 +56,7 @@ class PageDisplayVariantSelectionEvent extends Event implements RefinableCacheab
    *
    * @param string $plugin_id
    *   The ID of the page display variant plugin to use by default.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match, for context.
    */
   public function __construct($plugin_id, RouteMatchInterface $route_match) {
@@ -111,7 +111,7 @@ public function getPluginConfiguration() {
   /**
    * Gets the current route match.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   The current route match, for context.
    */
   public function getRouteMatch() {
diff --git a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
index e1555fb1de..75e3e1dab4 100644
--- a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
+++ b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\RouteProcessor;
 
 use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -14,14 +14,14 @@ class RouteProcessorCurrent implements OutboundRouteProcessorInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a new RouteProcessorCurrent.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Routing/AdminContext.php b/core/lib/Drupal/Core/Routing/AdminContext.php
index 0ef77f2a08..579e16f20a 100644
--- a/core/lib/Drupal/Core/Routing/AdminContext.php
+++ b/core/lib/Drupal/Core/Routing/AdminContext.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Routing;
 
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -12,14 +13,14 @@ class AdminContext {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Construct a new admin context helper instance.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/lib/Drupal/Core/Routing/routing.api.php b/core/lib/Drupal/Core/Routing/routing.api.php
index b505465cd6..344e696d83 100644
--- a/core/lib/Drupal/Core/Routing/routing.api.php
+++ b/core/lib/Drupal/Core/Routing/routing.api.php
@@ -126,7 +126,7 @@
  *   from the Symfony request, so if either will suffice the Symfony request
  *   will be slightly more performant. By convention this parameter is usually
  *   named $request.
- * - \Drupal\Core\Routing\RouteMatchInterface: The "route match" data from
+ * - \Drupal\Component\Routing\RouteMatchInterface: The "route match" data from
  *   this request. This object contains various standard data derived from
  *   the request and routing process. Consult the interface for details.
  *
diff --git a/core/lib/Drupal/Core/Site/MaintenanceMode.php b/core/lib/Drupal/Core/Site/MaintenanceMode.php
index 38b8bd7a89..4072073f7a 100644
--- a/core/lib/Drupal/Core/Site/MaintenanceMode.php
+++ b/core/lib/Drupal/Core/Site/MaintenanceMode.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Site;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\State\StateInterface;
 
diff --git a/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php b/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php
index bc606b50f2..7153a8c6e7 100644
--- a/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php
+++ b/core/lib/Drupal/Core/Site/MaintenanceModeInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Site;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -13,7 +13,7 @@ interface MaintenanceModeInterface {
   /**
    * Returns whether the site is in maintenance mode.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return bool
diff --git a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
index 5cd2ee3057..ce9e4276ed 100644
--- a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
+++ b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\CsrfTokenGenerator;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
diff --git a/core/lib/Drupal/Core/Theme/DefaultNegotiator.php b/core/lib/Drupal/Core/Theme/DefaultNegotiator.php
index 1835f10d1a..707f0f4bb1 100644
--- a/core/lib/Drupal/Core/Theme/DefaultNegotiator.php
+++ b/core/lib/Drupal/Core/Theme/DefaultNegotiator.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Theme;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Determines the default theme of the site.
diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
index c6a0e2287d..f5f1b6d901 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -4,8 +4,8 @@
 
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Render\Markup;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Routing\StackedRouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\StackedRouteMatchInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Template\Attribute;
 
@@ -390,7 +390,7 @@ public function render($hook, array $variables) {
   /**
    * Initializes the active theme for a given route match.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   protected function initTheme(RouteMatchInterface $route_match = NULL) {
diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
index 18b618cedb..cb1d4db162 100644
--- a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
+++ b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Theme;
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides a class which determines the active theme of the page.
diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php b/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php
index 309597969a..1028516ea6 100644
--- a/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php
+++ b/core/lib/Drupal/Core/Theme/ThemeNegotiatorInterface.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Theme;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines an interface for classes which determine the active theme.
@@ -24,7 +24,7 @@ interface ThemeNegotiatorInterface {
   /**
    * Whether this theme negotiator should be used to set the theme.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match object.
    *
    * @return bool
@@ -36,7 +36,7 @@ public function applies(RouteMatchInterface $route_match);
   /**
    * Determine the active theme for the request.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match object.
    *
    * @return string|null
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index ea552bf4cb..45c403b700 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -6,7 +6,7 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Security\TrustedCallbackInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Utility\UnroutedUrlAssemblerInterface;
@@ -146,7 +146,7 @@ public static function fromRoute($route_name, $route_parameters = [], $options =
   /**
    * Creates a new URL object from a route match.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
    * @return static
diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 8d162615ea..29c88e7d3f 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\action\Form\ActionAddForm;
 use Drupal\action\Form\ActionEditForm;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 336dbcef4e..61bf8efbc2 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\aggregator\Entity\Feed;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Denotes that a feed's items should never expire.
diff --git a/core/modules/automated_cron/automated_cron.module b/core/modules/automated_cron/automated_cron.module
index 80ad9fa04f..4b86bc899d 100644
--- a/core/modules/automated_cron/automated_cron.module
+++ b/core/modules/automated_cron/automated_cron.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module
index ca0c419c0c..f9d7e51b54 100644
--- a/core/modules/ban/ban.module
+++ b/core/modules/ban/ban.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/basic_auth/basic_auth.module b/core/modules/basic_auth/basic_auth.module
index 156ebe7456..28a17b1da1 100644
--- a/core/modules/basic_auth/basic_auth.module
+++ b/core/modules/basic_auth/basic_auth.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/big_pipe/big_pipe.module b/core/modules/big_pipe/big_pipe.module
index fa0518ad3d..2525376e6a 100644
--- a/core/modules/big_pipe/big_pipe.module
+++ b/core/modules/big_pipe/big_pipe.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index 3e0f460e9a..b3be11a428 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -6,7 +6,7 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\SessionConfigurationInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -82,7 +82,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -93,7 +93,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
    *   The session configuration.
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   The request stack.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(SessionConfigurationInterface $session_configuration, RequestStack $request_stack, RouteMatchInterface $route_match) {
diff --git a/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
index 733d265ddd..3cd8f95b24 100644
--- a/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
+++ b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
 use Drupal\big_pipe_test\BigPipePlaceholderTestCases;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\SessionConfigurationInterface;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index ec7e0ed7d8..089e449b2e 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\language\ConfigurableLanguageInterface;
diff --git a/core/modules/block/src/Controller/BlockLibraryController.php b/core/modules/block/src/Controller/BlockLibraryController.php
index cf5f20a0ba..f43c0d546f 100644
--- a/core/modules/block/src/Controller/BlockLibraryController.php
+++ b/core/modules/block/src/Controller/BlockLibraryController.php
@@ -8,7 +8,7 @@
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Menu\LocalActionManagerInterface;
 use Drupal\Core\Plugin\Context\LazyContextRepository;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -35,7 +35,7 @@ class BlockLibraryController extends ControllerBase {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -53,7 +53,7 @@ class BlockLibraryController extends ControllerBase {
    *   The block manager.
    * @param \Drupal\Core\Plugin\Context\LazyContextRepository $context_repository
    *   The context repository.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager
    *   The local action manager.
diff --git a/core/modules/block/src/Theme/AdminDemoNegotiator.php b/core/modules/block/src/Theme/AdminDemoNegotiator.php
index 3ceead5939..8b29b3ce71 100644
--- a/core/modules/block/src/Theme/AdminDemoNegotiator.php
+++ b/core/modules/block/src/Theme/AdminDemoNegotiator.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\block\Theme;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
 /**
diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module
index 383cd57701..9f6ff53411 100644
--- a/core/modules/block_content/block_content.module
+++ b/core/modules/block_content/block_content.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\Core\Database\Query\SelectInterface;
diff --git a/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php b/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
index 5b4f24ebb7..bc49475824 100644
--- a/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
+++ b/core/modules/block_content/src/Plugin/Menu/LocalAction/BlockContentAddLocalAction.php
@@ -3,7 +3,7 @@
 namespace Drupal\block_content\Plugin\Menu\LocalAction;
 
 use Drupal\Core\Menu\LocalActionDefault;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/block_place/block_place.module b/core/modules/block_place/block_place.module
index c91c9c2d57..99e28f86c2 100644
--- a/core/modules/block_place/block_place.module
+++ b/core/modules/block_place/block_place.module
@@ -10,7 +10,7 @@
  * @see https://www.drupal.org/node/3081957
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 @trigger_error('The Place Blocks module is deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. See the change record for a list of alternatives. See https://www.drupal.org/node/3081957.', E_USER_DEPRECATED);
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 8bb1bb38a5..c06f544cac 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\node\NodeTypeInterface;
diff --git a/core/modules/book/src/BookBreadcrumbBuilder.php b/core/modules/book/src/BookBreadcrumbBuilder.php
index db446a0651..321fafc4f1 100644
--- a/core/modules/book/src/BookBreadcrumbBuilder.php
+++ b/core/modules/book/src/BookBreadcrumbBuilder.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\node\NodeInterface;
diff --git a/core/modules/book/src/Plugin/views/argument_default/TopLevelBook.php b/core/modules/book/src/Plugin/views/argument_default/TopLevelBook.php
index 36a6f79a5c..944b2a99b4 100644
--- a/core/modules/book/src/Plugin/views/argument_default/TopLevelBook.php
+++ b/core/modules/book/src/Plugin/views/argument_default/TopLevelBook.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\book\Plugin\views\argument_default;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\node\NodeStorageInterface;
 use Drupal\node\Plugin\views\argument_default\Node;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -33,7 +33,7 @@ class TopLevelBook extends Node {
    *   The plugin_id for the plugin instance.
    * @param array $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\node\NodeStorageInterface $node_storage
    *   The node storage controller.
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index a0fd468df0..5575c03eac 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -5,7 +5,7 @@
  * Manage breakpoints and breakpoint groups for responsive designs.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module
index 55bbf5b2fb..1a1f442456 100644
--- a/core/modules/ckeditor/ckeditor.module
+++ b/core/modules/ckeditor/ckeditor.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\editor\Entity\Editor;
 
 /**
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index b141114583..8ae55706f9 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -16,7 +16,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\Element\Textfield;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\color\ColorSystemBrandingBlockAlter;
 
 /**
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index a7ba9da4a7..9a4aa41001 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -17,7 +17,7 @@
 use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Link;
diff --git a/core/modules/comment/src/CommentBreadcrumbBuilder.php b/core/modules/comment/src/CommentBreadcrumbBuilder.php
index eb8104c1e2..d530d86241 100644
--- a/core/modules/comment/src/CommentBreadcrumbBuilder.php
+++ b/core/modules/comment/src/CommentBreadcrumbBuilder.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index 3dbc63c477..24af9834d9 100644
--- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -14,7 +14,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -86,7 +86,7 @@ public static function defaultSettings() {
   protected $entityFormBuilder;
 
   /**
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -133,7 +133,7 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The entity type manager.
    * @param \Drupal\Core\Entity\EntityFormBuilderInterface $entity_form_builder
    *   The entity form builder.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object.
    * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
    *   The entity display repository.
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 5674611d5c..4c07afca7a 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -5,7 +5,7 @@
  * Allows site administrators to modify configuration.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\Url;
 
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index e22ecd8270..49704a0882 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field\FieldConfigInterface;
 
 /**
diff --git a/core/modules/config_translation/src/Access/ConfigTranslationFormAccess.php b/core/modules/config_translation/src/Access/ConfigTranslationFormAccess.php
index 82d988aa9a..3c4f50010e 100644
--- a/core/modules/config_translation/src/Access/ConfigTranslationFormAccess.php
+++ b/core/modules/config_translation/src/Access/ConfigTranslationFormAccess.php
@@ -5,7 +5,7 @@
 use Drupal\config_translation\ConfigMapperInterface;
 use Drupal\config_translation\Exception\ConfigMapperLanguageException;
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -16,7 +16,7 @@ class ConfigTranslationFormAccess extends ConfigTranslationOverviewAccess {
   /**
    * Checks access to the overview based on permissions and translatability.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route_match to check against.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account to check access for.
diff --git a/core/modules/config_translation/src/Access/ConfigTranslationOverviewAccess.php b/core/modules/config_translation/src/Access/ConfigTranslationOverviewAccess.php
index 6d3690fea2..544f0defb8 100644
--- a/core/modules/config_translation/src/Access/ConfigTranslationOverviewAccess.php
+++ b/core/modules/config_translation/src/Access/ConfigTranslationOverviewAccess.php
@@ -8,7 +8,7 @@
 use Drupal\config_translation\ConfigMapperManagerInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -46,7 +46,7 @@ public function __construct(ConfigMapperManagerInterface $config_mapper_manager,
   /**
    * Checks access to the overview based on permissions and translatability.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route_match to check against.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account to check access for.
@@ -73,7 +73,7 @@ public function access(RouteMatchInterface $route_match, AccountInterface $accou
   /**
    * Gets a configuration mapper using a route match.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match to populate the mapper with.
    *
    * @return \Drupal\config_translation\ConfigMapperInterface
diff --git a/core/modules/config_translation/src/ConfigEntityMapper.php b/core/modules/config_translation/src/ConfigEntityMapper.php
index 69c1211cfe..53ee04de66 100644
--- a/core/modules/config_translation/src/ConfigEntityMapper.php
+++ b/core/modules/config_translation/src/ConfigEntityMapper.php
@@ -8,7 +8,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\Url;
diff --git a/core/modules/config_translation/src/ConfigMapperInterface.php b/core/modules/config_translation/src/ConfigMapperInterface.php
index 9bb44b4884..c58cc3c07e 100644
--- a/core/modules/config_translation/src/ConfigMapperInterface.php
+++ b/core/modules/config_translation/src/ConfigMapperInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\config_translation;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -284,7 +284,7 @@ public function hasTranslation(LanguageInterface $language);
   /**
    * Populate the config mapper with route match data.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
    * @see \Drupal\config_translation\Event\ConfigTranslationEvents::POPULATE_MAPPER
diff --git a/core/modules/config_translation/src/ConfigNamesMapper.php b/core/modules/config_translation/src/ConfigNamesMapper.php
index d63807a26f..993c0c9eac 100644
--- a/core/modules/config_translation/src/ConfigNamesMapper.php
+++ b/core/modules/config_translation/src/ConfigNamesMapper.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationController.php b/core/modules/config_translation/src/Controller/ConfigTranslationController.php
index 8c9dc480e8..4ed5936444 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationController.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationController.php
@@ -11,8 +11,8 @@
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -121,7 +121,7 @@ public static function create(ContainerInterface $container) {
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   Page request object.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param string $plugin_id
    *   The plugin ID of the mapper.
diff --git a/core/modules/config_translation/src/Event/ConfigMapperPopulateEvent.php b/core/modules/config_translation/src/Event/ConfigMapperPopulateEvent.php
index e36c41884b..a4394887f6 100644
--- a/core/modules/config_translation/src/Event/ConfigMapperPopulateEvent.php
+++ b/core/modules/config_translation/src/Event/ConfigMapperPopulateEvent.php
@@ -3,7 +3,7 @@
 namespace Drupal\config_translation\Event;
 
 use Drupal\config_translation\ConfigMapperInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -21,7 +21,7 @@ class ConfigMapperPopulateEvent extends Event {
   /**
    * The route match this event is related to.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -30,7 +30,7 @@ class ConfigMapperPopulateEvent extends Event {
    *
    * @param \Drupal\config_translation\ConfigMapperInterface $mapper
    *   The configuration mapper this event is related to.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match this event is related to.
    */
   public function __construct(ConfigMapperInterface $mapper, RouteMatchInterface $route_match) {
@@ -51,7 +51,7 @@ public function getMapper() {
   /**
    * Gets the route match this event is related to.
    *
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   The route match this event is related to.
    */
   public function getRouteMatch() {
diff --git a/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php b/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
index 8b3f4a8966..c9b896a1cf 100644
--- a/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
+++ b/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\config_translation\Form;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines a form for adding configuration translations.
diff --git a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
index d420ee63dc..5e2323069b 100644
--- a/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
+++ b/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\language\ConfigurableLanguageManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php b/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
index 8754d91650..13c17808b4 100644
--- a/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
+++ b/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\config_translation\Form;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines a form for editing configuration translations.
diff --git a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
index 9f95a76cd0..ba77c20876 100644
--- a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
+++ b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
@@ -4,7 +4,7 @@
 
 use Drupal\config_translation\ConfigMapperManagerInterface;
 use Drupal\Core\Config\TypedConfigManagerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\Form\BaseFormIdInterface;
 use Drupal\Core\Form\FormBase;
@@ -111,7 +111,7 @@ public function getBaseFormId() {
    *   An associative array containing the structure of the form.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   (optional) The route match.
    * @param string $plugin_id
    *   (optional) The plugin ID of the mapper.
diff --git a/core/modules/config_translation/tests/src/Kernel/ConfigMapperTest.php b/core/modules/config_translation/tests/src/Kernel/ConfigMapperTest.php
index 773246cba9..94726267f3 100644
--- a/core/modules/config_translation/tests/src/Kernel/ConfigMapperTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/ConfigMapperTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\config_translation\Kernel;
 
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\KernelTests\KernelTestBase;
 use Symfony\Component\Routing\Route;
 
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index c73b16662a..35e73c81a9 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 71edccd332..1efe1b72b7 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\contact\Plugin\rest\resource\ContactMessageResource;
 use Drupal\user\Entity\User;
 
diff --git a/core/modules/content_moderation/content_moderation.module b/core/modules/content_moderation/content_moderation.module
index 394a07f820..0d32e256aa 100644
--- a/core/modules/content_moderation/content_moderation.module
+++ b/core/modules/content_moderation/content_moderation.module
@@ -20,7 +20,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\views\Plugin\views\filter\Broken;
diff --git a/core/modules/content_moderation/src/Access/LatestRevisionCheck.php b/core/modules/content_moderation/src/Access/LatestRevisionCheck.php
index e470237448..6fe66ba8b2 100644
--- a/core/modules/content_moderation/src/Access/LatestRevisionCheck.php
+++ b/core/modules/content_moderation/src/Access/LatestRevisionCheck.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\content_moderation\ModerationInformationInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\user\EntityOwnerInterface;
@@ -42,7 +42,7 @@ public function __construct(ModerationInformationInterface $moderation_informati
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The current user account.
@@ -76,7 +76,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    *
    * @return \Drupal\Core\Entity\ContentEntityInterface
diff --git a/core/modules/content_moderation/src/ContentPreprocess.php b/core/modules/content_moderation/src/ContentPreprocess.php
index 853a787ed8..405ff3f45f 100644
--- a/core/modules/content_moderation/src/ContentPreprocess.php
+++ b/core/modules/content_moderation/src/ContentPreprocess.php
@@ -3,7 +3,7 @@
 namespace Drupal\content_moderation;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\node\Entity\Node;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -17,14 +17,14 @@ class ContentPreprocess implements ContainerInjectionInterface {
   /**
    * The route match service.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructor.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   Current route match service.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/content_moderation/tests/src/Unit/ContentPreprocessTest.php b/core/modules/content_moderation/tests/src/Unit/ContentPreprocessTest.php
index 8084716346..3bf16447a9 100644
--- a/core/modules/content_moderation/tests/src/Unit/ContentPreprocessTest.php
+++ b/core/modules/content_moderation/tests/src/Unit/ContentPreprocessTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\content_moderation\Unit;
 
 use Drupal\content_moderation\ContentPreprocess;
-use Drupal\Core\Routing\CurrentRouteMatch;
+use Drupal\Component\Routing\CurrentRouteMatch;
 use Drupal\node\Entity\Node;
 use Drupal\Tests\UnitTestCase;
 
@@ -43,7 +43,7 @@ public function routeNodeProvider() {
    * @param int $nid
    *   The node ID for mocking.
    *
-   * @return \Drupal\Core\Routing\CurrentRouteMatch
+   * @return \Drupal\Component\Routing\CurrentRouteMatch
    *   The mocked current route match object.
    */
   protected function setupCurrentRouteMatch($route_name, $nid) {
diff --git a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php
index 455c0708fd..f764ad787f 100644
--- a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php
+++ b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Access\AccessResultForbidden;
 use Drupal\Core\Access\AccessResultNeutral;
 use Drupal\Core\Cache\Context\CacheContextsManager;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\Entity\Node;
 use Drupal\content_moderation\Access\LatestRevisionCheck;
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 10f546dfd5..5aca925ded 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -15,7 +15,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\language\ContentLanguageSettingsInterface;
 
diff --git a/core/modules/content_translation/src/Access/ContentTranslationDeleteAccess.php b/core/modules/content_translation/src/Access/ContentTranslationDeleteAccess.php
index 5f1933714b..24c20206ad 100644
--- a/core/modules/content_translation/src/Access/ContentTranslationDeleteAccess.php
+++ b/core/modules/content_translation/src/Access/ContentTranslationDeleteAccess.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\workflows\Entity\Workflow;
@@ -54,7 +54,7 @@ public function __construct(EntityTypeManagerInterface $manager, ContentTranslat
   /**
    * Checks access to translation deletion for the specified route match.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parameterized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
index 424b802a16..84fa87e71c 100644
--- a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
+++ b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
@@ -9,7 +9,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -56,7 +56,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Lan
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php b/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php
index 6ae3b32a87..af03ce97c5 100644
--- a/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php
+++ b/core/modules/content_translation/src/Access/ContentTranslationOverviewAccess.php
@@ -6,7 +6,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -40,7 +40,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
   /**
    * Checks access to the translation overview for the entity and bundle.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/content_translation/src/Controller/ContentTranslationController.php b/core/modules/content_translation/src/Controller/ContentTranslationController.php
index 5d48cc0533..d277e604e0 100644
--- a/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -95,7 +95,7 @@ public function prepareTranslation(ContentEntityInterface $entity, LanguageInter
   /**
    * Builds the translations overview page.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param string $entity_type_id
    *   (optional) The entity type ID.
@@ -353,7 +353,7 @@ public function overview(RouteMatchInterface $route_match, $entity_type_id = NUL
    * @param \Drupal\Core\Language\LanguageInterface $target
    *   The language of the translated values. Defaults to the current content
    *   language.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object from which to extract the entity type.
    * @param string $entity_type_id
    *   (optional) The entity type ID.
@@ -403,7 +403,7 @@ public function add(LanguageInterface $source, LanguageInterface $target, RouteM
    * @param \Drupal\Core\Language\LanguageInterface $language
    *   The language of the translated values. Defaults to the current content
    *   language.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object from which to extract the entity type.
    * @param string $entity_type_id
    *   (optional) The entity type ID.
diff --git a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
index 165a298fcf..5582efbafe 100644
--- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
+++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
@@ -112,7 +112,7 @@ public function testCreateAccess() {
     $route->setRequirement('_access_content_translation_manage', 'create');
 
     // Set up the route match.
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
       ->method('getParameter')
       ->with('node')
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index aaab3a6e9d..d3c94a07d2 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -9,7 +9,7 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_toolbar().
diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module
index 531deab6d8..988f00b2c1 100644
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines the timezone that dates should be stored in.
diff --git a/core/modules/datetime/src/Plugin/views/argument/Date.php b/core/modules/datetime/src/Plugin/views/argument/Date.php
index 3b16a3150b..a2695f2f1f 100644
--- a/core/modules/datetime/src/Plugin/views/argument/Date.php
+++ b/core/modules/datetime/src/Plugin/views/argument/Date.php
@@ -3,7 +3,7 @@
 namespace Drupal\datetime\Plugin\views\argument;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Drupal\views\FieldAPIHandlerTrait;
 use Drupal\views\Plugin\views\argument\Date as NumericDate;
diff --git a/core/modules/datetime_range/datetime_range.module b/core/modules/datetime_range/datetime_range.module
index acc9e6c581..c5c2ab23cf 100644
--- a/core/modules/datetime_range/datetime_range.module
+++ b/core/modules/datetime_range/datetime_range.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\views\Views;
 use Drupal\views\ViewEntityInterface;
 
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index 9e45d328a9..ef0cab5f3a 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -11,7 +11,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\views\ViewEntityInterface;
 use Drupal\views\ViewExecutable;
diff --git a/core/modules/dynamic_page_cache/dynamic_page_cache.module b/core/modules/dynamic_page_cache/dynamic_page_cache.module
index 877d3a812d..cc0cce4196 100644
--- a/core/modules/dynamic_page_cache/dynamic_page_cache.module
+++ b/core/modules/dynamic_page_cache/dynamic_page_cache.module
@@ -5,7 +5,7 @@
  * Caches responses for all users, handling dynamic content correctly.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/dynamic_page_cache/src/PageCache/ResponsePolicy/DenyAdminRoutes.php b/core/modules/dynamic_page_cache/src/PageCache/ResponsePolicy/DenyAdminRoutes.php
index 6857163840..6df98f0ae4 100644
--- a/core/modules/dynamic_page_cache/src/PageCache/ResponsePolicy/DenyAdminRoutes.php
+++ b/core/modules/dynamic_page_cache/src/PageCache/ResponsePolicy/DenyAdminRoutes.php
@@ -3,7 +3,7 @@
 namespace Drupal\dynamic_page_cache\PageCache\ResponsePolicy;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -19,14 +19,14 @@ class DenyAdminRoutes implements ResponsePolicyInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a deny admin route page cache policy.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 4ccea91890..2a0fa0ad4a 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -13,7 +13,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\filter\FilterFormatInterface;
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 3a8a8e16b1..163d085a7b 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -15,7 +15,7 @@
 use Drupal\field\FieldConfigInterface;
 use Drupal\field\FieldStorageConfigInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 
diff --git a/core/modules/field_layout/field_layout.module b/core/modules/field_layout/field_layout.module
index 713e7e4aac..3281980609 100644
--- a/core/modules/field_layout/field_layout.module
+++ b/core/modules/field_layout/field_layout.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
 use Drupal\field_layout\Entity\FieldLayoutEntityFormDisplay;
 use Drupal\field_layout\Entity\FieldLayoutEntityViewDisplay;
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 7153b0d915..56f99c3984 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityViewModeInterface;
 use Drupal\Core\Entity\EntityFormModeInterface;
 use Drupal\Core\Url;
diff --git a/core/modules/field_ui/src/Access/FormModeAccessCheck.php b/core/modules/field_ui/src/Access/FormModeAccessCheck.php
index 0e82c24f4c..7dc6bdb629 100644
--- a/core/modules/field_ui/src/Access/FormModeAccessCheck.php
+++ b/core/modules/field_ui/src/Access/FormModeAccessCheck.php
@@ -6,7 +6,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -45,7 +45,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/field_ui/src/Access/ViewModeAccessCheck.php b/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
index 0d3fa6bd01..6956b908ee 100644
--- a/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
+++ b/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
@@ -6,7 +6,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\Routing\Route;
 
@@ -45,7 +45,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/field_ui/src/Controller/FieldConfigListController.php b/core/modules/field_ui/src/Controller/FieldConfigListController.php
index ecfb44964b..cd111a9e85 100644
--- a/core/modules/field_ui/src/Controller/FieldConfigListController.php
+++ b/core/modules/field_ui/src/Controller/FieldConfigListController.php
@@ -3,7 +3,7 @@
 namespace Drupal\field_ui\Controller;
 
 use Drupal\Core\Entity\Controller\EntityListController;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Defines a controller to list field instances.
@@ -17,7 +17,7 @@ class FieldConfigListController extends EntityListController {
    *   The entity type.
    * @param string $bundle
    *   The entity bundle.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    *
    * @return array
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index b25165e716..68d053b5a4 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\PluginSettingsInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field_ui\Element\FieldUiTable;
 use Drupal\field_ui\FieldUI;
 
diff --git a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
index 6ec88c9788..96e4ac2350 100644
--- a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field_ui\FieldUI;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index c0abe888b4..7f05e9d76e 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -14,7 +14,7 @@
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index fe5615f22a..82888a4996 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -9,7 +9,7 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\filter\Element\TextFormat;
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index a505c3f1d0..8de53dd415 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -12,7 +12,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\taxonomy\VocabularyInterface;
 use Drupal\user\Entity\User;
 
diff --git a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php
index 3491874c5b..d44853c0f8 100644
--- a/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php
+++ b/core/modules/forum/src/Breadcrumb/ForumBreadcrumbBuilderBase.php
@@ -8,7 +8,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\forum\ForumManagerInterface;
diff --git a/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
index 91ea1a01c3..8aaa46c2c8 100644
--- a/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
+++ b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
@@ -3,7 +3,7 @@
 namespace Drupal\forum\Breadcrumb;
 
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides a breadcrumb builder base class for forum listing pages.
diff --git a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
index 007fb9a63c..744ec45060 100644
--- a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
+++ b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
@@ -3,7 +3,7 @@
 namespace Drupal\forum\Breadcrumb;
 
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Breadcrumb builder for forum nodes.
diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index 6a86a180ba..732d468e33 100644
--- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -140,7 +140,7 @@ public function testBuild() {
     $breadcrumb_builder->setStringTranslation($translation_manager);
 
     // Our empty data set.
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     // Expected result set.
     $expected = [
diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
index 962e5f0eaa..3d5e1c53f4 100644
--- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
@@ -61,7 +61,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = [])
       ->setMethods(NULL)
       ->getMock();
 
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
       ->method('getRouteName')
       ->will($this->returnValue($route_name));
@@ -199,7 +199,7 @@ public function testBuild() {
     $forum_listing = $prophecy->reveal();
 
     // Our data set.
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->exactly(2))
       ->method('getParameter')
       ->with('taxonomy_term')
diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
index a194ecc686..d5895d18d2 100644
--- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
@@ -68,7 +68,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = [])
       ->setMethods(NULL)
       ->getMock();
 
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
       ->method('getRouteName')
       ->will($this->returnValue($route_name));
@@ -206,7 +206,7 @@ public function testBuild() {
       ->getMock();
 
     // Our data set.
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->exactly(2))
       ->method('getParameter')
       ->with('node')
diff --git a/core/modules/hal/hal.module b/core/modules/hal/hal.module
index 0833e47758..31ac2d1571 100644
--- a/core/modules/hal/hal.module
+++ b/core/modules/hal/hal.module
@@ -5,7 +5,7 @@
  * Adds support for serializing entities to Hypertext Application Language.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/help/help.api.php b/core/modules/help/help.api.php
index 7345ba51aa..a4a44a0377 100644
--- a/core/modules/help/help.api.php
+++ b/core/modules/help/help.api.php
@@ -38,7 +38,7 @@
  *   For page-specific help, use the route name as identified in the
  *   module's routing.yml file. For module overview help, the route name
  *   will be in the form of "help.page.$modulename".
- * @param Drupal\Core\Routing\RouteMatchInterface $route_match
+ * @param Drupal\Component\Routing\RouteMatchInterface $route_match
  *   The current route match. This can be used to generate different help
  *   output for different pages that share the same route.
  *
@@ -46,7 +46,7 @@
  *   A render array, localized string, or object that can be rendered into
  *   a string, containing the help text.
  */
-function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_match) {
+function hook_help($route_name, \Drupal\Component\Routing\RouteMatchInterface $route_match) {
   switch ($route_name) {
     // Main module help for the block module.
     case 'help.page.block':
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 9ada44feb7..224984927b 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Core\Block\BlockPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php
index 92d12d6ceb..eede8d8807 100644
--- a/core/modules/help/src/Controller/HelpController.php
+++ b/core/modules/help/src/Controller/HelpController.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\help\HelpSectionManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -18,7 +18,7 @@ class HelpController extends ControllerBase {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -39,7 +39,7 @@ class HelpController extends ControllerBase {
   /**
    * Creates a new HelpController.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param \Drupal\help\HelpSectionManager $help_manager
    *   The help section manager.
diff --git a/core/modules/help/src/Plugin/Block/HelpBlock.php b/core/modules/help/src/Plugin/Block/HelpBlock.php
index 04f8bcbab6..228bb34ede 100644
--- a/core/modules/help/src/Plugin/Block/HelpBlock.php
+++ b/core/modules/help/src/Plugin/Block/HelpBlock.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -40,7 +40,7 @@ class HelpBlock extends BlockBase implements ContainerFactoryPluginInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -57,7 +57,7 @@ class HelpBlock extends BlockBase implements ContainerFactoryPluginInterface {
    *   The current request.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, Request $request, ModuleHandlerInterface $module_handler, RouteMatchInterface $route_match) {
diff --git a/core/modules/help/tests/modules/help_page_test/help_page_test.module b/core/modules/help/tests/modules/help_page_test/help_page_test.module
index f57728d53f..c388990ac9 100644
--- a/core/modules/help/tests/modules/help_page_test/help_page_test.module
+++ b/core/modules/help/tests/modules/help_page_test/help_page_test.module
@@ -5,7 +5,7 @@
  * Help Page Test module to test the help page.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/help/tests/modules/help_test/help_test.module b/core/modules/help/tests/modules/help_test/help_test.module
index 9f67eccc65..877fdce4c1 100644
--- a/core/modules/help/tests/modules/help_test/help_test.module
+++ b/core/modules/help/tests/modules/help_test/help_test.module
@@ -5,7 +5,7 @@
  * Test Help module.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/help/tests/modules/more_help_page_test/more_help_page_test.module b/core/modules/help/tests/modules/more_help_page_test/more_help_page_test.module
index bbd68a9b15..19d3154d60 100644
--- a/core/modules/help/tests/modules/more_help_page_test/more_help_page_test.module
+++ b/core/modules/help/tests/modules/more_help_page_test/more_help_page_test.module
@@ -5,7 +5,7 @@
  * More Help Page Test module to test the help blocks.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php b/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php
index 7010fc8764..c3e86bbe81 100644
--- a/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php
+++ b/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\help\Kernel;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\help_test\SupernovaGenerator;
 use Drupal\KernelTests\KernelTestBase;
 
diff --git a/core/modules/help_topics/help_topics.module b/core/modules/help_topics/help_topics.module
index 6ee665a8c8..79b4a3fd50 100644
--- a/core/modules/help_topics/help_topics.module
+++ b/core/modules/help_topics/help_topics.module
@@ -5,7 +5,7 @@
  * Displays help topics provided by modules and themes.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/help_topics/src/HelpBreadcrumbBuilder.php b/core/modules/help_topics/src/HelpBreadcrumbBuilder.php
index 1387b4fa2e..9cee911a7f 100644
--- a/core/modules/help_topics/src/HelpBreadcrumbBuilder.php
+++ b/core/modules/help_topics/src/HelpBreadcrumbBuilder.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics_test.module b/core/modules/help_topics/tests/modules/help_topics_test/help_topics_test.module
index 6bbecbac3f..4d6676b0fa 100644
--- a/core/modules/help_topics/tests/modules/help_topics_test/help_topics_test.module
+++ b/core/modules/help_topics/tests/modules/help_topics_test/help_topics_test.module
@@ -5,7 +5,7 @@
  * Test module for help.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/history/history.module b/core/modules/history/history.module
index 11a45307bb..21517b044e 100644
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -12,7 +12,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\history\HistoryRenderCallback;
 use Drupal\user\UserInterface;
 
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index d7bb236c38..733d63141b 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\File\FileSystemInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\Url;
 use Drupal\field\FieldConfigInterface;
diff --git a/core/modules/image/src/PageCache/DenyPrivateImageStyleDownload.php b/core/modules/image/src/PageCache/DenyPrivateImageStyleDownload.php
index 6fe9679a19..6d93525305 100644
--- a/core/modules/image/src/PageCache/DenyPrivateImageStyleDownload.php
+++ b/core/modules/image/src/PageCache/DenyPrivateImageStyleDownload.php
@@ -3,7 +3,7 @@
 namespace Drupal\image\PageCache;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,14 +18,14 @@ class DenyPrivateImageStyleDownload implements ResponsePolicyInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a deny image preview page cache policy.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php b/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
index bca3d01e59..8516f95f39 100644
--- a/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
+++ b/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
@@ -38,12 +38,12 @@ class DenyPrivateImageStyleDownloadTest extends UnitTestCase {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatch|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Component\Routing\RouteMatch|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 
   protected function setUp() {
-    $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $this->routeMatch = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->policy = new DenyPrivateImageStyleDownload($this->routeMatch);
     $this->response = new Response();
     $this->request = new Request();
diff --git a/core/modules/inline_form_errors/inline_form_errors.module b/core/modules/inline_form_errors/inline_form_errors.module
index 3bacd37b93..839dea8d62 100644
--- a/core/modules/inline_form_errors/inline_form_errors.module
+++ b/core/modules/inline_form_errors/inline_form_errors.module
@@ -5,7 +5,7 @@
  * Enables inline form errors.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\inline_form_errors\RenderElementHelper;
 
 /**
diff --git a/core/modules/jsonapi/jsonapi.module b/core/modules/jsonapi/jsonapi.module
index d0a58ecf9c..228a71a6a5 100644
--- a/core/modules/jsonapi/jsonapi.module
+++ b/core/modules/jsonapi/jsonapi.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/jsonapi/src/Access/EntityAccessChecker.php b/core/modules/jsonapi/src/Access/EntityAccessChecker.php
index d3d4fa06e0..c9e37fb137 100644
--- a/core/modules/jsonapi/src/Access/EntityAccessChecker.php
+++ b/core/modules/jsonapi/src/Access/EntityAccessChecker.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\jsonapi\Exception\EntityAccessDeniedHttpException;
 use Drupal\jsonapi\JsonApiResource\LabelOnlyResourceObject;
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 2bbbedb808..6d8daef267 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -14,7 +14,7 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
diff --git a/core/modules/layout_builder/layout_builder.module b/core/modules/layout_builder/layout_builder.module
index cf1fcc9be6..ebd2b35e54 100644
--- a/core/modules/layout_builder/layout_builder.module
+++ b/core/modules/layout_builder/layout_builder.module
@@ -12,7 +12,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\field\FieldConfigInterface;
 use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
diff --git a/core/modules/layout_builder/src/Access/LayoutSectionAccessCheck.php b/core/modules/layout_builder/src/Access/LayoutSectionAccessCheck.php
index e57218c9d9..66f0fe247f 100644
--- a/core/modules/layout_builder/src/Access/LayoutSectionAccessCheck.php
+++ b/core/modules/layout_builder/src/Access/LayoutSectionAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\layout_builder\SectionStorageInterface;
 
@@ -23,7 +23,7 @@ class LayoutSectionAccessCheck implements AccessInterface {
   /**
    * Checks routing access to the layout.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
diff --git a/core/modules/layout_builder/src/Cache/LayoutBuilderIsActiveCacheContext.php b/core/modules/layout_builder/src/Cache/LayoutBuilderIsActiveCacheContext.php
index 5edec7f0e5..99c562fec7 100644
--- a/core/modules/layout_builder/src/Cache/LayoutBuilderIsActiveCacheContext.php
+++ b/core/modules/layout_builder/src/Cache/LayoutBuilderIsActiveCacheContext.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CalculatedCacheContextInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\layout_builder\OverridesSectionStorageInterface;
 
 /**
@@ -22,14 +22,14 @@ class LayoutBuilderIsActiveCacheContext implements CalculatedCacheContextInterfa
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * LayoutBuilderCacheContext constructor.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php b/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
index eac8695a64..16dff5e1f2 100644
--- a/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
+++ b/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
@@ -5,7 +5,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Controller\FormController;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/modules/layout_builder/src/Form/DefaultsEntityForm.php b/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
index 71c19a3ff7..419f48c24f 100644
--- a/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
+++ b/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\layout_builder\Entity\LayoutEntityDisplayInterface;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
 use Drupal\layout_builder\SectionStorageInterface;
diff --git a/core/modules/link/link.module b/core/modules/link/link.module
index fafa734f7d..30f6a2ef4c 100644
--- a/core/modules/link/link.module
+++ b/core/modules/link/link.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Link;
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 40cd9d2491..37532a7b3f 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -22,7 +22,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Asset\AttachedAssetsInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\ConfigurableLanguageInterface;
 use Drupal\Component\Utility\Crypt;
diff --git a/core/modules/media/media.module b/core/modules/media/media.module
index 49df4f3f79..0f0a52e759 100644
--- a/core/modules/media/media.module
+++ b/core/modules/media/media.module
@@ -11,7 +11,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\Element\RenderElement;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
diff --git a/core/modules/media_library/media_library.module b/core/modules/media_library/media_library.module
index 84c0f67732..afca559041 100644
--- a/core/modules/media_library/media_library.module
+++ b/core/modules/media_library/media_library.module
@@ -13,7 +13,7 @@
 use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
diff --git a/core/modules/menu_link_content/menu_link_content.module b/core/modules/menu_link_content/menu_link_content.module
index def0ed9db0..9e1776f28b 100644
--- a/core/modules/menu_link_content/menu_link_content.module
+++ b/core/modules/menu_link_content/menu_link_content.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\path_alias\PathAliasInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\system\MenuInterface;
 
 /**
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 17320f500b..b909b10b59 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -15,7 +15,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Menu\MenuLinkInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\node\NodeTypeInterface;
 use Drupal\system\Entity\Menu;
diff --git a/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php b/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
index 6424ff9f9d..2045d8918d 100644
--- a/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
+++ b/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Menu\LocalActionDefault;
 use Drupal\Core\Routing\RedirectDestinationInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/core/modules/migrate/migrate.module b/core/modules/migrate/migrate.module
index 3b92463928..61cc1f3488 100644
--- a/core/modules/migrate/migrate.module
+++ b/core/modules/migrate/migrate.module
@@ -5,7 +5,7 @@
  * Provides the Migrate API.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module
index f9bb4e7ac8..9e56f3a30f 100644
--- a/core/modules/migrate_drupal/migrate_drupal.module
+++ b/core/modules/migrate_drupal/migrate_drupal.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Plugin\RequirementsInterface;
diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module
index 82ff699f84..21c016c671 100644
--- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module
+++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module
@@ -5,7 +5,7 @@
  * Provides a requirement for multilingual content and configuration migrations.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/migrate_drupal_ui/migrate_drupal_ui.module b/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
index 90642340da..05d01e65ea 100644
--- a/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
+++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
@@ -5,7 +5,7 @@
  * Alert administrators before starting the import process.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index c7e4f9c29c..bfa106b7f4 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -19,7 +19,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
diff --git a/core/modules/node/src/ContextProvider/NodeRouteContext.php b/core/modules/node/src/ContextProvider/NodeRouteContext.php
index 8f0acd7de9..22cde04c79 100644
--- a/core/modules/node/src/ContextProvider/NodeRouteContext.php
+++ b/core/modules/node/src/ContextProvider/NodeRouteContext.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Plugin\Context\ContextProviderInterface;
 use Drupal\Core\Plugin\Context\EntityContext;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\node\Entity\Node;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
@@ -21,14 +21,14 @@ class NodeRouteContext implements ContextProviderInterface {
   /**
    * The route match object.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a new NodeRouteContext.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match object.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/node/src/PageCache/DenyNodePreview.php b/core/modules/node/src/PageCache/DenyNodePreview.php
index 0325f52b20..3f3d88afd8 100644
--- a/core/modules/node/src/PageCache/DenyNodePreview.php
+++ b/core/modules/node/src/PageCache/DenyNodePreview.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\PageCache;
 
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,14 +18,14 @@ class DenyNodePreview implements ResponsePolicyInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
   /**
    * Constructs a deny node preview page cache policy.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(RouteMatchInterface $route_match) {
diff --git a/core/modules/node/src/Plugin/views/argument_default/Node.php b/core/modules/node/src/Plugin/views/argument_default/Node.php
index e5149f652f..d129f2c812 100644
--- a/core/modules/node/src/Plugin/views/argument_default/Node.php
+++ b/core/modules/node/src/Plugin/views/argument_default/Node.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -22,7 +22,7 @@ class Node extends ArgumentDefaultPluginBase implements CacheableDependencyInter
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -35,7 +35,7 @@ class Node extends ArgumentDefaultPluginBase implements CacheableDependencyInter
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match) {
diff --git a/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php b/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
index 2a78d2565d..e5090a0d0a 100644
--- a/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
+++ b/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
@@ -38,12 +38,12 @@ class DenyNodePreviewTest extends UnitTestCase {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatch|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Component\Routing\RouteMatch|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 
   protected function setUp() {
-    $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $this->routeMatch = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->policy = new DenyNodePreview($this->routeMatch);
     $this->response = new Response();
     $this->request = new Request();
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index 0face469bd..8af618eeb8 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\field\FieldStorageConfigInterface;
 
 /**
diff --git a/core/modules/page_cache/page_cache.module b/core/modules/page_cache/page_cache.module
index f51d3783da..35eaf410d9 100644
--- a/core/modules/page_cache/page_cache.module
+++ b/core/modules/page_cache/page_cache.module
@@ -5,7 +5,7 @@
  * Caches responses for anonymous users, request and response policies allowing.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 40323b0d21..90df97209a 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -13,7 +13,7 @@
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\path\PathAliasForm;
 use Drupal\path\PathAliasListBuilder;
 
diff --git a/core/modules/quickedit/quickedit.module b/core/modules/quickedit/quickedit.module
index 351ac6987a..5a1d77afb0 100644
--- a/core/modules/quickedit/quickedit.module
+++ b/core/modules/quickedit/quickedit.module
@@ -15,7 +15,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 56204e1dd6..e3329b6416 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\rdf\Entity\RdfMapping;
 
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 09582a033f..d5d3516cdc 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Logger\RfcLogLevel;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 use Drupal\responsive_image\ResponsiveImageStyleInterface;
diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module
index 450e92ad03..155c54ba05 100644
--- a/core/modules/rest/rest.module
+++ b/core/modules/rest/rest.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\views\ViewEntityInterface;
 
 /**
diff --git a/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php b/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
index 229413f46a..06c4515148 100644
--- a/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
+++ b/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\rest\ResourceResponseInterface;
 use Drupal\serialization\Normalizer\CacheableNormalizerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -39,7 +39,7 @@ class ResourceResponseSubscriber implements EventSubscriberInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -50,7 +50,7 @@ class ResourceResponseSubscriber implements EventSubscriberInterface {
    *   The serializer.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(SerializerInterface $serializer, RendererInterface $renderer, RouteMatchInterface $route_match) {
@@ -86,7 +86,7 @@ public function onResponse(FilterResponseEvent $event) {
    * or PATCHing using a certain format, you probably expect a response in that
    * same format.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The current request.
diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php
index e1c424aa7c..6f78343da2 100644
--- a/core/modules/rest/src/RequestHandler.php
+++ b/core/modules/rest/src/RequestHandler.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\rest\Plugin\ResourceInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -64,7 +64,7 @@ public static function create(ContainerInterface $container) {
   /**
    * Handles a REST API request.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The HTTP request object.
@@ -84,7 +84,7 @@ public function handle(RouteMatchInterface $route_match, Request $request, RestR
   /**
    * Handles a REST API request without deserializing the request body.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The HTTP request object.
@@ -127,7 +127,7 @@ protected function prepareResponse($response, RestResourceConfigInterface $resou
   /**
    * Gets the normalized HTTP request method of the matched route.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
    * @return string
@@ -153,7 +153,7 @@ protected static function getNormalizedRequestMethod(RouteMatchInterface $route_
   /**
    * Deserializes request body, if any.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The HTTP request object.
@@ -212,7 +212,7 @@ protected function deserialize(RouteMatchInterface $route_match, Request $reques
   /**
    * Delegates an incoming request to the appropriate REST resource plugin.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The HTTP request object.
@@ -245,7 +245,7 @@ protected function delegateToRestResourcePlugin(RouteMatchInterface $route_match
   /**
    * Creates an argument resolver, containing all REST parameters.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param mixed $unserialized
    *   The unserialized data.
@@ -316,7 +316,7 @@ protected function createArgumentResolver(RouteMatchInterface $route_match, $uns
    *
    * This creates an list of parameters in a statically defined order.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match
    * @param mixed $unserialized
    *   The unserialized data.
diff --git a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
index ebfa0ae281..7d24f9b1c8 100644
--- a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
+++ b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
@@ -5,7 +5,7 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ImmutableConfig;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\rest\Plugin\ResourceBase;
 use Drupal\rest\RequestHandler;
diff --git a/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php b/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
index eab2d9f89b..8780620677 100644
--- a/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
+++ b/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
@@ -6,8 +6,8 @@
 use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\rest\EventSubscriber\ResourceResponseSubscriber;
 use Drupal\rest\ModifiedResourceResponse;
 use Drupal\rest\ResourceResponse;
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 3afc24bd2e..dce94db5af 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -8,7 +8,7 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/serialization/serialization.module b/core/modules/serialization/serialization.module
index d191c2e0b9..3cb65c04b3 100644
--- a/core/modules/serialization/serialization.module
+++ b/core/modules/serialization/serialization.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/settings_tray/settings_tray.module b/core/modules/settings_tray/settings_tray.module
index 3bce3ea88b..936b3a88f6 100644
--- a/core/modules/settings_tray/settings_tray.module
+++ b/core/modules/settings_tray/settings_tray.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\Core\Asset\AttachedAssetsInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\block\entity\Block;
 use Drupal\block\BlockInterface;
 use Drupal\settings_tray\Block\BlockEntitySettingTrayForm;
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index bbc1d8c120..6ffaff8927 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\shortcut\ShortcutSetInterface;
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index a538575503..dedbe18f06 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -12,7 +12,7 @@
 use Drupal\Core\File\Exception\FileException;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\Core\Test\JUnitConverter;
 use Drupal\Core\Test\PhpUnitTestRunner;
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 30d8983599..b49834620e 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\statistics\StatisticsViewsResult;
diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module
index c40bf33bbb..2159804020 100644
--- a/core/modules/syslog/syslog.module
+++ b/core/modules/syslog/syslog.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/core/modules/system/src/PathBasedBreadcrumbBuilder.php
index 261ae32a24..76fc10e089 100644
--- a/core/modules/system/src/PathBasedBreadcrumbBuilder.php
+++ b/core/modules/system/src/PathBasedBreadcrumbBuilder.php
@@ -14,8 +14,8 @@
 use Drupal\Core\Path\PathMatcherInterface;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\Routing\RequestContext;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
diff --git a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php
index a08738636c..260a645bea 100644
--- a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -28,7 +28,7 @@ class SystemBreadcrumbBlock extends BlockBase implements ContainerFactoryPluginI
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -43,7 +43,7 @@ class SystemBreadcrumbBlock extends BlockBase implements ContainerFactoryPluginI
    *   The plugin implementation definition.
    * @param \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface $breadcrumb_manager
    *   The breadcrumb manager.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, BreadcrumbBuilderInterface $breadcrumb_manager, RouteMatchInterface $route_match) {
diff --git a/core/modules/system/src/Theme/BatchNegotiator.php b/core/modules/system/src/Theme/BatchNegotiator.php
index ceb6c9607c..13cae40de8 100644
--- a/core/modules/system/src/Theme/BatchNegotiator.php
+++ b/core/modules/system/src/Theme/BatchNegotiator.php
@@ -3,7 +3,7 @@
 namespace Drupal\system\Theme;
 
 use Drupal\Core\Batch\BatchStorageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
diff --git a/core/modules/system/src/Theme/DbUpdateNegotiator.php b/core/modules/system/src/Theme/DbUpdateNegotiator.php
index 4efb19ed9d..387233a2cd 100644
--- a/core/modules/system/src/Theme/DbUpdateNegotiator.php
+++ b/core/modules/system/src/Theme/DbUpdateNegotiator.php
@@ -3,7 +3,7 @@
 namespace Drupal\system\Theme;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 208372ccaa..4d57e1bd6b 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -27,8 +27,8 @@
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\Queue\QueueGarbageCollectionInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Routing\StackedRouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\StackedRouteMatchInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
 use Drupal\path_alias\PathAliasInterface;
diff --git a/core/modules/system/tests/modules/common_test/src/Render/MainContent/JsonRenderer.php b/core/modules/system/tests/modules/common_test/src/Render/MainContent/JsonRenderer.php
index bcecfbc5f4..738afdd280 100644
--- a/core/modules/system/tests/modules/common_test/src/Render/MainContent/JsonRenderer.php
+++ b/core/modules/system/tests/modules/common_test/src/Render/MainContent/JsonRenderer.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Render\MainContent\MainContentRendererInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php b/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
index aecb4dd0de..81acccc64a 100644
--- a/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
+++ b/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Render\MainContent\ModalRenderer;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module
index 1f5072085f..a94a3fd643 100644
--- a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module
+++ b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module
@@ -5,7 +5,7 @@
  * Experimental Test module to test the Core (Experimental) package.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php b/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
index 8472b99a18..563e333946 100644
--- a/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
+++ b/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
@@ -3,7 +3,7 @@
 namespace Drupal\menu_test\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeManagerInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -30,7 +30,7 @@ class MenuTestController extends ControllerBase {
   /**
    * The active route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
diff --git a/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php b/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php
index 99203d68e0..e8b806640f 100644
--- a/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php
+++ b/core/modules/system/tests/modules/menu_test/src/Theme/TestThemeNegotiator.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\menu_test\Theme;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
 /**
diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module
index d98f32ca30..133e69e60f 100644
--- a/core/modules/system/tests/modules/system_test/system_test.module
+++ b/core/modules/system/tests/modules/system_test/system_test.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Extension\Extension;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\path_alias\Entity\PathAlias;
 
 /**
diff --git a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
index 38fee503ec..dea281a55b 100644
--- a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
+++ b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -25,7 +25,7 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
   /**
    * The current route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $currentRouteMatch;
 
@@ -39,7 +39,7 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
   /**
    * Constructs a new ThemeTestSubscriber.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $current_route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $current_route_match
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
    */
diff --git a/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php b/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php
index 727e3b72f2..e427479c42 100644
--- a/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php
+++ b/core/modules/system/tests/modules/theme_test/src/Theme/CustomThemeNegotiator.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\theme_test\Theme;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
 /**
diff --git a/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php b/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
index 06cca02afc..dd41d98170 100644
--- a/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
+++ b/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\theme_test\Theme;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
 /**
diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index 61ca3e0a8d..7cac1fbb3f 100644
--- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -149,7 +149,7 @@ public function testBuildOnFrontpage() {
       ->method('isFrontPage')
       ->willReturn(TRUE);
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([], $breadcrumb->getLinks());
     $this->assertEquals(['url.path.is_front', 'url.path.parent'], $breadcrumb->getCacheContexts());
     $this->assertEquals([], $breadcrumb->getCacheTags());
@@ -166,7 +166,7 @@ public function testBuildWithOnePathElement() {
       ->method('getPathInfo')
       ->will($this->returnValue('/example'));
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([0 => new Link('Home', new Url('<front>'))], $breadcrumb->getLinks());
     $this->assertEquals(['url.path.is_front', 'url.path.parent'], $breadcrumb->getCacheContexts());
     $this->assertEquals([], $breadcrumb->getCacheTags());
@@ -201,7 +201,7 @@ public function testBuildWithTwoPathElements() {
 
     $this->setupAccessManagerToAllow();
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([0 => new Link('Home', new Url('<front>')), 1 => new Link('Example', new Url('example'))], $breadcrumb->getLinks());
     $this->assertEquals([
       'url.path.is_front',
@@ -252,7 +252,7 @@ public function testBuildWithThreePathElements() {
         AccessResult::allowed()->cachePerPermissions(),
         AccessResult::allowed()->addCacheContexts(['bar'])->addCacheTags(['example'])
       );
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([
       new Link('Home', new Url('<front>')),
       new Link('Example', new Url('example')),
@@ -286,7 +286,7 @@ public function testBuildWithException($exception_class, $exception_argument) {
       ->method('matchRequest')
       ->will($this->throwException(new $exception_class($exception_argument)));
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
 
     // No path matched, though at least the frontpage is displayed.
     $this->assertEquals([0 => new Link('Home', new Url('<front>'))], $breadcrumb->getLinks());
@@ -330,7 +330,7 @@ public function testBuildWithNonProcessedPath() {
       ->method('matchRequest')
       ->will($this->returnValue([]));
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
 
     // No path matched, though at least the frontpage is displayed.
     $this->assertEquals([0 => new Link('Home', new Url('<front>'))], $breadcrumb->getLinks());
@@ -345,7 +345,7 @@ public function testBuildWithNonProcessedPath() {
    * @covers ::applies
    */
   public function testApplies() {
-    $this->assertTrue($this->builder->applies($this->createMock('Drupal\Core\Routing\RouteMatchInterface')));
+    $this->assertTrue($this->builder->applies($this->createMock('Drupal\Component\Routing\RouteMatchInterface')));
   }
 
   /**
@@ -380,7 +380,7 @@ public function testBuildWithUserPath() {
       ->with($this->anything(), $route_1)
       ->will($this->returnValue('Admin'));
 
-    $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->builder->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([0 => new Link('Home', new Url('<front>')), 1 => new Link('Admin', new Url('user_page'))], $breadcrumb->getLinks());
     $this->assertEquals([
       'url.path.is_front',
diff --git a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
index eb1bc5a47b..adfdc13cae 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\taxonomy\TermInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -27,7 +27,7 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -47,7 +47,7 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\taxonomy\VocabularyStorageInterface $vocabulary_storage
    *   The vocabulary storage.
diff --git a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
index d235c78b92..51f454f3a6 100644
--- a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
+++ b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 50a2fd83a6..0223c94555 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
diff --git a/core/modules/telephone/telephone.module b/core/modules/telephone/telephone.module
index 65a9b1c713..2bd9c49c10 100644
--- a/core/modules/telephone/telephone.module
+++ b/core/modules/telephone/telephone.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/text/text.module b/core/modules/text/text.module
index ef367b095c..d44bf0a47f 100644
--- a/core/modules/text/text.module
+++ b/core/modules/text/text.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 81e4c01fde..4cf7526a30 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Url;
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index e6bbd2ae63..9e3d244021 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -5,7 +5,7 @@
  * Main functions of the module.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\tour\Entity\Tour;
 
 /**
diff --git a/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php b/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
index db0f2b4632..eca7d84f6f 100644
--- a/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
+++ b/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
@@ -3,7 +3,7 @@
 namespace Drupal\tracker\Plugin\Menu;
 
 use Drupal\Core\Menu\LocalTaskDefault;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Provides route parameters needed to link to the current user tracker tab.
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 548ce573c7..ab33176a59 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\comment\CommentInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
 use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index df1f7ef1d7..c13de637ba 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -15,7 +15,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\update\UpdateFetcherInterface;
 use Drupal\update\UpdateManagerInterface;
diff --git a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
index d443effc30..04064207ba 100644
--- a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
+++ b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
@@ -3,7 +3,7 @@
 namespace Drupal\user\EventSubscriber;
 
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Url;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
diff --git a/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php
index 2f54587c4b..59a8a4ad5d 100644
--- a/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/modules/user/src/EventSubscriber/MaintenanceModeSubscriber.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\user\EventSubscriber;
 
-use Drupal\Core\Routing\RouteMatch;
+use \Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\MaintenanceModeInterface;
 use Drupal\Core\Url;
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index d9971c564d..a643b84bf3 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Security\TrustedCallbackInterface;
 use Drupal\Core\Routing\RedirectDestinationTrait;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Block\BlockBase;
@@ -29,7 +29,7 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -45,7 +45,7 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match) {
diff --git a/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php b/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
index 4a829906ae..78d96ca58e 100644
--- a/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
+++ b/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
@@ -5,7 +5,7 @@
 use Drupal\Core\PathProcessor\PathProcessorManager;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\AdminContext;
-use Drupal\Core\Routing\StackedRouteMatchInterface;
+use Drupal\Component\Routing\StackedRouteMatchInterface;
 use Drupal\language\LanguageNegotiationMethodBase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -59,7 +59,7 @@ class LanguageNegotiationUserAdmin extends LanguageNegotiationMethodBase impleme
   /**
    * The stacked route match.
    *
-   * @var \Drupal\Core\Routing\StackedRouteMatchInterface
+   * @var \Drupal\Component\Routing\StackedRouteMatchInterface
    */
   protected $stackedRouteMatch;
 
@@ -72,7 +72,7 @@ class LanguageNegotiationUserAdmin extends LanguageNegotiationMethodBase impleme
    *   The router.
    * @param \Drupal\Core\PathProcessor\PathProcessorManager $path_processor_manager
    *   The path processor manager.
-   * @param \Drupal\Core\Routing\StackedRouteMatchInterface $stacked_route_match
+   * @param \Drupal\Component\Routing\StackedRouteMatchInterface $stacked_route_match
    *   The stacked route match.
    */
   public function __construct(AdminContext $admin_context, UrlMatcherInterface $router, PathProcessorManager $path_processor_manager, StackedRouteMatchInterface $stacked_route_match) {
diff --git a/core/modules/user/src/Plugin/views/argument_default/User.php b/core/modules/user/src/Plugin/views/argument_default/User.php
index 448f79c55d..85d7913591 100644
--- a/core/modules/user/src/Plugin/views/argument_default/User.php
+++ b/core/modules/user/src/Plugin/views/argument_default/User.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\user\UserInterface;
@@ -24,7 +24,7 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -38,7 +38,7 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match) {
diff --git a/core/modules/user/src/Theme/AdminNegotiator.php b/core/modules/user/src/Theme/AdminNegotiator.php
index d97485242e..01831c2cdd 100644
--- a/core/modules/user/src/Theme/AdminNegotiator.php
+++ b/core/modules/user/src/Theme/AdminNegotiator.php
@@ -6,7 +6,7 @@
 use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\AdminContext;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index ef0768497c..8cf988f2e0 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -14,7 +14,7 @@
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Site\Settings;
diff --git a/core/modules/views/src/Plugin/views/argument/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php
index 852e21f04b..56827bb503 100644
--- a/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/core/modules/views/src/Plugin/views/argument/Date.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -46,7 +46,7 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
+   * @var \Drupal\Component\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -66,7 +66,7 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php
index a27ddbaf29..17fc292230 100644
--- a/core/modules/views/src/Routing/ViewPageController.php
+++ b/core/modules/views/src/Routing/ViewPageController.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\views\Routing;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\views\Plugin\views\display\Page;
 
 /**
@@ -17,7 +17,7 @@ class ViewPageController {
    *   The ID of the view
    * @param string $display_id
    *   The ID of the display.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
    * @return array|\Symfony\Component\HttpFoundation\Response
diff --git a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index 0364558124..fe3337607c 100644
--- a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\Unit\Routing;
 
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Routing\ViewPageController;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 13bec4d13e..f7afbb5901 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\views\Plugin\Derivative\ViewsLocalTask;
 use Drupal\views\ViewEntityInterface;
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index da5c0bb7e7..539e0360c7 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -5,7 +5,7 @@
  * Provide structure for the administrative interface to Views.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Analyzer;
diff --git a/core/modules/workflows/src/WorkflowDeleteAccessCheck.php b/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
index 7ec66e0772..f420fd73c5 100644
--- a/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
+++ b/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\workflows;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
diff --git a/core/modules/workflows/src/WorkflowStateTransitionOperationsAccessCheck.php b/core/modules/workflows/src/WorkflowStateTransitionOperationsAccessCheck.php
index 33b378cfee..3a574b8297 100644
--- a/core/modules/workflows/src/WorkflowStateTransitionOperationsAccessCheck.php
+++ b/core/modules/workflows/src/WorkflowStateTransitionOperationsAccessCheck.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 
 /**
@@ -39,7 +39,7 @@ class WorkflowStateTransitionOperationsAccessCheck implements AccessInterface {
    *   _workflow_access: 'delete-state'
    * @endcode
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The currently logged in account.
@@ -71,7 +71,7 @@ public function access(RouteMatchInterface $route_match, AccountInterface $accou
   /**
    * Get the operation that will be used for the access check
    *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   * @param \Drupal\Component\Routing\RouteMatchInterface $route_match
    *   The parametrized route
    *
    * @return string
diff --git a/core/modules/workflows/tests/src/Unit/WorkflowStateTransitionOperationsAccessCheckTest.php b/core/modules/workflows/tests/src/Unit/WorkflowStateTransitionOperationsAccessCheckTest.php
index d99390e264..16cb83565d 100644
--- a/core/modules/workflows/tests/src/Unit/WorkflowStateTransitionOperationsAccessCheckTest.php
+++ b/core/modules/workflows/tests/src/Unit/WorkflowStateTransitionOperationsAccessCheckTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\workflows\Unit;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\workflows\WorkflowDeleteAccessCheck;
diff --git a/core/modules/workflows/workflows.module b/core/modules/workflows/workflows.module
index a22cadff97..1e14c6cd51 100644
--- a/core/modules/workflows/workflows.module
+++ b/core/modules/workflows/workflows.module
@@ -5,7 +5,7 @@
  * Provides hook implementations for the Workflows module.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
diff --git a/core/modules/workspaces/workspaces.module b/core/modules/workspaces/workspaces.module
index 8555a3c4bf..9d8ba3774d 100644
--- a/core/modules/workspaces/workspaces.module
+++ b/core/modules/workspaces/workspaces.module
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\views\Plugin\views\query\QueryPluginBase;
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index bfc693f32d..23f98d709f 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Path\PathMatcherInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Theme\Registry;
 use Drupal\Core\Utility\ThemeRegistry;
 use Drupal\KernelTests\KernelTestBase;
@@ -212,7 +212,7 @@ public function test40xThemeSuggestions($route, $suggestion) {
     $path_current = $this->prophesize(CurrentPathStack::class);
     $path_current->getPath()->willReturn('/node/123');
     \Drupal::getContainer()->set('path.current', $path_current->reveal());
-    /** @var \Drupal\Core\Routing\RouteMatchInterface $route_matcher */
+    /** @var \Drupal\Component\Routing\RouteMatchInterface $route_matcher */
     $route_matcher = $this->prophesize(RouteMatchInterface::class);
     $route_matcher->getRouteName()->willReturn($route);
     \Drupal::getContainer()->set('current_route_match', $route_matcher->reveal());
diff --git a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php b/core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php
similarity index 96%
rename from core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
rename to core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php
index ec3861cf36..6e75b16023 100644
--- a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
+++ b/core/tests/Drupal/Tests/Component/Routing/CurrentRouteMatchTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Tests\Core\Routing;
+namespace Drupal\Tests\Component\Routing;
 
-use Drupal\Core\Routing\CurrentRouteMatch;
+use Drupal\Component\Routing\CurrentRouteMatch;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
@@ -10,7 +10,7 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * @coversDefaultClass \Drupal\Core\Routing\CurrentRouteMatch
+ * @coversDefaultClass \Drupal\Component\Routing\CurrentRouteMatch
  * @group Routing
  */
 class CurrentRouteMatchTest extends RouteMatchTestBase {
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php
similarity index 93%
rename from core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
rename to core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php
index 0a3c65cbe9..97f8e3e790 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
+++ b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\Core\Routing;
+namespace Drupal\Tests\Component\Routing;
 
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
- * @coversDefaultClass \Drupal\Core\Routing\RouteMatch
+ * @coversDefaultClass \Drupal\Component\Routing\RouteMatch
  * @group Routing
  */
 class RouteMatchTest extends RouteMatchTestBase {
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTestBase.php
similarity index 90%
rename from core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
rename to core/tests/Drupal/Tests/Component/Routing/RouteMatchTestBase.php
index a47ec73210..f3584641cb 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
+++ b/core/tests/Drupal/Tests/Component/Routing/RouteMatchTestBase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Tests\Core\Routing;
+namespace Drupal\Tests\Component\Routing;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
 
@@ -22,7 +22,7 @@ abstract class RouteMatchTestBase extends UnitTestCase {
    *   Parameters array
    * @param $raw_parameters
    *   Raw parameters array
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    */
   abstract protected function getRouteMatch($name, Route $route, array $parameters, array $raw_parameters);
 
@@ -93,7 +93,7 @@ public function testGetRouteObject(RouteMatchInterface $route_match, Route $rout
 
   /**
    * @covers ::getParameter
-   * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames
+   * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames
    * @dataProvider routeMatchProvider
    */
   public function testGetParameter(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) {
@@ -107,7 +107,7 @@ public function testGetParameter(RouteMatchInterface $route_match, Route $route,
 
   /**
    * @covers ::getParameters
-   * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames
+   * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames
    * @dataProvider routeMatchProvider
    */
   public function testGetParameters(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) {
@@ -116,7 +116,7 @@ public function testGetParameters(RouteMatchInterface $route_match, Route $route
 
   /**
    * @covers ::getRawParameter
-   * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames
+   * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames
    * @dataProvider routeMatchProvider
    */
   public function testGetRawParameter(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) {
@@ -130,7 +130,7 @@ public function testGetRawParameter(RouteMatchInterface $route_match, Route $rou
 
   /**
    * @covers ::getRawParameters
-   * @covers \Drupal\Core\Routing\RouteMatch::getParameterNames
+   * @covers \Drupal\Component\Routing\RouteMatch::getParameterNames
    * @dataProvider routeMatchProvider
    */
   public function testGetRawParameters(RouteMatchInterface $route_match, Route $route, $parameters, $expected_filtered_parameters) {
diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index d958ca0cf4..cb2658a834 100644
--- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Access\CheckProvider;
 use Drupal\Core\Cache\Context\CacheContextsManager;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Access\AccessManager;
 use Drupal\Core\Access\DefaultAccessCheck;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
index 324d95b72d..39800e2076 100644
--- a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
@@ -40,7 +40,7 @@ protected function setUp() {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $this->routeMatch = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     $this->accessCheck = new CsrfAccessCheck($this->csrfToken);
   }
diff --git a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
index bc936d58c1..907cd19b5b 100644
--- a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Access\CustomAccessCheck;
 use Drupal\Core\Controller\ControllerResolver;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
@@ -59,7 +59,7 @@ protected function setUp() {
    * Test the access method.
    */
   public function testAccess() {
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     $this->controllerResolver->expects($this->at(0))
       ->method('getControllerFromDefinition')
diff --git a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
index 2a94362e97..7d9c41517a 100644
--- a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
@@ -63,12 +63,12 @@ protected function setUp() {
    * Tests the breadcrumb manager without any set breadcrumb.
    */
   public function testBuildWithoutBuilder() {
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->moduleHandler->expects($this->once())
       ->method('alter')
       ->with('system_breadcrumb', $this->breadcrumb, $route_match, ['builder' => NULL]);
 
-    $breadcrumb = $this->breadcrumbManager->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $breadcrumb = $this->breadcrumbManager->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
     $this->assertEquals([], $breadcrumb->getLinks());
     $this->assertEquals([], $breadcrumb->getCacheContexts());
     $this->assertEquals([], $breadcrumb->getCacheTags());
@@ -92,7 +92,8 @@ public function testBuildWithSingleBuilder() {
       ->method('build')
       ->willReturn($this->breadcrumb);
 
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
+
     $this->moduleHandler->expects($this->once())
       ->method('alter')
       ->with('system_breadcrumb', $this->breadcrumb, $route_match, ['builder' => $builder]);
@@ -127,7 +128,7 @@ public function testBuildWithMultipleApplyingBuilders() {
       ->method('build')
       ->willReturn($this->breadcrumb);
 
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
@@ -164,8 +165,7 @@ public function testBuildWithOneNotApplyingBuilders() {
     $builder2->expects($this->once())
       ->method('build')
       ->willReturn($this->breadcrumb);
-
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
@@ -195,7 +195,8 @@ public function testBuildWithInvalidBreadcrumbResult() {
 
     $this->breadcrumbManager->addBuilder($builder, 0);
     $this->expectException(\UnexpectedValueException::class);
-    $this->breadcrumbManager->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
+    $this->breadcrumbManager->build($this->createMock('Drupal\Component\Routing\RouteMatchInterface'));
+
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
index a439a61597..f2298fdc70 100644
--- a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
@@ -69,7 +69,7 @@ protected function setUp() {
   public function testRenderWithFragmentObject() {
     $main_content = ['#markup' => 'example content'];
     $request = new Request();
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     /** @var \Drupal\Core\Ajax\AjaxResponse $result */
     $result = $this->ajaxRenderer->renderResponse($main_content, $request, $route_match);
 
diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
index d7dd9588be..8313cf951d 100644
--- a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
@@ -12,8 +12,8 @@
 use Drupal\Core\DependencyInjection\ClassResolver;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index daa9dcb56a..47e046707a 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\DependencyInjection\Container;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -48,7 +48,7 @@ public function testAccess() {
     $node->access('update', $account, TRUE)->willReturn(AccessResult::allowed());
     $node = $node->reveal();
 
-    /** @var \Drupal\Core\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
+    /** @var \Drupal\Component\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
     $route_match = $this->prophesize(RouteMatchInterface::class);
     $route_match->getRawParameters()->willReturn(new ParameterBag(['var_name' => 1]));
     $route_match->getParameters()->willReturn(new ParameterBag(['var_name' => $node]));
@@ -71,7 +71,7 @@ public function testAccessWithTypePlaceholder() {
     $node->access('update', $account, TRUE)->willReturn(AccessResult::allowed());
     $node = $node->reveal();
 
-    /** @var \Drupal\Core\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
+    /** @var \Drupal\Component\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
     $route_match = $this->createRouteMatchForObject($node);
 
     $access_check = new EntityAccessCheck();
@@ -112,7 +112,7 @@ public function testAccessWithDifferentRouteParameters() {
    *
    * @param object $object
    *   Any object, including prophesized mocks based on interfaces.
-   * @return \Drupal\Core\Routing\RouteMatchInterface
+   * @return \Drupal\Component\Routing\RouteMatchInterface
    *   A prophesized RouteMatchInterface.
    */
   private function createRouteMatchForObject(\stdClass $object) {
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
index e020bde97a..2129a0f8d0 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\DependencyInjection\Container;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -84,7 +84,7 @@ public function testRouteAccess($bundle, $access_requirement, $access_result) {
     $node->getCacheMaxAge()->willReturn(-1);
     $node = $node->reveal();
 
-    /** @var \Drupal\Core\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
+    /** @var \Drupal\Component\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
     $route_match = $this->prophesize(RouteMatchInterface::class);
     $route_match->getRawParameters()->willReturn(new ParameterBag(['node' => 1]));
     $route_match->getParameters()->willReturn(new ParameterBag(['node' => $node]));
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
index b9e48f058b..ac3f4b6be2 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
@@ -109,7 +109,7 @@ public function testAccess($entity_bundle, $requirement, $access, $expected, $ex
       $raw_variables->set('bundle_argument', $entity_bundle);
     }
 
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $route_match->expects($this->any())
       ->method('getRawParameters')
       ->will($this->returnValue($raw_variables));
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index d87818d17d..97e7f39fd2 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormState;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
 
diff --git a/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
index 8381466213..ec7e63441b 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
@@ -23,7 +23,7 @@ class FormAjaxResponseBuilderTest extends UnitTestCase {
   protected $renderer;
 
   /**
-   * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Component\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 
@@ -38,7 +38,7 @@ class FormAjaxResponseBuilderTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
     $this->renderer = $this->createMock('Drupal\Core\Render\MainContent\MainContentRendererInterface');
-    $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $this->routeMatch = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->formAjaxResponseBuilder = new FormAjaxResponseBuilder($this->renderer, $this->routeMatch);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
index 7a4bce8eb0..94baeac975 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
@@ -20,7 +20,7 @@
 use Drupal\Core\Language\Language;
 use Drupal\Core\Menu\LocalActionManager;
 use Drupal\Core\Menu\LocalTaskManager;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Component\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
@@ -132,7 +132,7 @@ protected function setUp() {
     $this->account = $this->createMock('Drupal\Core\Session\AccountInterface');
     $this->discovery = $this->createMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $this->factory = $this->createMock('Drupal\Component\Plugin\Factory\FactoryInterface');
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
 
     $this->localActionManager = new TestLocalActionManager($this->argumentResolver, $this->request, $route_match, $this->routeProvider, $this->moduleHandler, $this->cacheBackend, $this->accessManager, $this->account, $this->discovery, $this->factory);
   }
@@ -391,7 +391,7 @@ public function testControllerResolverDeprecation() {
     }
 
     $controller_resolver = $this->getMockBuilder(ControllerResolver::class)->disableOriginalConstructor()->getMock();
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $request_stack = new RequestStack();
     $request_stack->push($this->request);
     $module_handler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
index 9e4ae6ba48..b031774ee9 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\Core\Menu;
 
 use Drupal\Core\Menu\LocalTaskDefault;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index 474dc36946..65b4567cf2 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -83,7 +83,7 @@ class LocalTaskManagerTest extends UnitTestCase {
   /**
    * The route match.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Component\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 
@@ -107,7 +107,7 @@ protected function setUp() {
     $this->factory = $this->createMock('Drupal\Component\Plugin\Factory\FactoryInterface');
     $this->cacheBackend = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
     $this->accessManager = $this->createMock('Drupal\Core\Access\AccessManagerInterface');
-    $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $this->routeMatch = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->account = $this->createMock('Drupal\Core\Session\AccountInterface');
 
     $this->setupLocalTaskManager();
diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
index f197c45e07..4323b15680 100644
--- a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\Core\Menu;
 
 use Drupal\Core\Menu\MenuActiveTrail;
-use Drupal\Core\Routing\CurrentRouteMatch;
+use Drupal\Component\Routing\CurrentRouteMatch;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\DependencyInjection\Container;
@@ -38,7 +38,7 @@ class MenuActiveTrailTest extends UnitTestCase {
   /**
    * The current route match service.
    *
-   * @var \Drupal\Core\Routing\CurrentRouteMatch
+   * @var \Drupal\Component\Routing\CurrentRouteMatch
    */
   protected $currentRouteMatch;
 
diff --git a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
index 5ef5061327..36624d53c0 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
         ],
       ]
     );
-    $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
+    $route_match = $this->createMock('Drupal\Component\Routing\RouteMatchInterface');
     $this->pathMatcher = new PathMatcher($config_factory_stub, $route_match);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
index 24746c3b03..cace0dcd45 100644
--- a/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\Core\Theme;
 
 use Drupal\Core\Access\CsrfTokenGenerator;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Theme\AjaxBasePageNegotiator;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
diff --git a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
index 40281a9927..ea624879ae 100644
--- a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\DependencyInjection\ClassResolver;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Theme\ThemeNegotiator;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 5843bae302..242504fdd3 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\GeneratedUrl;
-use Drupal\Core\Routing\RouteMatch;
+use Drupal\Component\Routing\RouteMatch;
 use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;