diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php b/core/modules/toolbar/lib/Drupal/toolbar/Controller/ToolbarController.php
similarity index 91%
rename from core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php
rename to core/modules/toolbar/lib/Drupal/toolbar/Controller/ToolbarController.php
index 3a7eb3c0d83..d5fc878caf7 100644
--- a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php
+++ b/core/modules/toolbar/lib/Drupal/toolbar/Controller/ToolbarController.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\toolbar\Routing\ToolbarController.
+ * Contains \Drupal\toolbar\Controller\ToolbarController.
  */
 
-namespace Drupal\toolbar\Routing;
+namespace Drupal\toolbar\Controller;
 
 use Drupal\Core\Access\AccessInterface;
 use Drupal\Core\Controller\ControllerBase;
diff --git a/core/modules/toolbar/toolbar.routing.yml b/core/modules/toolbar/toolbar.routing.yml
index a4aabb1c05c..2e1e4cd5bd7 100644
--- a/core/modules/toolbar/toolbar.routing.yml
+++ b/core/modules/toolbar/toolbar.routing.yml
@@ -1,6 +1,6 @@
 toolbar.subtrees:
   path: '/toolbar/subtrees/{hash}'
   defaults:
-    _controller: '\Drupal\toolbar\Routing\ToolbarController::subtreesJsonp'
+    _controller: '\Drupal\toolbar\Controller\ToolbarController::subtreesJsonp'
   requirements:
     _custom_access: '\Drupal\toolbar\Routing\ToolbarController::checkSubTreeAccess'