diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 78a8e17..1639c05 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -96,7 +96,7 @@ 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(
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 9227c8a..5b2024b 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',
   );