diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 39e15ea..075f30d 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -311,7 +311,7 @@ function block_menu_delete(Menu $menu) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_delete() for configurable_language entities.
  *
  * Delete the potential block visibility settings of the deleted language.
  */
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index cea9627..387b8fa 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -294,7 +294,7 @@ function book_node_predelete(EntityInterface $node) {
 }
 
 /**
- * Implements hook_node_prepare_form().
+ * Implements hook_ENTITY_TYPE_prepare_form() for node entities.
  */
 function book_node_prepare_form(NodeInterface $node, $operation, FormStateInterface $form_state) {
   /** @var \Drupal\book\BookManagerInterface $book_manager */
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index bdf53bf..c093cdd 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -169,7 +169,7 @@ function comment_field_config_update(FieldConfigInterface $field) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_insert() for field_storage_config entities.
  */
 function comment_field_storage_config_insert(FieldStorageConfigInterface $field_storage) {
   if ($field_storage->getType() == 'comment') {
diff --git a/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module b/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module
index 0273cc6..e09174e 100644
--- a/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module
+++ b/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module
@@ -23,7 +23,7 @@ function config_entity_static_cache_test_config_test_load($entities) {
 }
 
 /**
- * Implements hook_entity_type_alter().
+ * Implements hook_ENTITY_TYPE_load() for config_test entities.
  */
 function config_entity_static_cache_test_entity_type_alter(array &$entity_types) {
   /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 1f3a30b..1472ecd 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -29,7 +29,7 @@ function config_test_cache_flush() {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_create().
+ * Implements hook_ENTITY_TYPE_create() for config_test entities.
  */
 function config_test_config_test_create(ConfigTest $config_test) {
   if (\Drupal::state()->get('config_test.prepopulate')) {
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index 33516d7..5d8278f 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -64,7 +64,7 @@ function entity_reference_field_widget_info_alter(&$info) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_update() for field_storage_config entities.
  *
  * Reset the instance handler settings, when the target type is changed.
  */
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index f1faacb..2e7439f 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -360,7 +360,7 @@ function image_entity_presave(EntityInterface $entity) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_update() for field_storage_config entities.
  */
 function image_field_storage_config_update(FieldStorageConfigInterface $field_storage) {
   if ($field_storage->type != 'image') {
@@ -438,7 +438,7 @@ function image_field_config_update(FieldConfigInterface $field) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_delete() for field_storage_config entities.
  */
 function image_field_storage_config_delete(FieldStorageConfigInterface $field) {
   if ($field->type != 'image') {
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index a605360..40472df 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -416,7 +416,7 @@ function language_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_insert() for configurable_language entities.
  */
 function language_configurable_language_insert(ConfigurableLanguage $language) {
   if ($language->isLocked()) {
@@ -430,7 +430,7 @@ function language_configurable_language_insert(ConfigurableLanguage $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_delete() for configurable_language entities.
  */
 function language_configurable_language_delete(ConfigurableLanguage $language) {
   // Remove language from language prefix list.
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 04dfb80..bea740b 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -196,7 +196,7 @@ function locale_theme() {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_insert() for configurable_language entities.
  */
 function locale_configurable_language_insert(ConfigurableLanguage $language) {
   // @todo move these two cache clears out. See http://drupal.org/node/1293252
@@ -207,7 +207,7 @@ function locale_configurable_language_insert(ConfigurableLanguage $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_update() for configurable_language entities.
  */
 function locale_configurable_language_update(ConfigurableLanguage $language) {
   // @todo move these two cache clears out. See http://drupal.org/node/1293252
@@ -218,7 +218,7 @@ function locale_configurable_language_update(ConfigurableLanguage $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_delete() for configurable_language entities.
  */
 function locale_configurable_language_delete(ConfigurableLanguage $language) {
   // Remove translations.
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 1669aea..b13854f 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -156,7 +156,7 @@ function menu_ui_node_update(EntityInterface $node) {
 }
 
 /**
- * Helper for hook_ENTITY_TYPE_insert() and hook_ENTITY_TYPE_update() for nodes.
+ * Helper for hook_ENTITY_TYPE_insert() and hook_ENTITY_TYPE_update() for node entities.
  */
 function menu_ui_node_save(EntityInterface $node) {
   if (!empty($node->menu)) {
@@ -212,7 +212,7 @@ function menu_ui_node_predelete(EntityInterface $node) {
 }
 
 /**
- * Implements hook_node_prepare_form().
+ * Implements hook_ENTITY_TYPE_prepare_form() for node entities.
  */
 function menu_ui_node_prepare_form(NodeInterface $node, $operation, FormStateInterface $form_state) {
   if (!$form_state->get('menu_link_definition')) {
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index d4e159f..81e0f98 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1398,7 +1398,7 @@ function node_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'.
+ * Implements hook_ENTITY_TYPE_delete() for configurable_language entities.
  */
 function node_configurable_language_delete(ConfigurableLanguage $language) {
   // On nodes with this language, unset the language.
diff --git a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
index 232fde7..1cd62a3 100644
--- a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
+++ b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
@@ -15,7 +15,7 @@
 class NodeEntityViewModeAlterTest extends NodeTestBase {
 
   /**
-   * Enable dummy module that implements hook_ENTITY_TYPE_view() for nodes.
+   * Enable dummy module that implements hook_ENTITY_TYPE_view() for node entities.
    */
   public static $modules = array('node_test');
 
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index ae6760d..6fbf0c5 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -34,14 +34,14 @@ function options_help($route_name, RouteMatchInterface $route_match) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_update() for field_storage_config entities.
  */
 function options_field_storage_config_update(FieldStorageConfigInterface $field_storage) {
   drupal_static_reset('options_allowed_values');
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'field_storage_config'.
+ * Implements hook_ENTITY_TYPE_delete() for field_storage_config entities.
  */
 function options_field_storage_config_delete(FieldStorageConfigInterface $field_storage) {
   drupal_static_reset('options_allowed_values');
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 12950bc..8b2dbcd 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -307,7 +307,7 @@ function entity_test_mulrev_load($id, $reset = FALSE) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert().
+ * Implements hook_ENTITY_TYPE_insert() for entity_test entities.
  */
 function entity_test_entity_test_insert($entity) {
   if ($entity->name->value == 'fail_insert') {
@@ -415,14 +415,14 @@ function entity_test_entity_translation_delete(EntityInterface $translation) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_translation_insert().
+ * Implements hook_ENTITY_TYPE_translation_insert() for entity_test_mul entities.
  */
 function entity_test_entity_test_mul_translation_insert(EntityInterface $translation) {
   _entity_test_record_hooks('entity_test_mul_translation_insert', $translation->language()->getId());
 }
 
 /**
- * Implements hook_ENTITY_TYPE_translation_delete().
+ * Implements hook_ENTITY_TYPE_translation_delete() for entity_test_mul entities.
  */
 function entity_test_entity_test_mul_translation_delete(EntityInterface $translation) {
   _entity_test_record_hooks('entity_test_mul_translation_delete', $translation->language()->getId());
@@ -491,7 +491,7 @@ function entity_test_entity_access(EntityInterface $entity, $operation, AccountI
 }
 
 /**
- * Implements hook_ENTITY_TYPE_access().
+ * Implements hook_ENTITY_TYPE_access() for entity_test entities.
  */
 function entity_test_entity_test_access(EntityInterface $entity, $operation, AccountInterface $account, $langcode) {
   \Drupal::state()->set('entity_test_entity_test_access', TRUE);
@@ -511,7 +511,7 @@ function entity_test_entity_create_access(AccountInterface $account, $context, $
 }
 
 /**
- * Implements hook_ENTITY_TYPE_create_access().
+ * Implements hook_ENTITY_TYPE_create_access() for entity_test entities.
  */
 function entity_test_entity_test_create_access(AccountInterface $account, $context, $entity_bundle) {
   \Drupal::state()->set('entity_test_entity_test_create_access', TRUE);
diff --git a/core/modules/tour/tests/tour_test/tour_test.module b/core/modules/tour/tests/tour_test/tour_test.module
index 69a9a54..7ec75a4 100644
--- a/core/modules/tour/tests/tour_test/tour_test.module
+++ b/core/modules/tour/tests/tour_test/tour_test.module
@@ -8,7 +8,7 @@
 use Drupal\Core\Entity\EntityInterface;
 
 /**
- * Implements hook_ENTITY_TYPE_load() for tour.
+ * Implements hook_ENTITY_TYPE_load() for tour entities.
  */
 function tour_test_tour_load($entities) {
   if (isset($entities['tour-entity-create-test-en'])) {
@@ -17,7 +17,7 @@ function tour_test_tour_load($entities) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_presave() for tour.
+ * Implements hook_ENTITY_TYPE_presave() for tour entities.
  */
 function tour_test_tour_presave($entity) {
   if ($entity->id() == 'tour-entity-create-test-en') {