diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 2153342cd50..1015f67f820 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2206,39 +2206,30 @@ function drupal_common_theme() {
     // From theme.inc.
     'html' => array(
       'variables' => array('page_object' => NULL),
-      'template' => 'html',
     ),
     'page' => array(
       'render element' => 'page',
-      'template' => 'page',
     ),
     'region' => array(
       'render element' => 'elements',
-      'template' => 'region',
     ),
     'time' => array(
       'variables' => array('timestamp' => NULL, 'text' => NULL, 'attributes' => array(), 'html' => FALSE),
-      'template' => 'time',
     ),
     'datetime_form' => array(
-      'template' => 'datetime-form',
       'render element' => 'element',
     ),
     'datetime_wrapper' => array(
-      'template' => 'datetime-wrapper',
       'render element' => 'element',
     ),
     'status_messages' => array(
       'variables' => array('display' => NULL),
-      'template' => 'status-messages',
     ),
     'links' => array(
       'variables' => array('links' => array(), 'attributes' => array('class' => array('links')), 'heading' => array(), 'set_active_class' => FALSE),
-      'template' => 'links',
     ),
     'dropbutton_wrapper' => array(
       'variables' => array('children' => NULL),
-      'template' => 'dropbutton-wrapper',
     ),
     'image' => array(
       // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft
@@ -2254,35 +2245,27 @@ function drupal_common_theme() {
       // The title attribute is optional in all cases, so it is omitted by
       // default.
       'variables' => array('uri' => NULL, 'width' => NULL, 'height' => NULL, 'alt' => '', 'title' => NULL, 'attributes' => array(), 'sizes' => NULL, 'srcset' => array(), 'style_name' => NULL),
-      'template' => 'image',
     ),
     'breadcrumb' => array(
       'variables' => array('links' => array()),
-      'template' => 'breadcrumb',
     ),
     'table' => array(
       'variables' => array('header' => NULL, 'rows' => NULL, 'footer' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''),
-      'template' => 'table',
     ),
     'tablesort_indicator' => array(
       'variables' => array('style' => NULL),
-      'template' => 'tablesort-indicator',
     ),
     'mark' => array(
       'variables' => array('status' => MARK_NEW),
-      'template' => 'mark',
     ),
     'item_list' => array(
       'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array(), 'empty' => NULL),
-      'template' => 'item-list',
     ),
     'feed_icon' => array(
       'variables' => array('url' => NULL, 'title' => NULL),
-      'template' => 'feed-icon',
     ),
     'progress_bar' => array(
       'variables' => array('label' => NULL, 'percent' => NULL, 'message' => NULL),
-      'template' => 'progress-bar',
     ),
     'indentation' => array(
       'variables' => array('size' => 1),
@@ -2291,15 +2274,12 @@ function drupal_common_theme() {
     // From theme.maintenance.inc.
     'maintenance_page' => array(
       'render element' => 'page',
-      'template' => 'maintenance-page',
     ),
     'install_page' => array(
       'render element' => 'page',
-      'template' => 'install-page',
     ),
     'maintenance_task_list' => array(
       'variables' => array('items' => NULL, 'active' => NULL,  'variant' => NULL),
-      'template' => 'maintenance-task-list',
     ),
     'authorize_message' => array(
       'variables' => array('message' => NULL, 'success' => TRUE),
@@ -2316,82 +2296,63 @@ function drupal_common_theme() {
     // From pager.inc.
     'pager' => array(
       'variables' => array('tags' => array(), 'element' => 0, 'parameters' => array(), 'quantity' => 9),
-      'template' => 'pager',
     ),
     // From menu.inc.
     'menu' => array(
       'variables' => array('items' => array(), 'attributes' => array()),
-      'template' => 'menu',
     ),
     'menu_local_task' => array(
       'render element' => 'element',
-      'template' => 'menu-local-task',
     ),
     'menu_local_action' => array(
       'render element' => 'element',
-      'template' => 'menu-local-action',
     ),
     'menu_local_tasks' => array(
       'variables' => array('primary' => array(), 'secondary' => array()),
-      'template' => 'menu-local-tasks',
     ),
     // From form.inc.
     'input' => array(
       'render element' => 'element',
-      'template' => 'input',
     ),
     'select' => array(
       'render element' => 'element',
-      'template' => 'select',
     ),
     'fieldset' => array(
       'render element' => 'element',
-      'template' => 'fieldset',
     ),
     'details' => array(
       'render element' => 'element',
-      'template' => 'details',
     ),
     'radios' => array(
       'render element' => 'element',
-      'template' => 'radios',
     ),
     'checkboxes' => array(
       'render element' => 'element',
-      'template' => 'checkboxes',
     ),
     'form' => array(
       'render element' => 'element',
-      'template' => 'form',
     ),
     'textarea' => array(
       'render element' => 'element',
-      'template' => 'textarea',
     ),
     'form_element' => array(
       'render element' => 'element',
-      'template' => 'form-element',
     ),
     'form_element_label' => array(
       'render element' => 'element',
-      'template' => 'form-element-label',
     ),
     'vertical_tabs' => array(
       'render element' => 'element',
-      'template' => 'vertical-tabs',
     ),
     'container' => array(
       'render element' => 'element',
-      'template' => 'container',
     ),
     // From field system.
     'field' => array(
       'render element' => 'element',
-      'template' => 'field',
     ),
     'field_multiple_value_form' => array(
       'render element' => 'element',
-      'template' => 'field-multiple-value-form',
     ),
   );
 }
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index b1677a4a99c..42002b1e262 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -65,17 +65,14 @@ function aggregator_theme() {
     'aggregator_feed' => array(
       'render element' => 'elements',
       'file' => 'aggregator.theme.inc',
-      'template' => 'aggregator-feed',
     ),
     'aggregator_block_item' => array(
       'variables' => array('item' => NULL, 'feed' => 0),
       'file' => 'aggregator.theme.inc',
-      'template' => 'aggregator-block-item',
     ),
     'aggregator_item' => array(
       'render element' => 'elements',
       'file' => 'aggregator.theme.inc',
-      'template' => 'aggregator-item',
     ),
   );
 }
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 952bad2b97b..073da6afb66 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -54,11 +54,9 @@ function block_theme() {
   return array(
     'block' => array(
       'render element' => 'elements',
-      'template' => 'block',
     ),
     'block_list' => array(
       'render element' => 'form',
-      'template' => 'block-list',
     ),
   );
 }
diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module
index 7a917e515fe..dd36852a18f 100644
--- a/core/modules/block_content/block_content.module
+++ b/core/modules/block_content/block_content.module
@@ -46,7 +46,6 @@ function block_content_theme($existing, $type, $theme, $path) {
     'block_content_add_list' => array(
       'variables' => array('content' => NULL),
       'file' => 'block_content.pages.inc',
-      'template' => 'block-content-add-list',
     ),
   );
 }
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 345bf882192..669a26a3705 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -56,11 +56,9 @@ function book_theme() {
   return array(
     'book_navigation' => array(
       'variables' => array('book_link' => NULL),
-      'template' => 'book-navigation',
     ),
     'book_tree' => array(
       'render element' => 'tree',
-      'template' => 'book-tree',
     ),
     'book_link' => array(
       'render element' => 'element',
@@ -68,7 +66,6 @@ function book_theme() {
     ),
     'book_export_html' => array(
       'variables' => array('title' => NULL, 'contents' => NULL, 'depth' => NULL),
-      'template' => 'book-export-html',
     ),
     'book_admin_table' => array(
       'render element' => 'form',
@@ -77,11 +74,9 @@ function book_theme() {
     ),
     'book_all_books_block' => array(
       'render element' => 'book_menus',
-      'template' => 'book-all-books-block',
     ),
     'book_node_export_html' => array(
       'variables' => array('node' => NULL, 'children' => NULL),
-      'template' => 'book-node-export-html',
     ),
   );
 }
diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module
index 5cb8ef348cd..d1476d961fb 100644
--- a/core/modules/ckeditor/ckeditor.module
+++ b/core/modules/ckeditor/ckeditor.module
@@ -40,7 +40,6 @@ function ckeditor_theme() {
     'ckeditor_settings_toolbar' => array(
       'file' => 'ckeditor.admin.inc',
       'variables' => array('editor' => NULL, 'plugins' => NULL),
-      'template' => 'ckeditor-settings-toolbar',
     ),
   );
 }
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index abf4d4546a8..0e2c57e4955 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -39,7 +39,6 @@ function color_theme() {
   return array(
     'color_scheme_form' => array(
       'render element' => 'form',
-      'template' => 'color-scheme-form',
     ),
   );
 }
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 7b21340e495..bdf53bf7db7 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -129,11 +129,9 @@ function comment_theme() {
   return array(
     'comment' => array(
       'render element' => 'elements',
-      'template' => 'comment',
     ),
     'field__comment' => array(
       'base hook' => 'field',
-      'template' => 'field--comment',
     ),
   );
 }
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 55f99ac704b..61aa1bc6d7a 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -577,27 +577,22 @@ function file_theme() {
     // From file.module.
     'file_link' => array(
       'variables' => array('file' => NULL, 'icon_directory' => NULL, 'description' => NULL, 'attributes' => array()),
-      'template' => 'file-link',
     ),
     'file_managed_file' => array(
       'render element' => 'element',
-      'template' => 'file-managed-file',
     ),
 
     // From file.field.inc.
     'file_widget' => array(
       'render element' => 'element',
-      'template' => 'file-widget',
       'file' => 'file.field.inc',
     ),
     'file_widget_multiple' => array(
       'render element' => 'element',
-      'template' => 'file-widget-multiple',
       'file' => 'file.field.inc',
     ),
     'file_upload_help' => array(
       'variables' => array('description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL),
-      'template' => 'file-upload-help',
       'file' => 'file.field.inc',
     ),
   );
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 0cf6e425422..cfce4fa7232 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -60,7 +60,6 @@ function filter_theme() {
   return array(
     'filter_tips' => array(
       'variables' => array('tips' => NULL, 'long' => FALSE),
-      'template' => 'filter-tips',
     ),
     'text_format_wrapper' => array(
       'variables' => array(
@@ -68,11 +67,9 @@ function filter_theme() {
         'description' => NULL,
         'attributes' => array(),
       ),
-      'template' => 'text-format-wrapper',
     ),
     'filter_guidelines' => array(
       'variables' => array('format' => NULL),
-      'template' => 'filter-guidelines',
     ),
     'filter_caption' => array(
       'variables' => array(
@@ -81,7 +78,6 @@ function filter_theme() {
         'caption' => NULL,
         'classes' => NULL,
       ),
-      'template' => 'filter-caption',
     )
   );
 }
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 10b7366b9f9..b744c0f1ef9 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -82,19 +82,15 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
 function forum_theme() {
   return array(
     'forums' => array(
-      'template' => 'forums',
       'variables' => array('forums' => array(), 'topics' => array(), 'topics_pager' => array(), 'parents' => NULL, 'term' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL, 'header' => array()),
     ),
     'forum_list' => array(
-      'template' => 'forum-list',
       'variables' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL),
     ),
     'forum_icon' => array(
-      'template' => 'forum-icon',
       'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE),
     ),
     'forum_submitted' => array(
-      'template' => 'forum-submitted',
       'variables' => array('topic' => NULL),
     ),
   );
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 0c8cc2c066c..f1faacbc1f7 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -109,47 +109,38 @@ function image_theme() {
         'title' => NULL,
         'attributes' => array(),
       ),
-      'template' => 'image-style',
     ),
 
     // Theme functions in image.admin.inc.
     'image_style_preview' => array(
       'variables' => array('style' => NULL),
       'file' => 'image.admin.inc',
-      'template' => 'image-style-preview',
     ),
     'image_anchor' => array(
       'render element' => 'element',
       'file' => 'image.admin.inc',
-      'template' => 'image-anchor',
     ),
     'image_resize_summary' => array(
       'variables' => array('data' => NULL, 'effect' => array()),
-      'template' => 'image-resize-summary',
     ),
     'image_scale_summary' => array(
       'variables' => array('data' => NULL, 'effect' => array()),
-      'template' => 'image-scale-summary',
     ),
     'image_crop_summary' => array(
       'variables' => array('data' => NULL, 'effect' => array()),
-      'template' => 'image-crop-summary',
     ),
     'image_rotate_summary' => array(
       'variables' => array('data' => NULL, 'effect' => array()),
-      'template' => 'image-rotate-summary',
     ),
 
     // Theme functions in image.field.inc.
     'image_widget' => array(
       'render element' => 'element',
       'file' => 'image.field.inc',
-      'template' => 'image-widget',
     ),
     'image_formatter' => array(
       'variables' => array('item' => NULL, 'item_attributes' => NULL, 'path' => NULL, 'image_style' => NULL),
       'file' => 'image.field.inc',
-      'template' => 'image-formatter',
     ),
   );
 }
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index ac63be5bfd9..676dfb73adb 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -95,7 +95,6 @@ function language_theme() {
     'language_negotiation_configure_form' => array(
       'render element' => 'form',
       'file' => 'language.admin.inc',
-      'template' => 'language-negotiation-configure-form',
     ),
     'language_negotiation_configure_browser_form_table' => array(
       'render element' => 'form',
diff --git a/core/modules/link/link.module b/core/modules/link/link.module
index 92078182c6d..72ae02405e0 100644
--- a/core/modules/link/link.module
+++ b/core/modules/link/link.module
@@ -41,7 +41,6 @@ function link_theme() {
   return array(
     'link_formatter_link_separate' => array(
       'variables' => array('title' => NULL, 'url_title' => NULL, 'url' => NULL),
-      'template' => 'link-formatter-link-separate',
     ),
   );
 }
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index f6b05292c79..e53d79e302f 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -187,12 +187,10 @@ function locale_theme() {
     'locale_translation_last_check' => array(
       'variables' => array('last' => NULL),
       'file' => 'locale.pages.inc',
-      'template' => 'locale-translation-last-check',
     ),
     'locale_translation_update_info' => array(
       'variables' => array('updates' => array(), 'not_found' => array()),
       'file' => 'locale.pages.inc',
-      'template' => 'locale-translation-update-info',
     ),
   );
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 6988f1e58fb..4bf8f3844a5 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -137,7 +137,6 @@ function node_theme() {
   return array(
     'node' => array(
       'render element' => 'elements',
-      'template' => 'node',
     ),
     'node_search_admin' => array(
       'render element' => 'form',
@@ -146,23 +145,18 @@ function node_theme() {
     'node_add_list' => array(
       'variables' => array('content' => NULL),
       'file' => 'node.pages.inc',
-      'template' => 'node-add-list',
     ),
     'node_edit_form' => array(
       'render element' => 'form',
-      'template' => 'node-edit-form',
     ),
     'field__node__title' => array(
       'base hook' => 'field',
-      'template' => 'field--node--title',
     ),
     'field__node__uid' => array(
       'base hook' => 'field',
-      'template' => 'field--node--uid',
     ),
     'field__node__created' => array(
       'base hook' => 'field',
-      'template' => 'field--node--created',
     ),
   );
 }
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index f407e8343c4..09bb89966e2 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -250,7 +250,6 @@ function rdf_theme() {
   return array(
     'rdf_metadata' => array(
       'variables' => array('metadata' => array()),
-      'template' => 'rdf-metadata',
     ),
   );
 }
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 502e80ddb18..c622556c813 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -104,7 +104,6 @@ function search_theme() {
     'search_result' => array(
       'variables' => array('result' => NULL, 'plugin_id' => NULL),
       'file' => 'search.pages.inc',
-      'template' => 'search-result',
     ),
   );
 }
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index d45bd361c1b..3768b907eef 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -44,7 +44,6 @@ function simpletest_theme() {
   return array(
     'simpletest_result_summary' => array(
       'variables' => array('label' => NULL, 'items' => array(), 'pass' => 0, 'fail' => 0, 'exception' => 0, 'debug' => 0),
-      'template' => 'simpletest-result-summary',
     ),
   );
 }
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 9e7164c2d66..1c930f7b2c4 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -161,12 +161,10 @@ function system_theme() {
     'block__system_branding_block' => array(
       'render element' => 'elements',
       'base hook' => 'block',
-      'template' => 'block--system-branding-block',
     ),
     'block__system_menu_block' => array(
       'render element' => 'elements',
       'base hook' => 'block',
-      'template' => 'block--system-menu-block',
     ),
     'system_themes_page' => array(
       'variables' => array(
@@ -174,15 +172,12 @@ function system_theme() {
         'theme_group_titles' => array(),
       ),
       'file' => 'system.admin.inc',
-      'template' => 'system-themes-page',
     ),
     'system_config_form' => array(
       'render element' => 'form',
-      'template' => 'system-config-form',
     ),
     'confirm_form' => array(
       'render element' => 'form',
-      'template' => 'confirm-form',
     ),
     'system_modules_details' => array(
       'render element' => 'form',
@@ -197,27 +192,22 @@ function system_theme() {
     'status_report' => array(
       'variables' => array('requirements' => NULL),
       'file' => 'system.admin.inc',
-      'template' => 'status-report',
     ),
     'admin_page' => array(
       'variables' => array('blocks' => NULL),
       'file' => 'system.admin.inc',
-      'template' => 'admin-page',
     ),
     'admin_block' => array(
       'variables' => array('block' => NULL),
       'file' => 'system.admin.inc',
-      'template' => 'admin-block',
     ),
     'admin_block_content' => array(
       'variables' => array('content' => NULL),
       'file' => 'system.admin.inc',
-      'template' => 'admin-block-content',
     ),
     'system_admin_index' => array(
       'variables' => array('menu_items' => NULL),
       'file' => 'system.admin.inc',
-      'template' => 'system-admin-index',
     ),
     'system_compact_link' => array(
       'variables' => array(),
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index e812b617d6d..3b77d8607e3 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -115,11 +115,9 @@ function common_test_theme() {
   return array(
     'common_test_foo' => array(
       'variables' => array('foo' => 'foo', 'bar' => 'bar'),
-      'template' => 'common-test-foo',
     ),
     'common_test_render_element' => array(
       'render element' => 'foo',
-      'template' => 'common-test-render-element',
     ),
     'common_test_empty' => array(
       'variables' => array('foo' => 'foo'),
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module
index 8616f023a28..e2378fbaa1d 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -18,19 +18,15 @@ function theme_test_theme($existing, $type, $theme, $path) {
     'template' => 'theme_test.template_test',
   );
   $items['theme_test_suggestion_provided'] = array(
-    'template' => 'theme-test-suggestion-provided',
     'variables' => array(),
   );
   $items['theme_test_specific_suggestions'] = array(
-    'template' => 'theme-test-specific-suggestions',
     'variables' => array(),
   );
   $items['theme_test_suggestions'] = array(
-    'template' => 'theme-test-suggestions',
     'variables' => array(),
   );
   $items['theme_test_general_suggestions'] = array(
-    'template' => 'theme-test-general-suggestions',
     'variables' => array(),
   );
   $items['theme_test_function_suggestions'] = array(
@@ -47,7 +43,6 @@ function theme_test_theme($existing, $type, $theme, $path) {
   );
   $items['theme_test_render_element'] = array(
     'render element' => 'elements',
-    'template' => 'theme-test-render-element',
   );
   $items['theme_test_render_element_children'] = array(
     'render element' => 'element',
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index f023cb1917e..b754ffa1516 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -21,11 +21,9 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
   );
   $items['twig_raw_test'] = array(
     'variables' => array('script' => ''),
-    'template' => 'twig-raw-test',
   );
   $items['twig_autoescape_test'] = array(
     'variables' => array('script' => ''),
-    'template' => 'twig-autoescape-test',
   );
   $items['twig_theme_test_url_generator'] = array(
     'variables' => array(),
diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php
index 26c998aab64..f74af95c096 100644
--- a/core/modules/system/theme.api.php
+++ b/core/modules/system/theme.api.php
@@ -49,7 +49,6 @@
  *       'plugin_id' => NULL,
  *     ),
  *    'file' => 'search.pages.inc',
- *    'template' => 'search-result',
  *   ),
  * );
  * @endcode
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 785a8562529..584b80a85d1 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -195,7 +195,6 @@ function taxonomy_theme() {
   return array(
     'taxonomy_term' => array(
       'render element' => 'elements',
-      'template' => 'taxonomy-term',
     ),
   );
 }
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index ab0eb01b3be..fe49c20f0be 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -41,7 +41,6 @@ function toolbar_help($route_name, RouteMatchInterface $route_match) {
 function toolbar_theme($existing, $type, $theme, $path) {
   $items['toolbar'] = array(
     'render element' => 'element',
-    'template' => 'toolbar',
   );
 
   return $items;
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index f8ce628a244..6cb861390a9 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -193,24 +193,20 @@ function update_theme() {
   return array(
     'update_last_check' => array(
       'variables' => array('last' => 0),
-      'template' => 'update-last-check',
     ),
     'update_report' => array(
       'variables' => array('data' => NULL),
       'file' => 'update.report.inc',
-      'template' => 'update-report',
     ),
     'update_project_status' => array(
       'variables' => array('project' => array(), 'includes_status' => array()),
       'file' => 'update.report.inc',
-      'template' => 'update-project-status',
     ),
     // We are using template instead of '#type' => 'table' here to keep markup
     // out of preprocess and allow for easier changes to markup.
     'update_version' => array(
       'variables' => array('version' => NULL, 'title' => NULL, 'attributes' => array()),
       'file' => 'update.report.inc',
-      'template' => 'update-version',
     ),
   );
 }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 944529384b4..de24373b14e 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -100,11 +100,9 @@ function user_theme() {
     'user' => array(
       'render element' => 'elements',
       'file' => 'user.pages.inc',
-      'template' => 'user',
     ),
     'username' => array(
       'variables' => array('account' => NULL, 'attributes' => array(), 'link_options' => array()),
-      'template' => 'username',
     ),
   );
 }
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 6d524f99586..24ef95921ad 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -95,7 +95,6 @@ function views_theme($existing, $type, $theme, $path) {
   // Our extra version of pager from pager.inc
   $hooks['views_mini_pager'] = $base + array(
     'variables' => array('tags' => array(), 'quantity' => 9, 'element' => 0, 'parameters' => array()),
-    'template' => 'views-mini-pager',
   );
 
   $variables = array(
@@ -133,7 +132,6 @@ function views_theme($existing, $type, $theme, $path) {
   );
   $hooks['views_view_grouping'] = $base + array(
     'variables' => array('view' => NULL, 'grouping' => NULL, 'grouping_level' => NULL, 'rows' => NULL, 'title' => NULL),
-    'template' => 'views-view-grouping',
   );
 
   $plugins = Views::getPluginDefinitions();
@@ -209,13 +207,11 @@ function views_theme($existing, $type, $theme, $path) {
   );
 
   $hooks['views_exposed_form'] = $base + array(
-    'template' => 'views-exposed-form',
     'render element' => 'form',
   );
 
   $hooks['views_more'] = $base + array(
     'variables' => array('more_url' => NULL, 'link_text' => 'more', 'view' => NULL),
-    'template' => 'views-more',
   );
 
   return $hooks;
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index a2beebac43a..94b45ea8e9d 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -71,30 +71,25 @@ function views_ui_theme() {
     // edit a view
     'views_ui_display_tab_setting' => array(
       'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()),
-      'template' => 'views-ui-display-tab-setting',
       'file' => 'views_ui.theme.inc',
     ),
     'views_ui_display_tab_bucket' => array(
       'render element' => 'element',
-      'template' => 'views-ui-display-tab-bucket',
       'file' => 'views_ui.theme.inc',
     ),
     'views_ui_rearrange_filter_form' => array(
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-      'template' => 'views-ui-rearrange-filter-form',
     ),
     'views_ui_expose_filter_form' => array(
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-      'template' => 'views-ui-expose-filter-form',
     ),
 
     // list views
     'views_ui_view_info' => array(
       'variables' => array('view' => NULL, 'displays' => NULL),
       'file' => 'views_ui.theme.inc',
-      'template' => 'views-ui-view-info',
     ),
 
     // Group of filters.
@@ -108,21 +103,18 @@ function views_ui_theme() {
     'views_ui_style_plugin_table' => array(
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-      'template' => 'views-ui-style-plugin-table',
     ),
 
     // When previewing a view.
     'views_ui_view_preview_section' => array(
       'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''),
       'file' => 'views_ui.theme.inc',
-      'template' => 'views-ui-view-preview-section',
     ),
 
     // Generic container wrapper, to use instead of theme_container when an id
     // is not desired.
     'views_ui_container' => array(
       'variables' => array('children' => NULL, 'attributes' => array()),
-      'template' => 'views-ui-container',
       'file' => 'views_ui.theme.inc',
     ),
   );