diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php
index 724a875..65e8699 100644
--- a/core/modules/aggregator/src/Entity/Feed.php
+++ b/core/modules/aggregator/src/Entity/Feed.php
@@ -14,6 +14,12 @@
  * @ContentEntityType(
  *   id = "aggregator_feed",
  *   label = @Translation("Aggregator feed"),
+ *   label_singular = @Translation("aggregator feed"),
+ *   label_plural = @Translation("aggregator feeds"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count aggregator feed",
+ *     plural = "@count aggregator feeds",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\aggregator\FeedStorage",
  *     "storage_schema" = "Drupal\aggregator\FeedStorageSchema",
diff --git a/core/modules/aggregator/src/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php
index 046ec41..f475574 100644
--- a/core/modules/aggregator/src/Entity/Item.php
+++ b/core/modules/aggregator/src/Entity/Item.php
@@ -16,6 +16,12 @@
  * @ContentEntityType(
  *   id = "aggregator_item",
  *   label = @Translation("Aggregator feed item"),
+ *   label_singular = @Translation("aggregator feed item"),
+ *   label_plural = @Translation("aggregator feed items"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count aggregator feed item",
+ *     plural = "@count aggregator feed items",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\aggregator\ItemStorage",
  *     "storage_schema" = "Drupal\aggregator\ItemStorageSchema",
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index 958fc7a..8da3324 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -15,6 +15,12 @@
  * @ContentEntityType(
  *   id = "block_content",
  *   label = @Translation("Custom block"),
+ *   label_singular = @Translation("custom block"),
+ *   label_plural = @Translation("custom blocks"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count custom block",
+ *     plural = "@count custom blocks",
+ *   ),
  *   bundle_label = @Translation("Custom block type"),
  *   handlers = {
  *     "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
diff --git a/core/modules/block_content/src/Entity/BlockContentType.php b/core/modules/block_content/src/Entity/BlockContentType.php
index 339b4e5..bc4022b 100644
--- a/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/core/modules/block_content/src/Entity/BlockContentType.php
@@ -11,6 +11,12 @@
  * @ConfigEntityType(
  *   id = "block_content_type",
  *   label = @Translation("Custom block type"),
+ *   label_singular = @Translation("custom block type"),
+ *   label_plural = @Translation("custom block types"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count custom block type",
+ *     plural = "@count custom block types",
+ *   ),
  *   handlers = {
  *     "form" = {
  *       "default" = "Drupal\block_content\BlockContentTypeForm",
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index 0f34925..d77b2b8 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -20,6 +20,12 @@
  * @ContentEntityType(
  *   id = "comment",
  *   label = @Translation("Comment"),
+ *   label_singular = @Translation("comment"),
+ *   label_plural = @Translation("comments"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count comment",
+ *     plural = "@count comments",
+ *   ),
  *   bundle_label = @Translation("Content type"),
  *   handlers = {
  *     "storage" = "Drupal\comment\CommentStorage",
diff --git a/core/modules/comment/src/Entity/CommentType.php b/core/modules/comment/src/Entity/CommentType.php
index b31dc63..a773c58 100644
--- a/core/modules/comment/src/Entity/CommentType.php
+++ b/core/modules/comment/src/Entity/CommentType.php
@@ -11,6 +11,12 @@
  * @ConfigEntityType(
  *   id = "comment_type",
  *   label = @Translation("Comment type"),
+ *   label_singular = @Translation("comment type"),
+ *   label_plural = @Translation("comment types"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count comment type",
+ *     plural = "@count comment types",
+ *   ),
  *   handlers = {
  *     "form" = {
  *       "default" = "Drupal\comment\CommentTypeForm",
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 255d514..8137169 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -11,6 +11,12 @@
  * @ConfigEntityType(
  *   id = "contact_form",
  *   label = @Translation("Contact form"),
+ *   label_singular = @Translation("contact form"),
+ *   label_plural = @Translation("contact forms"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count contact form",
+ *     plural = "@count contact forms",
+ *   ),
  *   handlers = {
  *     "access" = "Drupal\contact\ContactFormAccessControlHandler",
  *     "list_builder" = "Drupal\contact\ContactFormListBuilder",
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index 86ee30b..a6078cc 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -13,6 +13,12 @@
  * @ContentEntityType(
  *   id = "contact_message",
  *   label = @Translation("Contact message"),
+ *   label_singular = @Translation("contact message"),
+ *   label_plural = @Translation("contact messages"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count contact message",
+ *     plural = "@count contact messages",
+ *   ),
  *   handlers = {
  *     "access" = "Drupal\contact\ContactMessageAccessControlHandler",
  *     "storage" = "Drupal\Core\Entity\ContentEntityNullStorage",
diff --git a/core/modules/editor/src/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php
index 887d011..1080b62 100644
--- a/core/modules/editor/src/Entity/Editor.php
+++ b/core/modules/editor/src/Entity/Editor.php
@@ -11,6 +11,12 @@
  * @ConfigEntityType(
  *   id = "editor",
  *   label = @Translation("Text Editor"),
+ *   label_singular = @Translation("Text Editor"),
+ *   label_plural = @Translation("Text Editors"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count Text Editor",
+ *     plural = "@count Text Editors",
+ *   ),
  *   entity_keys = {
  *     "id" = "format"
  *   },
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index d7ccc30..6732ed9 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -14,6 +14,12 @@
  * @ConfigEntityType(
  *   id = "field_config",
  *   label = @Translation("Field"),
+ *   label_singular = @Translation("field"),
+ *   label_plural = @Translation("fields"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count field",
+ *     plural = "@count fields",
+ *   ),
  *   handlers = {
  *     "access" = "Drupal\field\FieldConfigAccessControlHandler",
  *     "storage" = "Drupal\field\FieldConfigStorage"
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index ba36e83..9b1a9bb 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -17,6 +17,12 @@
  * @ConfigEntityType(
  *   id = "field_storage_config",
  *   label = @Translation("Field storage"),
+ *   label_singular = @Translation("field storage"),
+ *   label_plural = @Translation("field storages"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count field storage",
+ *     plural = "@count field storages",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\field\FieldStorageConfigStorage"
  *   },
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index 7314435..9572ba3 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -23,6 +23,12 @@
  * @ConfigEntityType(
  *   id = "image_style",
  *   label = @Translation("Image style"),
+ *   label_singular = @Translation("image style"),
+ *   label_plural = @Translation("image styles"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count image style",
+ *     plural = "@count image styles",
+ *   ),
  *   handlers = {
  *     "form" = {
  *       "add" = "Drupal\image\Form\ImageStyleAddForm",
diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
index b19c328..fe95474 100644
--- a/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -16,6 +16,12 @@
  * @ConfigEntityType(
  *   id = "configurable_language",
  *   label = @Translation("Language"),
+ *   label_singular = @Translation("language"),
+ *   label_plural = @Translation("languages"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count language",
+ *     plural = "@count languages",
+ *   ),
  *   handlers = {
  *     "list_builder" = "Drupal\language\LanguageListBuilder",
  *     "access" = "Drupal\language\LanguageAccessControlHandler",
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 87ebd21..d3fd08a 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -14,6 +14,12 @@
  * @ConfigEntityType(
  *   id = "language_content_settings",
  *   label = @Translation("Content Language Settings"),
+ *   label_singular = @Translation("content language setting"),
+ *   label_plural = @Translation("content language settings"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count content language setting",
+ *     plural = "@count content language settings",
+ *   ),
  *   admin_permission = "administer languages",
  *   config_prefix = "content_settings",
  *   entity_keys = {
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index 44546e8..bc389f8 100644
--- a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -12,6 +12,12 @@
  * @ConfigEntityType(
  *   id = "responsive_image_style",
  *   label = @Translation("Responsive image style"),
+ *   label_singular = @Translation("responsive image style"),
+ *   label_plural = @Translation("responsive image styles"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count responsive image style",
+ *     plural = "@count responsive image styles",
+ *   ),
  *   handlers = {
  *     "list_builder" = "Drupal\responsive_image\ResponsiveImageStyleListBuilder",
  *     "form" = {
diff --git a/core/modules/search/src/Entity/SearchPage.php b/core/modules/search/src/Entity/SearchPage.php
index 1cb2f89..e11021c 100644
--- a/core/modules/search/src/Entity/SearchPage.php
+++ b/core/modules/search/src/Entity/SearchPage.php
@@ -16,6 +16,12 @@
  * @ConfigEntityType(
  *   id = "search_page",
  *   label = @Translation("Search page"),
+ *   label_singular = @Translation("search page"),
+ *   label_plural = @Translation("search pages"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count search page",
+ *     plural = "@count search pages",
+ *   ),
  *   handlers = {
  *     "access" = "Drupal\search\SearchPageAccessControlHandler",
  *     "list_builder" = "Drupal\search\SearchPageListBuilder",
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index 94b5c62..176f55e 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -18,6 +18,12 @@
  * @ContentEntityType(
  *   id = "shortcut",
  *   label = @Translation("Shortcut link"),
+ *   label_singular = @Translation("shortcut link"),
+ *   label_plural = @Translation("shortcut links"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count shortcut link",
+ *     plural = "@count shortcut links",
+ *   ),
  *   handlers = {
  *     "access" = "Drupal\shortcut\ShortcutAccessControlHandler",
  *     "form" = {
diff --git a/core/modules/shortcut/src/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php
index 7b42310..03cde3f 100644
--- a/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -12,6 +12,12 @@
  * @ConfigEntityType(
  *   id = "shortcut_set",
  *   label = @Translation("Shortcut set"),
+ *   label_singular = @Translation("shortcut set"),
+ *   label_plural = @Translation("shortcut sets"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count shortcut set",
+ *     plural = "@count shortcut sets",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\shortcut\ShortcutSetStorage",
  *     "access" = "Drupal\shortcut\ShortcutSetAccessControlHandler",
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 65386479..f7991fa 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -15,6 +15,12 @@
  * @ContentEntityType(
  *   id = "taxonomy_term",
  *   label = @Translation("Taxonomy term"),
+ *   label_singular = @Translation("taxonomy term"),
+ *   label_plural = @Translation("taxonomy terms"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count taxonomy term",
+ *     plural = "@count taxonomy terms",
+ *   ),
  *   bundle_label = @Translation("Vocabulary"),
  *   handlers = {
  *     "storage" = "Drupal\taxonomy\TermStorage",
diff --git a/core/modules/taxonomy/src/Entity/Vocabulary.php b/core/modules/taxonomy/src/Entity/Vocabulary.php
index fa6cc18..77a89a3 100644
--- a/core/modules/taxonomy/src/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/src/Entity/Vocabulary.php
@@ -12,6 +12,12 @@
  * @ConfigEntityType(
  *   id = "taxonomy_vocabulary",
  *   label = @Translation("Taxonomy vocabulary"),
+ *   label_singular = @Translation("taxonomy vocabulary"),
+ *   label_plural = @Translation("taxonomy vocabularies"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count taxonomy vocabulary",
+ *     plural = "@count taxonomy vocabularies",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\taxonomy\VocabularyStorage",
  *     "list_builder" = "Drupal\taxonomy\VocabularyListBuilder",
diff --git a/core/modules/tour/src/Entity/Tour.php b/core/modules/tour/src/Entity/Tour.php
index 5308fd3..d02b3de 100644
--- a/core/modules/tour/src/Entity/Tour.php
+++ b/core/modules/tour/src/Entity/Tour.php
@@ -12,6 +12,12 @@
  * @ConfigEntityType(
  *   id = "tour",
  *   label = @Translation("Tour"),
+ *   label_singular = @Translation("tour"),
+ *   label_plural = @Translation("tours"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count tour",
+ *     plural = "@count tours",
+ *   ),
  *   handlers = {
  *     "view_builder" = "Drupal\tour\TourViewBuilder"
  *   },
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index 5ecbc02..cf2da76 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -12,6 +12,12 @@
  * @ConfigEntityType(
  *   id = "user_role",
  *   label = @Translation("Role"),
+ *   label_singular = @Translation("role"),
+ *   label_plural = @Translation("roles"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count role",
+ *     plural = "@count roles",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\user\RoleStorage",
  *     "access" = "Drupal\user\RoleAccessControlHandler",
diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index 4896bad..da8c533 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -20,6 +20,12 @@
  * @ContentEntityType(
  *   id = "user",
  *   label = @Translation("User"),
+ *   label_singular = @Translation("user"),
+ *   label_plural = @Translation("users"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count user",
+ *     plural = "@count users",
+ *   ),
  *   handlers = {
  *     "storage" = "Drupal\user\UserStorage",
  *     "storage_schema" = "Drupal\user\UserStorageSchema",