diff --git a/core/themes/bartik/templates/block--local-actions-block.html.twig b/core/themes/bartik/templates/block--local-actions-block.html.twig
new file mode 100644
index 0000000..ee741d9
--- /dev/null
+++ b/core/themes/bartik/templates/block--local-actions-block.html.twig
@@ -0,0 +1,12 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+  {% if content %}
+    <ul class="action-links">{{ content }}</ul>
+  {% endif %}
+{% endblock %}
diff --git a/core/themes/classy/templates/block/block--local-actions-block.html.twig b/core/themes/classy/templates/block/block--local-actions-block.html.twig
new file mode 100644
index 0000000..2a0f5c4
--- /dev/null
+++ b/core/themes/classy/templates/block/block--local-actions-block.html.twig
@@ -0,0 +1,12 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+  {% if content %}
+    <nav class="action-links">{{ content }}</nav>
+  {% endif %}
+{% endblock %}
diff --git a/core/themes/classy/templates/block/block--local-tasks-block.html.twig b/core/themes/classy/templates/block/block--local-tasks-block.html.twig
new file mode 100644
index 0000000..a191c60
--- /dev/null
+++ b/core/themes/classy/templates/block/block--local-tasks-block.html.twig
@@ -0,0 +1,14 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for tabs.
+ */
+#}
+{% block content %}
+  {% if content %}
+    <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+      {{ content }}
+    </nav>
+  {% endif %}
+{% endblock %}
diff --git a/core/themes/classy/templates/block/block--system-local-actions-block.html.twig b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig
deleted file mode 100644
index 2a0f5c4..0000000
--- a/core/themes/classy/templates/block/block--system-local-actions-block.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Theme override for local actions (primary admin actions.)
- */
-#}
-{% block content %}
-  {% if content %}
-    <nav class="action-links">{{ content }}</nav>
-  {% endif %}
-{% endblock %}
diff --git a/core/themes/classy/templates/block/block--system-local-tasks-block.html.twig b/core/themes/classy/templates/block/block--system-local-tasks-block.html.twig
deleted file mode 100644
index a191c60..0000000
--- a/core/themes/classy/templates/block/block--system-local-tasks-block.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Theme override for tabs.
- */
-#}
-{% block content %}
-  {% if content %}
-    <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
-      {{ content }}
-    </nav>
-  {% endif %}
-{% endblock %}
diff --git a/core/themes/seven/templates/block--local-actions-block.html.twig b/core/themes/seven/templates/block--local-actions-block.html.twig
new file mode 100644
index 0000000..6539758
--- /dev/null
+++ b/core/themes/seven/templates/block--local-actions-block.html.twig
@@ -0,0 +1,14 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+  {% if content %}
+    <ul class="action-links">
+      {{ content }}
+    </ul>
+  {% endif %}
+{% endblock %}
diff --git a/core/themes/seven/templates/block--seven-local-actions.html.twig b/core/themes/seven/templates/block--seven-local-actions.html.twig
deleted file mode 100644
index 6539758..0000000
--- a/core/themes/seven/templates/block--seven-local-actions.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Theme override for local actions (primary admin actions.)
- */
-#}
-{% block content %}
-  {% if content %}
-    <ul class="action-links">
-      {{ content }}
-    </ul>
-  {% endif %}
-{% endblock %}