diff --git a/core/lib/Drupal/Core/Routing/RouteBuilder.php b/core/lib/Drupal/Core/Routing/RouteBuilder.php
index a25103d..86b0b46 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilder.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilder.php
@@ -84,7 +84,7 @@ public function rebuild() {
 
     $yaml_discovery = new YamlDiscovery('routing', $this->moduleHandler->getModuleDirectories());
 
-    foreach ($yaml_discovery->findAll() as $module => $routes) {
+    foreach ($yaml_discovery->findAll() as $provider => $routes) {
       $collection = new RouteCollection();
 
       foreach ($routes as $name => $route_info) {
@@ -98,9 +98,9 @@ public function rebuild() {
         $collection->add($name, $route);
       }
 
-      $this->dispatcher->dispatch(RoutingEvents::ALTER, new RouteBuildEvent($collection, $module));
+      $this->dispatcher->dispatch(RoutingEvents::ALTER, new RouteBuildEvent($collection, $provider));
       $this->dumper->addRoutes($collection);
-      $this->dumper->dump(array('provider' => $module));
+      $this->dumper->dump(array('provider' => $provider));
     }
 
     // Now allow modules to register additional, dynamic routes.
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 0d2dbeb..c859a23 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -962,8 +962,8 @@ function system_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'route_set' => array(
-        'description' => 'The route set grouping to which a route belongs.',
+      'provider' => array(
+        'description' => 'The provider grouping to which a route belongs.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
@@ -989,7 +989,7 @@ function system_schema() {
     ),
     'indexes' => array(
       'pattern_outline_fit' => array('pattern_outline', 'fit'),
-      'route_set' => array('route_set'),
+      'provider' => array('provider'),
     ),
     'primary key' => array('name'),
   );
@@ -1620,8 +1620,8 @@ function system_update_8022() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'route_set' => array(
-        'description' => 'The route set grouping to which a route belongs.',
+      'provider' => array(
+        'description' => 'The provider grouping to which a route belongs.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
@@ -1647,7 +1647,7 @@ function system_update_8022() {
     ),
     'indexes' => array(
       'pattern_outline_fit' => array('pattern_outline', 'fit'),
-      'route_set' => array('route_set'),
+      'provider' => array('provider'),
     ),
     'primary key' => array('name'),
   );