diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 8759155..4ac6554 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -60,11 +60,11 @@ function action_menu() {
  * Implements hook_default_menu_links().
  */
 function action_default_menu_links() {
-  $links['admin.config.system.actions'] = array(
+  $links['action.admin.actions'] = array(
     'link_title' => 'Actions',
     'description' => 'Manage the actions defined for your site.',
     'route_name' => 'action.admin',
-    'parent' => 'admin.config.system',
+    'parent' => 'system.admin.config.system',
   );
 
   return $links;
diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module
index 5e0e30b..68c68ff 100644
--- a/core/modules/ban/ban.module
+++ b/core/modules/ban/ban.module
@@ -58,12 +58,12 @@ function ban_menu() {
  * Implements hook_default_menu_links().
  */
 function ban_default_menu_links() {
-  $links['admin.config.people.ban'] = array(
+  $links['ban.admin.config.people'] = array(
     'link_title' => 'IP address bans',
     'description' => 'Manage banned IP addresses.',
     'route_name' => 'ban.admin_page',
     'weight' => 10,
-    'parent' => 'admin.config.people',
+    'parent' => 'user.admin.config.people',
   );
 
   return $links;
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index db07a89..61c0286 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -120,9 +120,9 @@ function block_menu() {
  * Implements hook_default_menu_links().
  */
 function block_default_menu_links() {
-  $links['admin.structure.block'] = array(
+  $links['block.admin.structure'] = array(
     'link_title' => 'Blocks',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Configure what block content appears in your site\'s sidebars and other regions.',
     'route_name' => 'block.admin_display',
   );
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 935bc0b..31afbdb 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -184,10 +184,10 @@ function book_menu() {
  * Implements hook_default_menu_links().
  */
 function book_default_menu_links() {
-  $links['admin.structure.book'] = array(
+  $links['book.admin.outlines'] = array(
     'link_title' => 'Books',
     'description' => "Manage your site's book outlines.",
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'route_name' => 'book.admin',
   );
   $links['book'] = array(
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index d2917cc..8184229 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -206,10 +206,10 @@ function comment_menu() {
  * Implements hook_default_menu_links().
  */
 function comment_default_menu_links() {
-  $links['admin.content.comment'] = array(
+  $links['comment.admin.content'] = array(
     'link_title' => 'Comments',
     'route_name' => 'comment.admin',
-    'parent' => 'admin.content',
+    'parent' => 'system.admin.content',
     'description' => 'List and edit site comments and the comment approval queue.',
   );
 
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index aee4c8d..485c87f 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -74,11 +74,11 @@ function config_menu() {
  * Implements hook_default_menu_links().
  */
 function config_default_menu_links() {
-  $links['admin.config.development.configuration'] = array(
+  $links['config.admin.management'] = array(
     'link_title' => 'Configuration management',
     'description' => 'Import, export, or synchronize your site configuration.',
     'route_name' => 'config.sync',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
   );
 
   return $links;
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index fa2bd53..b9a2983 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -49,9 +49,9 @@ function config_translation_menu() {
  * Implements hook_default_menu_links().
  */
 function config_translation_default_menu_links() {
-  $links['admin.config.regional.config-translation'] = array(
+  $links['config_translation.admin.config-translation'] = array(
     'link_title' => 'Configuration translation',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'description' => 'Translate the configuration.',
     'route_name' => 'config_translation.mapper_list',
     'weight' => 30,
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index e566f22..1a5c1c6 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -83,9 +83,9 @@ function contact_menu() {
  * Implements hook_default_menu_links().
  */
 function contact_default_menu_links() {
-  $links['admin.structure.contact'] = array(
+  $links['contact.admin.categories'] = array(
     'link_title' => 'Contact form categories',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Create a system contact form and set up categories for the form to use.',
     'route_name' => 'contact.category_list',
   );
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index 3abe865..44362d5 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -76,32 +76,32 @@ function dblog_menu() {
  * Implements hook_default_menu_links().
  */
 function dblog_default_menu_links() {
-  $links['admin.reports.dblog'] = array(
+  $links['dblog.admin.reports.dblog'] = array(
     'link_title' => 'Recent log messages',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
     'description' => 'View events that have recently been logged.',
     'route_name' => 'dblog.overview',
     'weight' => -1,
   );
-  $links['admin.reports.page-not-found'] = array(
+  $links['dblog.admin.reports.page-not-found'] = array(
     'link_title' => "Top 'page not found' errors",
     'route_name' => 'dblog.page_not_found',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
     'description' => "View 'page not found' errors (404s).",
   );
-  $links['admin.reports.access-denied'] = array(
+  $links['dblog.admin.reports.access-denied'] = array(
     'link_title' => "Top 'access denied' errors",
     'route_name' => 'dblog.access_denied',
     'description' => "View 'access denied' errors (403s).",
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
   );
 
   if (\Drupal::moduleHandler()->moduleExists('search')) {
-    $links['admin.reports.search'] = array(
+    $links['dblog.admin.reports.search'] = array(
       'link_title' => 'Top search phrases',
       'route_name' => 'dblog.search',
       'description' => 'View most popular search phrases.',
-      'parent' => 'admin.reports',
+      'parent' => 'system.admin.reports',
     );
   }
 
diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index 00b6dd7..affee5c 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -99,11 +99,11 @@ function entity_menu() {
  * Implements hook_default_menu_links().
  */
 function entity_default_menu_links() {
-  $links['admin.structure.display_modes'] = array(
+  $links['entity.admin.structure.display_modes'] = array(
     'link_title' => 'Display modes',
     'description' => 'Configure what displays are available for your content and forms.',
     'route_name' => 'entity.display_mode',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
   );
 
   // View modes.
@@ -111,15 +111,15 @@ function entity_default_menu_links() {
     'link_title' => 'View modes',
     'description' => 'Manage custom view modes.',
     'route_name' => 'entity.view_mode_list',
-    'parent' => 'admin.structure.display_modes',
+    'parent' => 'entity.admin.structure.display_modes',
   );
 
   // Form modes.
-  $links['admin.structure.display_modes.form'] = array(
+  $links['entity.admin.structure.display_modes.form'] = array(
     'link_title' => 'Form modes',
     'description' => 'Manage custom form modes.',
     'route_name' => 'entity.form_mode_list',
-    'parent' => 'admin.structure.display_modes',
+    'parent' => 'entity.admin.structure.display_modes',
   );
 
   return $links;
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index e07f63f..01e205b 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -69,11 +69,11 @@ function field_ui_menu() {
  * Implements hook_default_menu_links().
  */
 function field_ui_default_menu_links() {
-  $links['admin.reports.fields'] = array(
+  $links['field_ui.admin.reports.fields'] = array(
     'link_title' => 'Field list',
     'description' => 'Overview of fields on all entity types.',
     'route_name' => 'field_ui.list',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
   );
 
   return $links;
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 0b37395..cfad82f 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -158,9 +158,9 @@ function filter_default_menu_links() {
     'route_name' => 'filter.tips_all',
   );
 
-  $links['admin.config.content.formats'] = array(
+  $links['filter.admin.formats'] = array(
     'link_title' => 'Text formats',
-    'parent' => 'admin.config.content',
+    'parent' => 'system.admin.config.content',
     'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.',
     'route_name' => 'filter.admin_overview',
   );
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index e59162f..9078a8f 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -140,9 +140,9 @@ function forum_default_menu_links() {
     'route_name' => 'forum.index',
     'menu_name' => 'tools',
   );
-  $items['admin.structure.forum'] = array(
+  $items['forum.admin.overview'] = array(
     'link_title' => 'Forums',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Control forum hierarchy settings.',
     'route_name' => 'forum.overview',
   );
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 4388d94..570a5c2 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -28,12 +28,12 @@ function help_menu() {
  * Implements hook_default_menu_links().
  */
 function help_default_menu_links() {
-  $links['admin.help'] = array(
+  $links['help.main'] = array(
     'link_title' => 'Help',
     'description' => 'Reference for usage, configuration, and modules.',
     'route_name' => 'help.main',
     'weight' => 9,
-    'parent' => 'admin',
+    'parent' => 'system.admin',
   );
 
   return $links;
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 402da43..53aa371 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -123,10 +123,10 @@ function image_menu() {
  * Implements hook_default_menu_links().
  */
 function image_default_menu_links() {
-  $links['admin.config.media.image-styles'] = array(
+  $links['image.admin.media.image-styles'] = array(
     'link_title' => 'Image styles',
     'description' => 'Configure styles that can be used for resizing or adjusting images on display.',
-    'parent' => 'admin.config.media',
+    'parent' => 'system.admin.config.media',
     'route_name' => 'image.style_list',
   );
 
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 07e2376..81cc508 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -90,19 +90,19 @@ function language_menu() {
  */
 function language_default_menu_links() {
   // Base language management and configuration.
-  $links['admin.config.regional.language.admin_overview'] = array(
+  $links['language.admin.language.admin_overview'] = array(
     'link_title' => 'Languages',
     'description' => 'Configure languages for content and the user interface.',
     'route_name' => 'language.admin_overview',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'weight' => 0,
   );
   // Content language settings.
-  $links['admin.config.regional.language.content_settings_page'] = array(
+  $links['language.admin.language.content_settings_page'] = array(
     'link_title' => 'Content language',
     'description' => 'Configure language support for content.',
     'route_name' => 'language.content_settings_page',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'weight' => 0,
   );
 
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index d3950ad..cd70c2b 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -191,19 +191,19 @@ function locale_menu() {
  */
 function locale_default_menu_links() {
   // Translation functionality.
-  $links['admin.config.regional.translate'] = array(
+  $links['locale.admin.config.regional.translate'] = array(
     'link_title' => 'User interface translation',
     'description' => 'Translate the built-in user interface.',
     'route_name' => 'locale.translate_page',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'weight' => 15,
   );
 
-  $links['admin.reports.translations'] = array(
+  $links['locale.admin.reports.translations'] = array(
     'link_title' => 'Available translation updates',
     'route_name' => 'locale.translate_status',
     'description' => 'Get a status report about available interface translations for your installed modules and themes.',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
   );
 
   return $links;
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 926ab94..a5d0c75 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -96,11 +96,11 @@ function menu_menu() {
  * Implements hook_default_menu_links().
  */
 function menu_default_menu_links() {
-  $links['admin.structure.menu'] = array(
+  $links['menu.admin.overview'] = array(
     'link_title' => 'Menus',
     'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.',
     'route_name' => 'menu.overview_page',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
   );
   return $links;
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 59bd42a..ba0c9bf 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -986,16 +986,16 @@ function node_menu() {
  * Implements hook_default_menu_links().
  */
 function node_default_menu_links() {
-  $links['admin.content'] = array(
+  $links['node.admin.content'] = array(
     'link_title' => 'Content',
     'route_name' => 'node.content_overview',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'description' => 'Find and manage content.',
   );
 
-  $links['admin.structure.types'] = array(
+  $links['node.admin.structure.types'] = array(
     'link_title' => 'Content types',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.',
     'route_name' => 'node.overview_types',
   );
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 052ddf0..61ab5c7 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -79,11 +79,11 @@ function path_menu() {
  * Implements hook_default_menu_links().
  */
 function path_default_menu_links() {
-  $links['admin.config.search.path'] = array(
+  $links['path.admin.overview'] = array(
     'link_title' => 'URL aliases',
     'description' => "Change your site's URL paths by aliasing them.",
     'route_name' => 'path.admin_overview',
-    'parent' => 'admin.config.search',
+    'parent' => 'system.admin.config.search',
     'weight' => -5,
   );
 
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index 3c63742..f323fb3 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -75,12 +75,12 @@ function picture_menu() {
  * Implements hook_default_menu_links().
  */
 function picture_default_menu_links() {
-  $links['admin.config.media.picturemapping'] = array(
+  $links['picture.admin.config.picturemapping'] = array(
     'link_title' => 'Picture Mappings',
     'description' => 'Manage picture mappings',
     'weight' => 10,
     'route_name' => 'picture.mapping_page',
-    'parent' => 'admin.config.media',
+    'parent' => 'system.admin.config.media',
   );
 
   return $links;
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 4babd24..7f54f96 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -176,9 +176,9 @@ function search_default_menu_links() {
     'route_name' => 'search.view',
     'type' => MENU_SUGGESTED_ITEM,
   );
-  $links['admin.config.search.settings'] = array(
+  $links['search.admin.settings'] = array(
     'link_title' => 'Search settings',
-    'parent' => 'admin.config.search',
+    'parent' => 'system.admin.config.search',
     'description' => 'Configure relevance settings for search and other indexing options.',
     'route_name' => 'search.settings',
     'weight' => -10,
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index dc6bd6f..614bfb3 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -90,11 +90,11 @@ function shortcut_menu() {
  * Implements hook_default_menu_links().
  */
 function shortcut_default_menu_links() {
-  $links['admin.config.user-interface.shortcut'] = array(
+  $links['shortcut.admin.config.user-interface.shortcut'] = array(
     'link_title' => 'Shortcuts',
     'description' => 'Add and modify shortcut sets.',
     'route_name' => 'shortcut.set_admin',
-    'parent' => 'admin.config.user-interface',
+    'parent' => 'system.admin.config.user-interface',
   );
 
   return $links;
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 64ca620..55c5067 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -50,11 +50,11 @@ function simpletest_menu() {
  * Implements hook_default_menu_links().
  */
 function simpletest_default_menu_links() {
-  $links['admin.config.development.testing'] = array(
+  $links['simpletest.admin.config.development.testing'] = array(
     'link_title' => 'Testing',
     'description' => 'Run tests against Drupal core and your modules. These tests help assure that your site code is working as designed.',
     'route_name' => 'simpletest.test_form',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
     'weight' => -5,
   );
 
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 523ee70..20e0032 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -95,11 +95,11 @@ function statistics_menu() {
  * Implements hook_default_menu_links().
  */
 function statistics_default_menu_links() {
-  $links['admin.config.system.statistics'] = array(
+  $links['statistics.admin.config.system.statistics'] = array(
     'link_title' => 'Statistics',
     'description' => 'Control details about what and how your site logs content statistics.',
     'route_name' => 'statistics.settings',
-    'parent' => 'admin.config.system',
+    'parent' => 'system.admin.config.system',
     'weight' => -15,
   );
   return $links;
diff --git a/core/modules/system/lib/Drupal/system/SystemManager.php b/core/modules/system/lib/Drupal/system/SystemManager.php
index 1fa6246..fd8f77e 100644
--- a/core/modules/system/lib/Drupal/system/SystemManager.php
+++ b/core/modules/system/lib/Drupal/system/SystemManager.php
@@ -195,9 +195,14 @@ public function getAdminBlock($item) {
 
     if (!isset($item['mlid'])) {
       $menu_links = $this->menuLinkStorage->loadByProperties(array('link_path' => $item['path'], 'module' => 'system'));
-      $menu_link = reset($menu_links);
-      $item['mlid'] = $menu_link->id();
-      $item['menu_name'] = $menu_link->menu_name;
+      if ($menu_links) {
+        $menu_link = reset($menu_links);
+        $item['mlid'] = $menu_link->id();
+        $item['menu_name'] = $menu_link->menu_name;
+      }
+      else {
+        return array();
+      }
     }
 
     if (isset($this->menuItems[$item['mlid']])) {
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 82399d4..5e3ff57 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -498,6 +498,7 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) {
  *   - link_title: (required) The untranslated title of the menu item.
  *   - description: The untranslated description of the link.
  *   - route_name: (optional) The route name to be used to build the path.
+ *     Either a route_name or a link_path must be provided.
  *   - route_parameters: (optional) The route parameters to build the path.
  *   - link_path: (optional) If you have an external link use link_path instead
  *     of providing a route_name.
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index f9238e1..2ca1213 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -821,7 +821,7 @@ function system_menu() {
  * Implements hook_default_menu_links().
  */
 function system_default_menu_links() {
-  $items['admin'] = array(
+  $items['system.admin'] = array(
     'link_title' => 'Administration',
     'route_name' => 'system.admin',
     'weight' => 9,
@@ -829,188 +829,188 @@ function system_default_menu_links() {
   );
 
   // Menu items that are basically just menu blocks.
-  $items['admin.structure'] = array(
+  $items['system.admin.structure'] = array(
     'route_name' => 'system.admin_structure',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'description' => 'Administer blocks, content types, menus, etc.',
     'link_title' => 'Structure',
     'weight' => -8,
   );
   // Appearance.
-  $items['admin.appearance'] = array(
+  $items['system.admin.appearance'] = array(
     'route_name' => 'system.themes_page',
     'link_title' => 'Appearance',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'weight' => -6,
   );
   // Modules.
-  $items['admin.modules'] = array(
+  $items['system.admin.modules'] = array(
     'link_title' => 'Extend',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'route_name' => 'system.modules_list',
     'weight' => -2,
   );
   // Configuration.
-  $items['admin.config'] = array(
+  $items['system.admin.config'] = array(
     'link_title' => 'Configuration',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'description' => 'Administer settings.',
     'route_name' => 'system.admin_config',
   );
 
   // Media settings.
-  $items['admin.config.media'] = array(
+  $items['system.admin.config.media'] = array(
     'route_name' => 'system.admin_config_media',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'link_title' => 'Media',
     'weight' => -10,
   );
-  $items['admin.config.media.file-system'] = array(
+  $items['system.admin.config.media.file-system'] = array(
     'link_title' => 'File system',
     'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
-    'parent' => 'admin.config.media',
+    'parent' => 'system.admin.config.media',
     'route_name' => 'system.file_system_settings',
   );
-  $items['admin.config.media.image-toolkit'] = array(
+  $items['system.admin.config.media.image-toolkit'] = array(
     'link_title' => 'Image toolkit',
-    'parent' => 'admin.config.media',
+    'parent' => 'system.admin.config.media',
     'route_name' => 'system.image_toolkit_settings',
     'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
     'weight' => 20,
   );
 
   // Service settings.
-  $items['admin.config.services'] = array(
+  $items['system.admin.config.services'] = array(
     'link_title' => 'Web services',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'route_name' => 'system.admin_config_services',
     'weight' => 0,
   );
-  $items['admin.config.services.rss-publishing'] = array(
+  $items['system.admin.config.services.rss-publishing'] = array(
     'link_title' => 'RSS publishing',
-    'parent' => 'admin.config.services',
+    'parent' => 'system.admin.config.services',
     'description' => 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.',
     'route_name' => 'system.rss_feeds_settings',
   );
 
   // Development settings.
-  $items['admin.config.development'] = array(
+  $items['system.admin.config.development'] = array(
     'route_name' => 'system.admin_config_development',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'link_title' => 'Development',
     'description' => 'Development tools.',
     'weight' => -10,
   );
-  $items['admin.config.development.maintenance'] = array(
+  $items['system.admin.config.development.maintenance'] = array(
     'link_title' => 'Maintenance mode',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
     'description' => 'Take the site offline for maintenance or bring it back online.',
     'route_name' => 'system.site_maintenance_mode',
     'weight' => -10,
   );
-  $items['admin.config.development.performance'] = array(
+  $items['system.admin.config.development.performance'] = array(
     'link_title' => 'Performance',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
     'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
     'route_name' => 'system.performance_settings',
     'weight' => -20,
   );
-  $items['admin.config.development.logging'] = array(
+  $items['system.admin.config.development.logging'] = array(
     'link_title' => 'Logging and errors',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
     'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.",
     'route_name' => 'system.logging_settings',
     'weight' => -15,
   );
 
   // Regional and date settings.
-  $items['admin.config.regional'] = array(
+  $items['system.admin.config.regional'] = array(
     'route_name' => 'system.admin_config_regional',
     'link_title' => 'Regional and language',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'description' => 'Regional settings, localization and translation.',
     'weight' => -5,
   );
-  $items['admin.config.regional.settings'] = array(
+  $items['system.admin.config.regional.settings'] = array(
     'link_title' => 'Regional settings',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'description' => "Settings for the site's default time zone and country.",
     'route_name' => 'system.regional_settings',
     'weight' => -20,
   );
-  $items['admin.config.regional.date-time'] = array(
+  $items['system.admin.config.regional.date-time'] = array(
     'link_title' => 'Date and time formats',
-    'parent' => 'admin.config.regional',
+    'parent' => 'system.admin.config.regional',
     'description' => 'Configure display format strings for date and time.',
     'route_name' => 'system.date_format_list',
     'weight' => -9,
   );
 
   // Search settings.
-  $items['admin.config.search'] = array(
+  $items['system.admin.config.search'] = array(
     'link_title' => 'Search and metadata',
     'route_name' => 'system.admin_config_search',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'description' => 'Local site search, metadata and SEO.',
     'weight' => -10,
   );
 
   // System settings.
-  $items['admin.config.system'] = array(
+  $items['system.admin.config.system'] = array(
     'link_title' => 'System',
-    'link_path' => 'admin/config/system',
-    'parent' => 'admin.config',
+    'route_name' => 'system.admin_config_system',
+    'parent' => 'system.admin.config',
     'description' => 'General system related configuration.',
     'weight' => -20,
   );
-  $items['admin.config.system.site-information'] = array(
+  $items['system.admin.config.system.site-information'] = array(
     'link_title' => 'Site information',
-    'parent' => 'admin.config.system',
+    'parent' => 'system.admin.config.system',
     'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.',
     'route_name' => 'system.site_information_settings',
     'weight' => -20,
   );
-  $items['admin.config.system.cron'] = array(
+  $items['system.admin.config.system.cron'] = array(
     'link_title' => 'Cron',
-    'parent' => 'admin.config.system',
+    'parent' => 'system.admin.config.system',
     'description' => 'Manage automatic site maintenance tasks.',
     'route_name' => 'system.cron_settings',
     'weight' => 20,
   );
   // Additional categories
-  $items['admin.config.user-interface'] = array(
+  $items['system.admin.config.user-interface'] = array(
     'link_title' => 'User interface',
     'route_name' => 'system.admin_config_ui',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'description' => 'Tools that enhance the user interface.',
     'weight' => -15,
   );
-  $items['admin.config.workflow'] = array(
+  $items['system.admin.config.workflow'] = array(
     'link_title' => 'Workflow',
     'route_name' => 'system.admin_config_workflow',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'description' => 'Content workflow, editorial workflow tools.',
     'weight' => 5,
   );
-  $items['admin.config.content'] = array(
+  $items['system.admin.config.content'] = array(
     'link_title' => 'Content authoring',
     'route_name' => 'system.admin_config_content',
-    'parent' => 'admin.config',
+    'parent' => 'system.admin.config',
     'description' => 'Settings related to formatting and authoring content.',
     'weight' => -15,
   );
 
   // Reports.
-  $items['admin.reports'] = array(
+  $items['system.admin.reports'] = array(
     'link_title' => 'Reports',
     'route_name' => 'system.admin_reports',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'description' => 'View reports, updates, and errors.',
     'weight' => 5,
   );
-  $items['admin.reports.status'] = array(
+  $items['system.admin.reports.status'] = array(
     'link_title' => 'Status report',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
     'description' => "Get a status report about your site's operation and any detected problems.",
     'route_name' => 'system.status',
   );
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module
index f8d17fe..cd3c853 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -385,7 +385,7 @@ function menu_test_default_menu_links() {
     'link_title' => 'Menu trail - Case 2',
     'description' => 'Tests menu_tree_set_path()',
     'route_name' => 'menu_test.menu_trail_admin',
-    'parent' => 'admin.config.development',
+    'parent' => 'system.admin.config.development',
   );
   $items['menu_test.custom-403-page'] = array(
     'link_title' => 'Custom 403 page',
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index b38e3f5..5e6c05b 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -265,9 +265,9 @@ function taxonomy_menu() {
  * Implements hook_default_menu_links().
  */
 function taxonomy_default_menu_links() {
-  $links['admin.structure.taxonomy'] = array(
+  $links['taxonomy.admin.structure.vocabulary'] = array(
     'link_title' => 'Taxonomy',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Manage tagging, categorization, and classification of your content.',
     'route_name' => 'taxonomy.vocabulary_list',
   );
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 7670655..1976e76 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -181,11 +181,11 @@ function update_menu() {
  * Implements hook_default_menu_links().
  */
 function update_default_menu_links() {
-  $links['admin.reports.updates'] = array(
+  $links['update.admin.reports.updates'] = array(
     'link_title' => 'Available updates',
     'description' => 'Get a status report about available updates for your installed modules and themes.',
     'route_name' => 'update.status',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
     'weight' => -50,
   );
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 01acfb0..355e018 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -809,34 +809,34 @@ function user_default_menu_links() {
   );
 
   // User listing pages.
-  $links['admin.people'] = array(
+  $links['user.admin.people'] = array(
     'link_title' => 'People',
     'route_name' => 'user.admin_account',
     'description' => 'Manage user accounts, roles, and permissions.',
-    'parent' => 'admin',
+    'parent' => 'system.admin',
     'weight' => -4,
   );
   // Permissions and role forms.
-  $links['admin.people.permissions'] = array(
+  $links['user.admin.people.permissions'] = array(
     'link_title' => 'Permissions',
-    'parent' => 'admin.people',
+    'parent' => 'user.admin.people',
     'description' => 'Determine access to features by selecting permissions for roles.',
     'route_name' => 'user.admin_permissions',
   );
 
   // Administration pages.
-  $links['admin.config.people'] = array(
+  $links['user.admin.config.people'] = array(
    'link_title' => 'People',
    'route_name' => 'user.admin_index',
-   'parent' => 'admin.config',
+   'parent' => 'system.admin.config',
    'description' => 'Configure user accounts.',
    'position' => 'left',
    'weight' => -20,
   );
 
-  $links['admin.config.people.accounts'] = array(
+  $links['user.admin.config.people.accounts'] = array(
     'link_title' => 'Account settings',
-    'parent' => 'admin.config.people',
+    'parent' => 'user.admin.config.people',
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.',
     'weight' => -10,
     'route_name' => 'user.account_settings',
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 175f4d9..b9e27ff 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -1533,8 +1533,7 @@ public function executeHookMenu($display_id = NULL, &$callbacks = array()) {
   }
 
   /**
-   * Returns default menu links information from the view and the named display
-   * handler.
+   * Returns default menu links from the view and the named display handler.
    *
    * @param string $display_id
    *   A display ID.
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 8476d06..463e4c4 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -67,17 +67,17 @@ function views_ui_default_menu_links() {
   $links = array();
 
   // Top-level Views module pages (not tied to a particular View).
-  $links['admin.structure.views'] = array(
+  $links['views_ui.admin.structure.views'] = array(
     'link_title' => 'Views',
-    'parent' => 'admin.structure',
+    'parent' => 'system.admin.structure',
     'description' => 'Manage customized lists of content.',
     'route_name' => 'views_ui.list',
   );
 
   // A page in the Reports section to show usage of plugins in all views.
-  $links['admin.reports.views-plugins'] = array(
+  $links['views_ui.admin.reports.views-plugins'] = array(
     'link_title' => 'Views plugins',
-    'parent' => 'admin.reports',
+    'parent' => 'system.admin.reports',
     'description' => 'Overview of plugins used in all views.',
     'route_name' => 'views_ui.reports_plugins',
   );