diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index ee2f628..b41a09c 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -48,7 +48,7 @@ function action_permission() {
  * Implements hook_menu_link_defaults().
  */
 function action_menu_link_defaults() {
-  $links['action.admin.actions'] = array(
+  $links['action.admin'] = array(
     'link_title' => 'Actions',
     'description' => 'Manage the actions defined for your site.',
     'route_name' => 'action.admin',
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 78a8e17..3ab717d 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -96,10 +96,10 @@ function aggregator_menu_link_defaults() {
     'link_title' => 'Feed aggregator',
     'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.",
     'route_name' => 'aggregator.admin_overview',
-    'parent' => 'system.admin.config.services',
+    'parent' => 'system.admin_config_services',
     'weight' => 10,
   );
-  $links['aggregator'] = array(
+  $links['aggregator.page_last'] = array(
     'link_title' => 'Feed aggregator',
     'weight' => 5,
     'route_name' => 'aggregator.page_last',
diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module
index e45ed13..54bb4f9 100644
--- a/core/modules/ban/ban.module
+++ b/core/modules/ban/ban.module
@@ -41,7 +41,7 @@ function ban_permission() {
  * Implements hook_menu_link_defaults().
  */
 function ban_menu_link_defaults() {
-  $links['ban.admin.config.people'] = array(
+  $links['ban.admin_page'] = array(
     'link_title' => 'IP address bans',
     'description' => 'Manage banned IP addresses.',
     'route_name' => 'ban.admin_page',
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 6f341ad..5aa24df 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -96,7 +96,7 @@ function block_permission() {
  * Implements hook_menu_link_defaults().
  */
 function block_menu_link_defaults() {
-  $links['block.admin.structure'] = array(
+  $links['block.admin_display'] = array(
     'link_title' => 'Block layout',
     'parent' => 'system.admin.structure',
     'description' => 'Configure what block content appears in your site\'s sidebars and other regions.',
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index fd50c03..ed208eb 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -48,7 +48,7 @@ function custom_block_menu_link_defaults() {
   );
   $items['custom_block.list'] = array(
     'link_title' => 'Custom block library',
-    'parent' => 'block.admin.structure',
+    'parent' => 'block.admin_display',
     'description' => 'Manage custom blocks.',
   );
 
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 48c81d5..c34bb17 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -151,13 +151,13 @@ function book_node_links_alter(array &$node_links, NodeInterface $node, array &$
  * Implements hook_menu_link_defaults().
  */
 function book_menu_link_defaults() {
-  $links['book.admin.outlines'] = array(
+  $links['book.admin'] = array(
     'link_title' => 'Books',
     'description' => "Manage your site's book outlines.",
     'parent' => 'system.admin.structure',
     'route_name' => 'book.admin',
   );
-  $links['book'] = array(
+  $links['book.render'] = array(
     'link_title' => 'Books',
     'route_name' => 'book.render',
     // @todo what to do about MENU_SUGGESTED_ITEM, maybe specify no menu_name?
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 9af0246..5e6a0eb 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -168,10 +168,10 @@ function comment_theme() {
  * Implements hook_menu_link_defaults().
  */
 function comment_menu_link_defaults() {
-  $links['comment.admin.content.comment'] = array(
+  $links['comment.admin'] = array(
     'link_title' => 'Comments',
     'route_name' => 'comment.admin',
-    'parent' => \Drupal::moduleHandler()->moduleExists('node') ? 'node.admin.content' : 'system.admin',
+    'parent' => \Drupal::moduleHandler()->moduleExists('node') ? 'node.content_overview' : 'system.admin',
     'description' => 'List and edit site comments and the comment approval queue.',
   );
   $links['comment.admin.structure.comments'] = array(
@@ -188,9 +188,9 @@ function comment_menu_link_defaults() {
  * Implements hook_menu_link_defaults_alter()
  */
 function comment_menu_links_defaults_alter(&$links) {
-  if (isset($links['node.admin.content'])) {
+  if (isset($links['node.content_overview'])) {
     // Add comments to the description for admin/content if any.
-    $links['node.admin.content']['description'] = 'Administer content and comments.';
+    $links['node.content_overview']['description'] = 'Administer content and comments.';
   }
 }
 
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 776a9fc..87c0cab 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -61,7 +61,7 @@ function config_file_download($uri) {
  * Implements hook_menu_link_defaults().
  */
 function config_menu_link_defaults() {
-  $links['config.admin.management'] = array(
+  $links['config.sync'] = array(
     'link_title' => 'Configuration management',
     'description' => 'Import, export, or synchronize your site configuration.',
     'route_name' => 'config.sync',
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index 2204689..a3c0616 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -35,7 +35,7 @@ function config_translation_help($path) {
  * Implements hook_menu_link_defaults().
  */
 function config_translation_menu_link_defaults() {
-  $links['config_translation.admin.config-translation'] = array(
+  $links['config_translation.mapper_list'] = array(
     'link_title' => 'Configuration translation',
     'parent' => 'system.admin.config.regional',
     'description' => 'Translate the configuration.',
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index dc622ff..c40096b 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -55,7 +55,7 @@ function contact_permission() {
  * Implements hook_menu_link_defaults().
  */
 function contact_menu_link_defaults() {
-  $links['contact.admin.categories'] = array(
+  $links['contact.category_list'] = array(
     'link_title' => 'Contact form categories',
     'parent' => 'system.admin.structure',
     'description' => 'Create a system contact form and set up categories for the form to use.',
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index 33f0120..93cd282 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -39,20 +39,20 @@ function dblog_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function dblog_menu_link_defaults() {
-  $links['dblog.admin.reports.dblog'] = array(
+  $links['dblog.overview'] = array(
     'link_title' => 'Recent log messages',
     'parent' => 'system.admin.reports',
     'description' => 'View events that have recently been logged.',
     'route_name' => 'dblog.overview',
     'weight' => -1,
   );
-  $links['dblog.admin.reports.page-not-found'] = array(
+  $links['dblog.page_not_found'] = array(
     'link_title' => "Top 'page not found' errors",
     'route_name' => 'dblog.page_not_found',
     'parent' => 'system.admin.reports',
     'description' => "View 'page not found' errors (404s).",
   );
-  $links['dblog.admin.reports.access-denied'] = array(
+  $links['dblog.access_denied'] = array(
     'link_title' => "Top 'access denied' errors",
     'route_name' => 'dblog.access_denied',
     'description' => "View 'access denied' errors (403s).",
@@ -60,7 +60,7 @@ function dblog_menu_link_defaults() {
   );
 
   if (\Drupal::moduleHandler()->moduleExists('search')) {
-    $links['dblog.admin.reports.search'] = array(
+    $links['dblog.search'] = array(
       'link_title' => 'Top search phrases',
       'route_name' => 'dblog.search',
       'description' => 'View most popular search phrases.',
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index e3ff037..3b2911b 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -45,8 +45,8 @@ function editor_help($path, $arg) {
  * of text editors.
  */
 function editor_menu_link_defaults_alter(array &$links) {
-  $links['filter.admin.formats']['link_title'] = 'Text formats and editors';
-  $links['filter.admin.formats']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).';
+  $links['filter.admin_overview']['link_title'] = 'Text formats and editors';
+  $links['filter.admin_overview']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).';
 }
 
 /**
diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index de5b1b9..6ec27bc 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -48,7 +48,7 @@ function entity_permission() {
  * Implements hook_menu_link_defaults().
  */
 function entity_menu_link_defaults() {
-  $links['entity.admin.structure.display_modes'] = array(
+  $links['entity.display_mode'] = array(
     'link_title' => 'Display modes',
     'description' => 'Configure what displays are available for your content and forms.',
     'route_name' => 'entity.display_mode',
@@ -56,19 +56,19 @@ function entity_menu_link_defaults() {
   );
 
   // View modes.
-  $links['entity.admin.structure.display_modes.view'] = array(
+  $links['entity.view_mode_list'] = array(
     'link_title' => 'View modes',
     'description' => 'Manage custom view modes.',
     'route_name' => 'entity.view_mode_list',
-    'parent' => 'entity.admin.structure.display_modes',
+    'parent' => 'entity.display_mode',
   );
 
   // Form modes.
-  $links['entity.admin.structure.display_modes.form'] = array(
+  $links['entity.form_mode_list'] = array(
     'link_title' => 'Form modes',
     'description' => 'Manage custom form modes.',
     'route_name' => 'entity.form_mode_list',
-    'parent' => 'entity.admin.structure.display_modes',
+    'parent' => 'entity.display_mode',
   );
 
   return $links;
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index a08593a..6f2304d 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -56,7 +56,7 @@ function field_ui_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function field_ui_menu_link_defaults() {
-  $links['field_ui.admin.reports.fields'] = array(
+  $links['field_ui.list'] = array(
     'link_title' => 'Field list',
     'description' => 'Overview of fields on all entity types.',
     'route_name' => 'field_ui.list',
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 1e858ad..52a2a61 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -98,13 +98,13 @@ function filter_element_info() {
  * Implements hook_menu_link_defaults().
  */
 function filter_menu_link_defaults() {
-  $links['filter.tips'] = array(
+  $links['filter.tips_all'] = array(
     'link_title' => 'Compose tips',
     'type' => MENU_SUGGESTED_ITEM,
     'route_name' => 'filter.tips_all',
   );
 
-  $links['filter.admin.formats'] = array(
+  $links['filter.admin_overview'] = array(
     'link_title' => 'Text formats',
     '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.',
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index c728ad1..6a3142d 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -99,18 +99,18 @@ function forum_theme() {
  * Implements hook_menu_link_defaults().
  */
 function forum_menu_link_defaults() {
-  $items['forum'] = array(
+  $links['forum.index'] = array(
     'link_title' => 'Forums',
     'route_name' => 'forum.index',
     'menu_name' => 'tools',
   );
-  $items['forum.admin.overview'] = array(
+  $links['forum.overview'] = array(
     'link_title' => 'Forums',
     'parent' => 'system.admin.structure',
     'description' => 'Control forum hierarchy settings.',
     'route_name' => 'forum.overview',
   );
-  return $items;
+  return $links;
 }
 
 /**
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index c1420c1..b5243ea 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -87,7 +87,7 @@ function image_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function image_menu_link_defaults() {
-  $links['image.admin.media.image-styles'] = array(
+  $links['image.style_list'] = array(
     'link_title' => 'Image styles',
     'description' => 'Configure styles that can be used for resizing or adjusting images on display.',
     'parent' => 'system.admin.config.media',
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index f196969..a2dad19 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -73,14 +73,14 @@ function language_help($path, $arg) {
  */
 function language_menu_link_defaults() {
   // Base language management and configuration.
-  $links['language.admin.language.admin_overview'] = array(
+  $links['language.admin_overview'] = array(
     'link_title' => 'Languages',
     'description' => 'Configure languages for content and the user interface.',
     'route_name' => 'language.admin_overview',
     'parent' => 'system.admin.config.regional',
   );
   // Content language settings.
-  $links['language.admin.language.content_settings_page'] = array(
+  $links['language.content_settings_page'] = array(
     'link_title' => 'Content language',
     'description' => 'Configure language support for content.',
     'route_name' => 'language.content_settings_page',
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 324be33..a10a0f6 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -172,7 +172,7 @@ function locale_help($path, $arg) {
  */
 function locale_menu_link_defaults() {
   // Translation functionality.
-  $links['locale.admin.config.regional.translate'] = array(
+  $links['locale.translate_page'] = array(
     'link_title' => 'User interface translation',
     'description' => 'Translate the built-in user interface.',
     'route_name' => 'locale.translate_page',
@@ -180,7 +180,7 @@ function locale_menu_link_defaults() {
     'weight' => 15,
   );
 
-  $links['locale.admin.reports.translations'] = array(
+  $links['locale.translate_status'] = 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.',
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 660e1df..7084870 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -66,7 +66,7 @@ function menu_permission() {
  * Implements hook_menu_link_defaults().
  */
 function menu_menu_link_defaults() {
-  $links['menu.admin.overview'] = array(
+  $links['menu.overview_page'] = 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',
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index c97851e..05f622e 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -940,7 +940,7 @@ function _node_revision_access(NodeInterface $node, $op = 'view', $account = NUL
  * Implements hook_menu_link_defaults().
  */
 function node_menu_link_defaults() {
-  $links['node.admin.content'] = array(
+  $links['node.content_overview'] = array(
     'link_title' => 'Content',
     'route_name' => 'node.content_overview',
     'parent' => 'system.admin',
@@ -948,13 +948,13 @@ function node_menu_link_defaults() {
     'weight' => -10,
   );
 
-  $links['node.admin.structure.types'] = array(
+  $links['node.overview_types'] = array(
     'link_title' => 'Content types',
     'parent' => 'system.admin.structure',
     'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.',
     'route_name' => 'node.overview_types',
   );
-  $links['node.add'] = array(
+  $links['node.add_page'] = array(
     'link_title' => 'Add content',
     'route_name' => 'node.add_page',
   );
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 704f9a2..316e15b 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -58,7 +58,7 @@ function path_permission() {
  * Implements hook_menu_link_defaults().
  */
 function path_menu_link_defaults() {
-  $links['path.admin.overview'] = 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',
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index f7aecac..ad4e9d2 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -49,7 +49,7 @@ function picture_permission() {
  * Implements hook_menu_link_defaults().
  */
 function picture_menu_link_defaults() {
-  $links['picture.admin.config.picturemapping'] = array(
+  $links['picture.mapping_page'] = array(
     'link_title' => 'Picture Mappings',
     'description' => 'Manage picture mappings',
     'weight' => 10,
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index d8e3e3b..71097f6 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -142,12 +142,12 @@ function search_preprocess_block(&$variables) {
  * Implements hook_menu_link_defaults().
  */
 function search_menu_link_defaults() {
-  $links['search'] = array(
+  $links['search.view'] = array(
     'link_title' => 'Search',
     'route_name' => 'search.view',
     'type' => MENU_SUGGESTED_ITEM,
   );
-  $links['search.admin.settings'] = array(
+  $links['search.settings'] = array(
     'link_title' => 'Search settings',
     'parent' => 'system.admin.config.search',
     'description' => 'Configure relevance settings for search and other indexing options.',
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index ba0b04a..ecf7965 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -65,7 +65,7 @@ function shortcut_permission() {
  * Implements hook_menu_link_defaults().
  */
 function shortcut_menu_link_defaults() {
-  $links['shortcut.admin.config.user-interface.shortcut'] = array(
+  $links['shortcut.set_admin'] = array(
     'link_title' => 'Shortcuts',
     'description' => 'Add and modify shortcut sets.',
     'route_name' => 'shortcut.set_admin',
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 8da7e4c..3ee65fd 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -38,7 +38,7 @@ function simpletest_help($path, $arg) {
  * Implements hook_menu_link_defaults().
  */
 function simpletest_menu_link_defaults() {
-  $links['simpletest.admin.config.development.testing'] = array(
+  $links['simpletest.test_form'] = 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',
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 7e198f7..184d08c 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -82,7 +82,7 @@ function statistics_node_links_alter(array &$node_links, NodeInterface $entity,
  * Implements hook_menu_link_defaults().
  */
 function statistics_menu_link_defaults() {
-  $links['statistics.admin.config.system.statistics'] = array(
+  $links['statistics.settings'] = array(
     'link_title' => 'Statistics',
     'description' => 'Control details about what and how your site logs content statistics.',
     'route_name' => 'statistics.settings',
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index ca908a2..e85e2f3 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -669,7 +669,7 @@ function system_menu_link_defaults() {
     'weight' => -8,
   );
   // Appearance.
-  $items['system.admin.appearance'] = array(
+  $items['system.themes_page'] = array(
     'route_name' => 'system.themes_page',
     'link_title' => 'Appearance',
     'description' => 'Select and configure your themes.',
@@ -677,7 +677,7 @@ function system_menu_link_defaults() {
     'weight' => -6,
   );
   // Modules.
-  $items['system.admin.modules'] = array(
+  $items['system.modules_list'] = array(
     'link_title' => 'Extend',
     'description' => 'Add and enable modules to extend site functionality.',
     'parent' => 'system.admin',
@@ -685,7 +685,7 @@ function system_menu_link_defaults() {
     'weight' => -2,
   );
   // Configuration.
-  $items['system.admin.config'] = array(
+  $items['system.admin_config'] = array(
     'link_title' => 'Configuration',
     'parent' => 'system.admin',
     'description' => 'Administer settings.',
@@ -694,157 +694,157 @@ function system_menu_link_defaults() {
   );
 
   // Media settings.
-  $items['system.admin.config.media'] = array(
+  $items['system.admin_config_media'] = array(
     'route_name' => 'system.admin_config_media',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'link_title' => 'Media',
     'weight' => -10,
   );
-  $items['system.admin.config.media.file-system'] = array(
+  $items['system.file_system_settings'] = array(
     'link_title' => 'File system',
     'description' => 'Tell Drupal where to store uploaded files and how they are accessed.',
-    'parent' => 'system.admin.config.media',
+    'parent' => 'system.admin_config_media',
     'route_name' => 'system.file_system_settings',
   );
-  $items['system.admin.config.media.image-toolkit'] = array(
+  $items['system.image_toolkit_settings'] = array(
     'link_title' => 'Image toolkit',
-    'parent' => 'system.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['system.admin.config.services'] = array(
+  $items['system.admin_config_services'] = array(
     'link_title' => 'Web services',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'route_name' => 'system.admin_config_services',
   );
-  $items['system.admin.config.services.rss-publishing'] = array(
+  $items['system.rss_feeds_settings'] = array(
     'link_title' => 'RSS publishing',
-    'parent' => 'system.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['system.admin.config.development'] = array(
+  $items['system.admin_config_development'] = array(
     'route_name' => 'system.admin_config_development',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'link_title' => 'Development',
     'description' => 'Development tools.',
     'weight' => -10,
   );
   $items['system.admin.config.development.maintenance'] = array(
     'link_title' => 'Maintenance mode',
-    'parent' => 'system.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['system.admin.config.development.performance'] = array(
+  $items['system.performance_settings'] = array(
     'link_title' => 'Performance',
-    'parent' => 'system.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['system.admin.config.development.logging'] = array(
+  $items['system.logging_settings'] = array(
     'link_title' => 'Logging and errors',
-    'parent' => 'system.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['system.admin.config.regional'] = array(
+  $items['system.admin_config_regional'] = array(
     'route_name' => 'system.admin_config_regional',
     'link_title' => 'Regional and language',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'Regional settings, localization and translation.',
     'weight' => -5,
   );
-  $items['system.admin.config.regional.settings'] = array(
+  $items['system.regional_settings'] = array(
     'link_title' => 'Regional settings',
-    'parent' => 'system.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['system.admin.config.regional.date-time'] = array(
+  $items['system.date_format_list'] = array(
     'link_title' => 'Date and time formats',
-    'parent' => 'system.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['system.admin.config.search'] = array(
+  $items['system.admin_config_search'] = array(
     'link_title' => 'Search and metadata',
     'route_name' => 'system.admin_config_search',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'Local site search, metadata and SEO.',
     'weight' => -10,
   );
 
   // System settings.
-  $items['system.admin.config.system'] = array(
+  $items['system.admin_config_system'] = array(
     'link_title' => 'System',
     'route_name' => 'system.admin_config_system',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'General system related configuration.',
     'weight' => -20,
   );
-  $items['system.admin.config.system.site-information'] = array(
+  $items['system.site_information_settings'] = array(
     'link_title' => 'Site information',
-    'parent' => 'system.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['system.admin.config.system.cron'] = array(
+  $items['system.cron_settings'] = array(
     'link_title' => 'Cron',
-    'parent' => 'system.admin.config.system',
+    'parent' => 'system.admin_config_system',
     'description' => 'Manage automatic site maintenance tasks.',
     'route_name' => 'system.cron_settings',
     'weight' => 20,
   );
   // Additional categories
-  $items['system.admin.config.user-interface'] = array(
+  $items['system.admin_config_ui'] = array(
     'link_title' => 'User interface',
     'route_name' => 'system.admin_config_ui',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'Tools that enhance the user interface.',
     'weight' => -15,
   );
-  $items['system.admin.config.workflow'] = array(
+  $items['system.admin_config_workflow'] = array(
     'link_title' => 'Workflow',
     'route_name' => 'system.admin_config_workflow',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'Content workflow, editorial workflow tools.',
     'weight' => 5,
   );
-  $items['system.admin.config.content'] = array(
+  $items['system.admin_config_content'] = array(
     'link_title' => 'Content authoring',
     'route_name' => 'system.admin_config_content',
-    'parent' => 'system.admin.config',
+    'parent' => 'system.admin_config',
     'description' => 'Settings related to formatting and authoring content.',
     'weight' => -15,
   );
 
   // Reports.
-  $items['system.admin.reports'] = array(
+  $items['system.admin_reports'] = array(
     'link_title' => 'Reports',
     'route_name' => 'system.admin_reports',
     'parent' => 'system.admin',
     'description' => 'View reports, updates, and errors.',
     'weight' => 5,
   );
-  $items['system.admin.reports.status'] = array(
+  $items['system.status'] = array(
     'link_title' => 'Status report',
-    'parent' => 'system.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/update/update.module b/core/modules/update/update.module
index 23865ec..e846527 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -148,11 +148,11 @@ function update_page_build() {
  * Implements hook_menu_link_defaults().
  */
 function update_menu_link_defaults() {
-  $links['update.admin.reports.updates'] = array(
+  $links['update.status'] = array(
     'link_title' => 'Available updates',
     'description' => 'Get a status report about available updates for your installed modules and themes.',
     'route_name' => 'update.status',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
     'weight' => -50,
   );
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index ab9a163..ce16854 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -719,18 +719,18 @@ function user_menu_link_defaults() {
   );
 
   // Administration pages.
-  $links['user.admin.config.people'] = array(
+  $links['user.admin_index'] = array(
    'link_title' => 'People',
    'route_name' => 'user.admin_index',
-   'parent' => 'system.admin.config',
+   'parent' => 'system.admin_config',
    'description' => 'Configure user accounts.',
    'position' => 'left',
    'weight' => -20,
   );
 
-  $links['user.admin.config.people.accounts'] = array(
+  $links['user.account_settings'] = array(
     'link_title' => 'Account settings',
-    'parent' => 'user.admin.config.people',
+    'parent' => 'user.admin_index',
     '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_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 7f140d3..1a88ef6 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -47,15 +47,15 @@ function views_ui_menu_link_defaults() {
   // Top-level Views module pages (not tied to a particular View).
   $links['views_ui.admin.structure.views'] = array(
     'link_title' => 'Views',
-    'parent' => 'system.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['views_ui.admin.reports.views-plugins'] = array(
+  $links['views_ui.reports_plugins'] = array(
     'link_title' => 'Views plugins',
-    'parent' => 'system.admin.reports',
+    'parent' => 'system.admin_reports',
     'description' => 'Overview of plugins used in all views.',
     'route_name' => 'views_ui.reports_plugins',
   );