diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 967222e..f4049c4 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -209,7 +209,7 @@ function comment_default_menu_links() {
   $links['comment.admin.content'] = array(
     'link_title' => 'Comments',
     'route_name' => 'comment.admin',
-    'parent' => 'system.admin.content',
+    'parent' => 'node.admin.content',
     'description' => 'List and edit site comments and the comment approval queue.',
   );
 
diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index affee5c..559a276 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -107,7 +107,7 @@ function entity_default_menu_links() {
   );
 
   // View modes.
-  $links['admin.structure.display_modes.view'] = array(
+  $links['entity.admin.structure.display_modes.view'] = array(
     'link_title' => 'View modes',
     'description' => 'Manage custom view modes.',
     'route_name' => 'entity.view_mode_list',
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index 1734e69..0baa2de 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -297,7 +297,7 @@ public function executeHookDefaultMenuLinks(array &$existing_links) {
     $view_route_names = $this->state->get('views.view_route_names') ?: array();
 
     $path = implode('/', $bits);
-    $menu_link_id = str_replace('/', '.', $path);
+    $menu_link_id = 'views.' . str_replace('/', '.', $path);
     $links[$menu_link_id] = array();
 
     if ($path) {