diff --git a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml
index dff02c6..1c377e0 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.routing.yml
@@ -1,4 +1,4 @@
-aggregator_test_feed:
+aggregator_test.feed:
   pattern: '/aggregator/test-feed/{use_last_modified}/{use_etag}'
   defaults:
     _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testFeed'
@@ -8,7 +8,7 @@ aggregator_test_feed:
   requirements:
     _permission: 'access content'
 
-aggregator_redirect:
+aggregator_test.redirect:
   pattern: '/aggregator/redirect'
   defaults:
     _controller: '\Drupal\aggregator_test\Controller\AggregatorTestRssController::testRedirect'
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php
index 6c2b1cd..28d024b 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Controller/AggregatorTestRssController.php
@@ -74,7 +74,7 @@ public function testFeed($use_last_modified, $use_etag, Request $request) {
    *   A response that redirects users to the test feed.
    */
   public function testRedirect() {
-    return $this->redirect('aggregator_test_feed', array(), 301);
+    return $this->redirect('aggregator_test.feed', array(), 301);
   }
 
 }
diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml
index a815a57..733ae8c 100644
--- a/core/modules/book/book.routing.yml
+++ b/core/modules/book/book.routing.yml
@@ -39,7 +39,7 @@ book.outline:
     _permission: 'administer book outlines'
     _entity_access: 'node.view'
 
-book_admin_edit:
+book.admin_edit:
   pattern: '/admin/structure/book/{node}'
   defaults:
     _form: 'Drupal\book\Form\BookAdminEditForm'
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 7764d91..d31cd3c2 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -893,7 +893,7 @@ function system_menu() {
 
   // Default page for batch operations.
   $items['batch'] = array(
-    'route_name' => 'system_batch_page',
+    'route_name' => 'system.batch_page',
     'theme callback' => '_system_batch_theme',
     'type' => MENU_CALLBACK,
   );
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 03b182b..f8eed28 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -320,7 +320,7 @@ system.admin_config:
   requirements:
     _permission: 'access administration pages'
 
-system_batch_page:
+system.batch_page:
   pattern: '/batch'
   defaults:
     _controller: '\Drupal\system\Controller\BatchController::batchPage'
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module
index cc1c715..f2b5440 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -44,31 +44,31 @@ function batch_test_menu() {
   // Programmatic form: the page submits the 'Chained' form through
   // drupal_form_submit().
   $items['batch-test/programmatic'] = array(
-    'route_name' => 'batch_test_programmatic',
+    'route_name' => 'batch_test.programmatic',
     'type' => MENU_LOCAL_TASK,
     'weight' => 3,
   );
   // No form: fire a batch simply by accessing a page.
   $items['batch-test/no-form'] = array(
-    'route_name' => 'batch_test_no_form',
+    'route_name' => 'batch_test.no_form',
     'type' => MENU_LOCAL_TASK,
     'weight' => 4,
   );
   // No form: fire a batch; return > 100% complete
   $items['batch-test/large-percentage'] = array(
-    'route_name' => 'batch_test_large_percentage',
+    'route_name' => 'batch_test.large_percentage',
     'type' => MENU_LOCAL_TASK,
     'weight' => 5,
   );
   // Tests programmatic form submission within a batch operation.
   $items['batch-test/nested-programmatic'] = array(
-    'route_name' => 'batch_test_nested_programmatic',
+    'route_name' => 'batch_test.nested_programmatic',
     'type' => MENU_LOCAL_TASK,
     'weight' => 6,
   );
   // Landing page to test redirects.
   $items['batch-test/redirect'] = array(
-    'route_name' => 'batch_test_redirect',
+    'route_name' => 'batch_test.redirect',
     'type' => MENU_LOCAL_TASK,
     'weight' => 7,
   );
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
index da1418c..b199525 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
+++ b/core/modules/system/tests/modules/batch_test/batch_test.routing.yml
@@ -1,4 +1,4 @@
-batch_test_redirect:
+batch_test.redirect:
   pattern: '/batch-test/redirect'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testRedirect'
@@ -6,7 +6,7 @@ batch_test_redirect:
   requirements:
     _access:  'TRUE'
 
-batch_test_large_percentage:
+batch_test.large_percentage:
   pattern: '/batch-test/large-percentage'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testLargePercentage'
@@ -14,7 +14,7 @@ batch_test_large_percentage:
   requirements:
     _access:  'TRUE'
 
-batch_test_nested_programmatic:
+batch_test.nested_programmatic:
   pattern: '/batch-test/nested-programmatic/{value}'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testNestedDrupalFormSubmit'
@@ -23,7 +23,7 @@ batch_test_nested_programmatic:
   requirements:
     _access: 'TRUE'
 
-batch_test_no_form:
+batch_test.no_form:
   pattern: '/batch-test/no-form'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testNoForm'
@@ -31,7 +31,7 @@ batch_test_no_form:
   requirements:
     _access: 'TRUE'
 
-batch_test_programmatic:
+batch_test.programmatic:
   pattern: '/batch-test/programmatic/{value}'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testProgrammatic'
@@ -40,7 +40,7 @@ batch_test_programmatic:
   requirements:
     _access: 'TRUE'
 
-batch_test_test_theme:
+batch_test.test_theme:
   pattern: '/admin/batch-test/test-theme'
   defaults:
     _content: '\Drupal\batch_test\Controller\BatchTestController::testThemeBatch'
diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.module b/core/modules/system/tests/modules/plugin_test/plugin_test.module
index 036cd97..6a33894 100644
--- a/core/modules/system/tests/modules/plugin_test/plugin_test.module
+++ b/core/modules/system/tests/modules/plugin_test/plugin_test.module
@@ -21,7 +21,7 @@ function plugin_test_plugin_test_alter(&$definitions) {
 function plugin_test_menu() {
   $items = array();
   $items['plugin_definition_test'] = array(
-    'route_name' => 'plugin_test_definitions',
+    'route_name' => 'plugin_test.definition',
   );
   return $items;
 }
diff --git a/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml b/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml
index 16f05a9..86398b5 100644
--- a/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml
+++ b/core/modules/system/tests/modules/plugin_test/plugin_test.routing.yml
@@ -1,4 +1,4 @@
-plugin_definition_test:
+plugin_test.definition:
   pattern: '/plugin_definition_test'
   defaults:
     _content: '\Drupal\plugin_test\Controller\PluginTest::testDefinitions'