diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php
index ddabea8..1e33219 100644
--- a/core/modules/aggregator/src/Entity/Feed.php
+++ b/core/modules/aggregator/src/Entity/Feed.php
@@ -14,6 +14,7 @@
  * @ContentEntityType(
  *   id = "aggregator_feed",
  *   label = @Translation("Aggregator feed"),
+ *   label_collection = @Translation("Aggregator feeds"),
  *   label_singular = @Translation("aggregator feed"),
  *   label_plural = @Translation("aggregator feeds"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/aggregator/src/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php
index 824a078..b637171 100644
--- a/core/modules/aggregator/src/Entity/Item.php
+++ b/core/modules/aggregator/src/Entity/Item.php
@@ -16,6 +16,7 @@
  * @ContentEntityType(
  *   id = "aggregator_item",
  *   label = @Translation("Aggregator feed item"),
+ *   label_collection = @Translation("Aggregator feed items"),
  *   label_singular = @Translation("aggregator feed item"),
  *   label_plural = @Translation("aggregator feed items"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 58386ab..ece8de3 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -17,6 +17,7 @@
  * @ConfigEntityType(
  *   id = "block",
  *   label = @Translation("Block"),
+ *   label_collection = @Translation("Blocks"),
  *   label_singular = @Translation("block"),
  *   label_plural = @Translation("blocks"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index b89481b..7696da0 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -15,6 +15,7 @@
  * @ContentEntityType(
  *   id = "block_content",
  *   label = @Translation("Custom block"),
+ *   label_collection = @Translation("Custom blocks"),
  *   label_singular = @Translation("custom block"),
  *   label_plural = @Translation("custom blocks"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/block_content/src/Entity/BlockContentType.php b/core/modules/block_content/src/Entity/BlockContentType.php
index 48c1339..20f9593 100644
--- a/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/core/modules/block_content/src/Entity/BlockContentType.php
@@ -11,6 +11,7 @@
  * @ConfigEntityType(
  *   id = "block_content_type",
  *   label = @Translation("Custom block type"),
+ *   label_collection = @Translation("Custom block types"),
  *   label_singular = @Translation("custom block type"),
  *   label_plural = @Translation("custom block types"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 42702fd..91364b0 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "contact_form",
  *   label = @Translation("Contact form"),
+ *   label_collection = @Translation("Contact forms"),
  *   label_singular = @Translation("contact form"),
  *   label_plural = @Translation("contact forms"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index f32839c..f41d9f1 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -13,6 +13,7 @@
  * @ContentEntityType(
  *   id = "contact_message",
  *   label = @Translation("Contact message"),
+ *   label_collection = @Translation("Contact messages"),
  *   label_singular = @Translation("contact message"),
  *   label_plural = @Translation("contact messages"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/editor/src/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php
index b476a21..07c9d24 100644
--- a/core/modules/editor/src/Entity/Editor.php
+++ b/core/modules/editor/src/Entity/Editor.php
@@ -11,15 +11,16 @@
  * @ConfigEntityType(
  *   id = "editor",
  *   label = @Translation("Text Editor"),
- *   handlers = {
- *     "access" = "Drupal\editor\EditorAccessControlHandler",
- *   },
+ *   label_collection = @Translation("Text Editors"),
  *   label_singular = @Translation("text editor"),
  *   label_plural = @Translation("text editors"),
  *   label_count = @PluralTranslation(
  *     singular = "@count text editor",
  *     plural = "@count text editors",
  *   ),
+ *   handlers = {
+ *     "access" = "Drupal\editor\EditorAccessControlHandler",
+ *   },
  *   entity_keys = {
  *     "id" = "format"
  *   },
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 6af8aee..69be43c 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -15,6 +15,7 @@
  * @ConfigEntityType(
  *   id = "field_config",
  *   label = @Translation("Field"),
+ *   label_collection = @Translation("Fields"),
  *   label_singular = @Translation("field"),
  *   label_plural = @Translation("fields"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 5e4e94e..4e8ad91 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -18,6 +18,7 @@
  * @ConfigEntityType(
  *   id = "field_storage_config",
  *   label = @Translation("Field storage"),
+ *   label_collection = @Translation("Field storages"),
  *   label_singular = @Translation("field storage"),
  *   label_plural = @Translation("field storages"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index b1b4ccc..33f6d74 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -18,6 +18,7 @@
  * @ContentEntityType(
  *   id = "file",
  *   label = @Translation("File"),
+ *   label_collection = @Translation("Files"),
  *   label_singular = @Translation("file"),
  *   label_plural = @Translation("files"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 5e9b996..604ce01 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -16,6 +16,7 @@
  * @ConfigEntityType(
  *   id = "filter_format",
  *   label = @Translation("Text format"),
+ *   label_collection = @Translation("Text formats"),
  *   label_singular = @Translation("text format"),
  *   label_plural = @Translation("text formats"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index a73846e..da00c7f 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -25,6 +25,7 @@
  * @ConfigEntityType(
  *   id = "image_style",
  *   label = @Translation("Image style"),
+ *   label_collection = @Translation("Image styles"),
  *   label_singular = @Translation("image style"),
  *   label_plural = @Translation("image styles"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
index fd7e397..138bb54 100644
--- a/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -16,6 +16,7 @@
  * @ConfigEntityType(
  *   id = "configurable_language",
  *   label = @Translation("Language"),
+ *   label_collection = @Translation("Languages"),
  *   label_singular = @Translation("language"),
  *   label_plural = @Translation("languages"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index b20f25a..0012e79 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -14,6 +14,7 @@
  * @ConfigEntityType(
  *   id = "language_content_settings",
  *   label = @Translation("Content Language Settings"),
+ *   label_collection = @Translation("Content Language Settings"),
  *   label_singular = @Translation("content language setting"),
  *   label_plural = @Translation("content languages settings"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index 2ae1089..49235b9 100644
--- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -19,6 +19,7 @@
  * @ContentEntityType(
  *   id = "menu_link_content",
  *   label = @Translation("Custom menu link"),
+ *   label_collection = @Translation("Custom menu links"),
  *   label_singular = @Translation("custom menu link"),
  *   label_plural = @Translation("custom menu links"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/node/src/Entity/NodeType.php b/core/modules/node/src/Entity/NodeType.php
index f6f118a..6daa45d 100644
--- a/core/modules/node/src/Entity/NodeType.php
+++ b/core/modules/node/src/Entity/NodeType.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "node_type",
  *   label = @Translation("Content type"),
+ *   label_collection = @Translation("Content types"),
  *   label_singular = @Translation("content type"),
  *   label_plural = @Translation("content types"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index 7b68c03..0b4dfd7 100644
--- a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "responsive_image_style",
  *   label = @Translation("Responsive image style"),
+ *   label_collection = @Translation("Responsive image styles"),
  *   label_singular = @Translation("responsive image style"),
  *   label_plural = @Translation("responsive image styles"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/rest/src/Entity/RestResourceConfig.php b/core/modules/rest/src/Entity/RestResourceConfig.php
index 57137d6..47faa01 100644
--- a/core/modules/rest/src/Entity/RestResourceConfig.php
+++ b/core/modules/rest/src/Entity/RestResourceConfig.php
@@ -13,6 +13,7 @@
  * @ConfigEntityType(
  *   id = "rest_resource_config",
  *   label = @Translation("REST resource configuration"),
+ *   label_collection = @Translation("REST resource configurations"),
  *   label_singular = @Translation("REST resource configuration"),
  *   label_plural = @Translation("REST resource configurations"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/search/src/Entity/SearchPage.php b/core/modules/search/src/Entity/SearchPage.php
index 9dbf076..94ae70d 100644
--- a/core/modules/search/src/Entity/SearchPage.php
+++ b/core/modules/search/src/Entity/SearchPage.php
@@ -16,6 +16,7 @@
  * @ConfigEntityType(
  *   id = "search_page",
  *   label = @Translation("Search page"),
+ *   label_collection = @Translation("Search pages"),
  *   label_singular = @Translation("search page"),
  *   label_plural = @Translation("search pages"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index ad03898..92e59fb 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -18,6 +18,7 @@
  * @ContentEntityType(
  *   id = "shortcut",
  *   label = @Translation("Shortcut link"),
+ *   label_collection = @Translation("Shortcut links"),
  *   label_singular = @Translation("shortcut link"),
  *   label_plural = @Translation("shortcut links"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/shortcut/src/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php
index c04d444..819f647 100644
--- a/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "shortcut_set",
  *   label = @Translation("Shortcut set"),
+ *   label_collection = @Translation("Shortcut sets"),
  *   label_singular = @Translation("shortcut set"),
  *   label_plural = @Translation("shortcut sets"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/system/src/Entity/Action.php b/core/modules/system/src/Entity/Action.php
index e9f41bc..964a64e 100644
--- a/core/modules/system/src/Entity/Action.php
+++ b/core/modules/system/src/Entity/Action.php
@@ -15,6 +15,7 @@
  * @ConfigEntityType(
  *   id = "action",
  *   label = @Translation("Action"),
+ *   label_collection = @Translation("Actions"),
  *   label_singular = @Translation("action"),
  *   label_plural = @Translation("actions"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/system/src/Entity/Menu.php b/core/modules/system/src/Entity/Menu.php
index 1328998..9547d42 100644
--- a/core/modules/system/src/Entity/Menu.php
+++ b/core/modules/system/src/Entity/Menu.php
@@ -11,6 +11,7 @@
  * @ConfigEntityType(
  *   id = "menu",
  *   label = @Translation("Menu"),
+ *   label_collection = @Translation("Menus"),
  *   label_singular = @Translation("menu"),
  *   label_plural = @Translation("menus"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 9fc7257..986ff67 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -15,6 +15,7 @@
  * @ContentEntityType(
  *   id = "taxonomy_term",
  *   label = @Translation("Taxonomy term"),
+ *   label_collection = @Translation("Taxonomy terms"),
  *   label_singular = @Translation("taxonomy term"),
  *   label_plural = @Translation("taxonomy terms"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/tour/src/Entity/Tour.php b/core/modules/tour/src/Entity/Tour.php
index 2eac965..feca058 100644
--- a/core/modules/tour/src/Entity/Tour.php
+++ b/core/modules/tour/src/Entity/Tour.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "tour",
  *   label = @Translation("Tour"),
+ *   label_collection = @Translation("Tours"),
  *   label_singular = @Translation("tour"),
  *   label_plural = @Translation("tours"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index f3151bc..3512fee 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -12,6 +12,7 @@
  * @ConfigEntityType(
  *   id = "user_role",
  *   label = @Translation("Role"),
+ *   label_collection = @Translation("Roles"),
  *   label_singular = @Translation("role"),
  *   label_plural = @Translation("roles"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index 8a09433..979819f 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -22,6 +22,7 @@
  * @ContentEntityType(
  *   id = "user",
  *   label = @Translation("User"),
+ *   label_collection = @Translation("Users"),
  *   label_singular = @Translation("user"),
  *   label_plural = @Translation("users"),
  *   label_count = @PluralTranslation(
diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index 3587904d..5c69abc 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -19,6 +19,7 @@
  * @ConfigEntityType(
  *   id = "view",
  *   label = @Translation("View", context = "View entity type"),
+ *   label_collection = @Translation("Views", context = "View entity type"),
  *   label_singular = @Translation("view", context = "View entity type"),
  *   label_plural = @Translation("views", context = "View entity type"),
  *   label_count = @PluralTranslation(