diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 416571d..a60459f 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -496,7 +496,7 @@ function aggregator_filter_xss($value) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function aggregator_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'aggregator') {
diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php
index 93a113a..8d02a0d 100644
--- a/core/modules/block/block.api.php
+++ b/core/modules/block/block.api.php
@@ -20,7 +20,7 @@
  * If the module wishes to act on the rendered HTML of the block rather than
  * the structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement hook_preprocess_HOOK() for
- * block.html.twig. See drupal_render() and theme() documentation respectively
+ * block templates. See drupal_render() and theme() documentation respectively
  * for details.
  *
  * In addition to hook_block_view_alter(), which is called for all blocks, there
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index e113661..e31332d 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -953,7 +953,7 @@ function _book_link_defaults($nid) {
 }
 
  /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function book_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'book') {
diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php
index ec1707f..95f77b9 100644
--- a/core/modules/comment/comment.api.php
+++ b/core/modules/comment/comment.api.php
@@ -113,7 +113,7 @@ function hook_comment_view(\Drupal\comment\Plugin\Core\Entity\Comment $comment,
  * If the module wishes to act on the rendered HTML of the comment rather than
  * the structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement hook_preprocess_HOOK() for
- * comment.html.twig. See drupal_render() documentation for details.
+ * comment templates. See drupal_render() documentation for details.
  *
  * @param $build
  *   A renderable array representing the comment.
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index b38892d..3c36d58 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1462,7 +1462,7 @@ function comment_preview(Comment $comment) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function comment_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'comment') {
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index ee46dac..11ede91 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -159,7 +159,7 @@ function edit_field_formatter_info_alter(&$info) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for field.html.twig.
+ * Implements hook_preprocess_HOOK() for field templates.
  */
 function edit_preprocess_field(&$variables) {
   $element = $variables['element'];
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 8c92381..9f7a51d 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -946,7 +946,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function forum_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'forum') {
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 36821c0..55592df 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -63,7 +63,7 @@ function help_help($path, $arg) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function help_preprocess_block(&$variables) {
   if ($variables['plugin_id'] == 'system_help_block') {
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 7e5b87b..f3d5903 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -787,7 +787,7 @@ function language_language_delete($language) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function language_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'language') {
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 932b2a1..d658fbf 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -869,7 +869,7 @@ function locale_system_file_system_settings_submit(&$form, $form_state) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for node.html.twig.
+ * Implements hook_preprocess_HOOK() for node templates.
  */
 function locale_preprocess_node(&$variables) {
   if ($variables['node']->langcode != Language::LANGCODE_NOT_SPECIFIED) {
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index df5f602..cff516f 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -736,7 +736,7 @@ function menu_get_menus($all = TRUE) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function menu_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'menu') {
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index c891ec0..6fdcd4a 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -824,7 +824,7 @@ function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entit
  * If the module wishes to act on the rendered HTML of the node rather than the
  * structured content array, it may use this hook to add a #post_render
  * callback.  Alternatively, it could also implement hook_preprocess_HOOK() for
- * node.html.twig. See drupal_render() and theme() documentation respectively
+ * node templates. See drupal_render() and theme() documentation respectively
  * for details.
  *
  * @param $build
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 5a6d53a..a5b953a 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -651,7 +651,7 @@ function node_is_page(EntityInterface $node) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function node_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'node') {
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 4a881cd..6317d89 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -340,7 +340,7 @@ function overlay_system_info_alter(&$info, $file, $type) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for html.html.twig.
+ * Implements hook_preprocess_HOOK() for the html template.
  *
  * If the current page request is inside the overlay, add appropriate classes
  * to the <body> element, and simplify the page title.
@@ -355,7 +355,7 @@ function overlay_preprocess_html(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
+ * Implements hook_preprocess_HOOK() for the maintenance page template.
  *
  * If the current page request is inside the overlay, add appropriate classes
  * to the <body> element, and simplify the page title.
@@ -365,7 +365,7 @@ function overlay_preprocess_maintenance_page(&$variables) {
 }
 
 /**
- * Implements template_preprocess_HOOK() for overlay.html.twig
+ * Implements template_preprocess_HOOK() for overlay templates.
  *
  * If the current page request is inside the overlay, add appropriate classes
  * to the <body> element, and simplify the page title.
@@ -388,7 +388,7 @@ function template_preprocess_overlay(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for page.html.twig.
+ * Implements hook_preprocess_HOOK() for page templates.
  *
  * If the current page request is inside the overlay, hide the tabs.
  *
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index aa55ee1..28596e9 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -226,7 +226,7 @@ function rdf_theme() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for html.html.twig.
+ * Implements hook_preprocess_HOOK() for the html template.
  */
 function rdf_preprocess_html(&$variables) {
   // Adds RDF namespace prefix bindings in the form of an RDFa 1.1 prefix
@@ -241,7 +241,7 @@ function rdf_preprocess_html(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for node.html.twig.
+ * Implements hook_preprocess_HOOK() for node templates.
  */
 function rdf_preprocess_node(&$variables) {
   // Adds RDFa markup to the node container. The about attribute specifies the
@@ -329,7 +329,7 @@ function rdf_preprocess_node(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for field.html.twig.
+ * Implements hook_preprocess_HOOK() for field templates.
  */
 function rdf_preprocess_field(&$variables) {
   $element = $variables['element'];
@@ -366,7 +366,7 @@ function rdf_preprocess_field(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for user.html.twig.
+ * Implements hook_preprocess_HOOK() for user templates.
  */
 function rdf_preprocess_user(&$variables) {
   $account = $variables['elements']['#user'];
@@ -460,7 +460,7 @@ function rdf_preprocess_username(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for comment.html.twig.
+ * Implements hook_preprocess_HOOK() for comment templates.
  */
 function rdf_preprocess_comment(&$variables) {
   $comment = $variables['comment'];
@@ -549,7 +549,7 @@ function rdf_preprocess_comment(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for taxonomy-term.html.twig.
+ * Implements hook_preprocess_HOOK() for taxonomy term templates.
  */
 function rdf_preprocess_taxonomy_term(&$variables) {
   $term = $variables['term'];
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 9e9921b..6daa8e5 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -136,7 +136,7 @@ function search_permission() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function search_preprocess_block(&$variables) {
   if ($variables['plugin_id'] == 'search_form_block') {
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index a46f34a..09bc939 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -439,7 +439,7 @@ function shortcut_renderable_links($shortcut_set = NULL) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function shortcut_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'shortcut') {
@@ -448,7 +448,7 @@ function shortcut_preprocess_block(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for page.html.twig.
+ * Implements hook_preprocess_HOOK() for page templates.
  */
 function shortcut_preprocess_page(&$variables) {
   // Only display the shortcut link if the user has the ability to edit
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index c40fc6a..cfa217e 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -237,7 +237,7 @@ function statistics_update_index() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function statistics_preprocess_block(&$variables) {
   if ($variables['configuration']['module'] == 'statistics') {
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 4a7cdf4..28d11e5 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2408,7 +2408,7 @@ function system_user_timezone(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for block.html.twig.
+ * Implements hook_preprocess_HOOK() for block templates.
  */
 function system_preprocess_block(&$variables) {
   // Derive the base plugin ID.
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 0aa4a01..e316df4 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -150,7 +150,7 @@ function _theme_test_suggestion() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for html.html.twig.
+ * Implements hook_preprocess_HOOK() for html template.
  */
 function theme_test_preprocess_html(&$variables) {
   $variables['html_attributes']['theme_test_html_attribute'] = 'theme test html attribute value';
diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php
index 0006808..668cd88 100644
--- a/core/modules/taxonomy/taxonomy.api.php
+++ b/core/modules/taxonomy/taxonomy.api.php
@@ -282,7 +282,7 @@ function hook_taxonomy_term_view(\Drupal\taxonomy\Plugin\Core\Entity\Term $term,
  * If the module wishes to act on the rendered HTML of the term rather than the
  * structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement
- * hook_preprocess_HOOK() for taxonomy-term.html.twig. See drupal_render() and
+ * hook_preprocess_HOOK() for taxonomy term templates. See drupal_render() and
  * theme() documentation respectively for details.
  *
  * @param $build
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index 68ac0f0..249c758 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -104,7 +104,7 @@ function tour_toolbar() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for page.html.twig.
+ * Implements hook_preprocess_HOOK() for page templates.
  */
 function tour_preprocess_page(&$variables) {
   if (!user_access('access tour')) {
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index a8058ff..c9e5a15 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -347,7 +347,7 @@ function hook_user_view(\Drupal\user\UserInterface $account, \Drupal\entity\Plug
  * If the module wishes to act on the rendered HTML of the user rather than the
  * structured content array, it may use this hook to add a #post_render callback.
  * Alternatively, it could also implement hook_preprocess_HOOK() for
- * user.html.twig. See drupal_render() and theme() documentation
+ * user templates. See drupal_render() and theme() documentation
  * respectively for details.
  *
  * @param $build
diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.module b/core/modules/views/tests/modules/views_test_data/views_test_data.module
index 6d12697..f624ce7 100644
--- a/core/modules/views/tests/modules/views_test_data/views_test_data.module
+++ b/core/modules/views/tests/modules/views_test_data/views_test_data.module
@@ -56,7 +56,7 @@ function views_test_data_handler_test_access_callback_argument($argument = FALSE
 }
 
 /**
- * Implements hook_preprocess_HOOK() for views-view-table.html.twig.
+ * Implements hook_preprocess_HOOK() for views-view-table templates.
  */
 function views_test_data_preprocess_views_view_table(&$variables) {
   if ($variables['view']->storage->id() == 'test_view_render') {
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 295c805..57bdc26 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -212,7 +212,7 @@ function views_ui_library_info() {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for views-view.html.twig.
+ * Implements hook_preprocess_HOOK() for views-view templates.
  */
 function views_ui_preprocess_views_view(&$variables) {
   $view = $variables['view'];
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 899f3fd..4be93a9 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_preprocess_HOOK() for html.html.twig.
+ * Implements hook_preprocess_HOOK() for html templates.
  *
  * Adds body classes if certain regions have content.
  */
@@ -30,7 +30,7 @@ function bartik_preprocess_html(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for page.html.twig.
+ * Implements hook_preprocess_HOOK() for page templates.
  */
 function bartik_preprocess_page(&$variables) {
   // Pass the main menu and secondary menu to the template as render arrays.
@@ -73,7 +73,7 @@ function bartik_preprocess_page(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
+ * Implements hook_preprocess_HOOK() for maintenance-page templates.
  */
 function bartik_preprocess_maintenance_page(&$variables) {
   // By default, site_name is set to Drupal if no db connection is available
@@ -102,7 +102,7 @@ function bartik_preprocess_maintenance_page(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for node.html.twig.
+ * Implements hook_preprocess_HOOK() for node templates.
  */
 function bartik_preprocess_node(&$variables) {
   // Remove the "Add new comment" link on teasers or when the comment form is
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 2f5a6c9..5c365ca 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -8,7 +8,7 @@
 use Drupal\Core\Template\RenderWrapper;
 
 /**
- * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
+ * Implements hook_preprocess_HOOK() for maintenance-page templates.
  */
 function seven_preprocess_maintenance_page(&$variables) {
   // While markup for normal pages is split into page.html.twig and
@@ -20,14 +20,14 @@ function seven_preprocess_maintenance_page(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for html.html.twig.
+ * Implements hook_preprocess_HOOK() for html templates.
  */
 function seven_preprocess_html(&$variables) {
   drupal_add_library('system', 'normalize');
 }
 
 /**
- * Implements hook_preprocess_HOOK() for page.html.twig.
+ * Implements hook_preprocess_HOOK() for page templates.
  */
 function seven_preprocess_page(&$variables) {
   $variables['primary_local_tasks'] = $variables['tabs'];