diff --git a/core/modules/comment/comment.local_tasks.yml b/core/modules/comment/comment.local_tasks.yml
index ee8d3bfc5249b913d4503f0b6d2299821a6b0838..1c0c90104119132d16451ca4fa8b0f4bb20ca28a 100644
--- a/core/modules/comment/comment.local_tasks.yml
+++ b/core/modules/comment/comment.local_tasks.yml
@@ -1,15 +1,15 @@
-comment_permalink_tab:
+comment.permalink_tab:
   route_name: comment_permalink
   title: 'View comment'
-  tab_root_id: comment_permalink_tab
-comment_edit_page_tab:
+  tab_root_id: comment.permalink_tab
+comment.edit_page_tab:
   route_name: comment_edit_page
   title: 'Edit'
-  tab_root_id: comment_permalink_tab
+  tab_root_id: comment.permalink_tab
   weight: 0
-comment_confirm_delete_tab:
+comment.confirm_delete_tab:
   route_name: comment_confirm_delete
   title: 'Delete'
-  tab_root_id: comment_permalink_tab
+  tab_root_id: comment.permalink_tab
   weight: 10
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
index 9366aefe43a99c2fb2f9b3d0a9e73f71f06c9646..bf5185679e927cf92b6e4c365744069efe36207f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
@@ -192,12 +192,12 @@ public function testPluginLocalTask() {
 
     // Ensures that the local tasks contains the proper 'provider key'
     $definitions = $this->container->get('plugin.manager.menu.local_task')->getDefinitions();
-    $this->assertEqual($definitions['menu_local_task_test_tasks_view']['provider'], 'menu_test');
-    $this->assertEqual($definitions['menu_local_task_test_tasks_edit']['provider'], 'menu_test');
-    $this->assertEqual($definitions['menu_local_task_test_tasks_settings']['provider'], 'menu_test');
-    $this->assertEqual($definitions['menu_local_task_test_tasks_settings_sub1']['provider'], 'menu_test');
-    $this->assertEqual($definitions['menu_local_task_test_tasks_settings_sub2']['provider'], 'menu_test');
-    $this->assertEqual($definitions['menu_local_task_test_tasks_settings_sub3']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_view']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_edit']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_settings']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_settings_sub1']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_settings_sub2']['provider'], 'menu_test');
+    $this->assertEqual($definitions['menu_test.local_task_test_tasks_settings_sub3']['provider'], 'menu_test');
 
     // Test that we we correctly apply the active class to tabs where one of the
     // request attributes is upcast to an entity object.
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml b/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml
index 7d270f3fbdfae84ba242aa18668623cdfd668b1a..6e83ec62d5451b7473e3c831ad88ecdbc4356429 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.local_tasks.yml
@@ -1,54 +1,54 @@
-menu_local_task_test_tasks_view:
+menu_test.local_task_test_tasks_view:
   route_name: menu_test.local_task_test_tasks_view
   title: View
-  tab_root_id: menu_local_task_test_tasks_view
-menu_local_task_test_tasks_edit:
+  tab_root_id: menu_test.local_task_test_tasks_view
+menu_test.local_task_test_tasks_edit:
   route_name: menu_test.local_task_test_tasks_edit
   title: Edit
-  tab_root_id: menu_local_task_test_tasks_view
-menu_local_task_test_tasks_settings:
+  tab_root_id: menu_test.local_task_test_tasks_view
+menu_test.local_task_test_tasks_settings:
   route_name: menu_test.local_task_test_tasks_settings
   title: Settings
-  tab_root_id: menu_local_task_test_tasks_view
-menu_local_task_test_tasks_settings_sub1:
+  tab_root_id: menu_test.local_task_test_tasks_view
+menu_test.local_task_test_tasks_settings_sub1:
   route_name: menu_test.local_task_test_tasks_settings_sub1
   title: sub1
-  tab_root_id: menu_local_task_test_tasks_view
-  tab_parent_id: menu_local_task_test_tasks_settings
+  tab_root_id: menu_test.local_task_test_tasks_view
+  tab_parent_id: menu_test.local_task_test_tasks_settings
   class: Drupal\menu_test\Plugin\Menu\LocalTask\TestTasksSettingsSub1
   weight: -10
-menu_local_task_test_tasks_settings_sub2:
+menu_test.local_task_test_tasks_settings_sub2:
   route_name: menu_test.local_task_test_tasks_settings_sub2
   title: sub2
-  tab_root_id: menu_local_task_test_tasks_view
-  tab_parent_id: menu_local_task_test_tasks_settings
-menu_local_task_test_tasks_settings_sub3:
+  tab_root_id: menu_test.local_task_test_tasks_view
+  tab_parent_id: menu_test.local_task_test_tasks_settings
+menu_test.local_task_test_tasks_settings_sub3:
   route_name: menu_test.local_task_test_tasks_settings_sub3
   title: sub3
-  tab_root_id: menu_local_task_test_tasks_view
-  tab_parent_id: menu_local_task_test_tasks_settings
+  tab_root_id: menu_test.local_task_test_tasks_view
+  tab_parent_id: menu_test.local_task_test_tasks_settings
   weight: 20
-menu_local_task_test_tasks_settings_derived:
+menu_test.local_task_test_tasks_settings_derived:
   route_name: menu_test.local_task_test_tasks_settings_derived
   title: derived
-  tab_root_id: menu_local_task_test_tasks_view
-  tab_parent_id: menu_local_task_test_tasks_settings
+  tab_root_id: menu_test.local_task_test_tasks_view
+  tab_parent_id: menu_test.local_task_test_tasks_settings
   derivative: Drupal\menu_test\Plugin\Derivative\LocalTaskTest
   weight: 50
-menu_local_task_test.placeholder_sub1:
+menu_test.local_task_test.placeholder_sub1:
   route_name: menu_test.local_task_test_placeholder_sub1
   title: 'placeholder sub1'
-  tab_root_id: menu_local_task_test_placeholder_sub1
-menu_local_task_test_placeholder_sub2:
+  tab_root_id: menu_test.local_task_test_placeholder_sub1
+menu_test.local_task_test_placeholder_sub2:
   route_name: menu_test.local_task_test_placeholder_sub2
   title: 'placeholder sub2'
-  tab_root_id: menu_local_task_test_placeholder_sub1
-menu_local_task_test.upcasting_sub1:
+  tab_root_id: menu_test.local_task_test_placeholder_sub1
+menu_test.local_task_test.upcasting_sub1:
   route_name: menu_test.local_task_test_upcasting_sub1
   title: 'upcasting sub1'
-  tab_root_id: menu_local_task_test_upcasting_sub1
-menu_local_task_test_upcasting_sub2:
+  tab_root_id: menu_test.local_task_test_upcasting_sub1
+menu_test.local_task_test_upcasting_sub2:
   route_name: menu_test.local_task_test_upcasting_sub2
   title: 'upcasting sub2'
-  tab_root_id: menu_local_task_test_upcasting_sub1
+  tab_root_id: menu_test.local_task_test_upcasting_sub1
   weight: 10
diff --git a/core/modules/views_ui/views_ui.local_tasks.yml b/core/modules/views_ui/views_ui.local_tasks.yml
index 383ef10f42e390a5dc052f2a7b263061dae36869..68fc7dc81d41307e1da46e422b0db129601852ba 100644
--- a/core/modules/views_ui/views_ui.local_tasks.yml
+++ b/core/modules/views_ui/views_ui.local_tasks.yml
@@ -1,22 +1,22 @@
-views_ui_settings_tab:
+views_ui.settings_tab:
   route_name: views_ui.settings_basic
   title: Settings
-  tab_root_id: views_ui_list_tab
+  tab_root_id: views_ui.list_tab
 
-views_ui_settings_basic_tab:
+views_ui.settings_basic_tab:
   route_name: views_ui.settings_basic
   title: Basic
-  tab_root_id: views_ui_list_tab
-  tab_parent_id: views_ui_settings_tab
+  tab_root_id: views_ui.list_tab
+  tab_parent_id: views_ui.settings_tab
 
-views_ui_settings_advanced_tab:
+views_ui.settings_advanced_tab:
   route_name: views_ui.settings_advanced
   title: Advanced
-  tab_root_id: views_ui_list_tab
-  tab_parent_id: views_ui_settings_tab
+  tab_root_id: views_ui.list_tab
+  tab_parent_id: views_ui.settings_tab
   weight: 10
 
-views_ui_list_tab:
+views_ui.list_tab:
   route_name: views_ui.list
   title: List
-  tab_root_id: views_ui_list_tab
+  tab_root_id: views_ui.list_tab