diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php
index bfc282f..834a55e 100644
--- a/core/modules/aggregator/src/Entity/Feed.php
+++ b/core/modules/aggregator/src/Entity/Feed.php
@@ -133,6 +133,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['fid']->setLabel(t('Feed ID'))
       ->setDescription(t('The ID of the aggregator feed.'));
 
+    $fields['uuid']->setDescription(t('The aggregator feed UUID.'));
+
     $fields['langcode']->setLabel(t('Language code'))
       ->setDescription(t('The feed language code.'));
 
diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
index bfefc55..e970e07 100644
--- a/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -150,6 +150,12 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['id']->setLabel(t('Custom block ID'))
       ->setDescription(t('The custom block ID.'));
 
+    $fields['uuid']->setDescription(t('The custom block UUID.'));
+
+    $fields['revision_id']->setDescription(t('The revision ID.'));
+
+    $fields['langcode']->setDescription(t('The custom block language code.'));
+
     $fields['type']->setLabel(t('Block type'))
       ->setDescription(t('The block type.'));
 
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index 90e568d..d626be3 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -214,9 +214,13 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['cid']->setLabel(t('Comment ID'))
       ->setDescription(t('The comment ID.'));
 
+    $fields['uuid']->setDescription(t('The comment UUID.'));
+
     $fields['comment_type']->setLabel(t('Comment Type'))
       ->setDescription(t('The comment type.'));
 
+    $fields['langcode']->setDescription(t('The comment language code.'));
+
     $fields['pid'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Parent ID'))
       ->setDescription(t('The parent comment ID if this is a reply to a comment.'))
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index 81fbe65..ee000ea 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -220,8 +220,10 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['fid']->setLabel(t('File ID'))
       ->setDescription(t('The file ID.'));
 
-   $fields['langcode']->setLabel(t('Language code'))
-      ->setDescription(t('The file language code.'));
+    $fields['uuid']->setDescription(t('The file UUID.'));
+
+    $fields['langcode']->setLabel(t('Language code'))
+     ->setDescription(t('The file language code.'));
 
     $fields['uid'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('User ID'))
diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index 0ef0bed..d70889b 100644
--- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -239,7 +239,12 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['id'] ->setLabel(t('Entity ID'))
       ->setDescription(t('The entity ID for this menu link content entity.'));
 
+    $fields['uuid']->setDescription(t('The content menu link UUID.'));
+
+    $fields['langcode']->setDescription(t('The menu link language code.'));
+
     $fields['bundle']
+      ->setDescription(t('The content menu link bundle.'))
       ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH)
       ->setSetting('is_ascii', TRUE);
 
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index d729bda..6ddaf05 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -108,9 +108,15 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     /** @var \Drupal\Core\Field\BaseFieldDefinition[] $fields */
     $fields = parent::baseFieldDefinitions($entity_type);
 
+    $fields['id']->setDescription(t('The ID of the shortcut.'));
+
+    $fields['uuid']->setDescription(t('The UUID of the shortcut.'));
+
     $fields['shortcut_set']->setLabel(t('Shortcut set'))
       ->setDescription(t('The bundle of the shortcut.'));
 
+    $fields['langcode']->setDescription(t('The language code of the shortcut.'));
+
     $fields['title'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
       ->setDescription(t('The name of the shortcut.'))
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 49c12ae..2e41e2d 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -107,9 +107,13 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['tid']->setLabel(t('Term ID'))
       ->setDescription(t('The term ID.'));
 
+    $fields['uuid']->setDescription(t('The term UUID.'));
+
     $fields['vid']->setLabel(t('Vocabulary'))
       ->setDescription(t('The vocabulary to which the term is assigned.'));
 
+    $fields['langcode']->setDescription(t('The term language code.'));
+
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
       ->setDescription(t('The term name.'))
diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index a02d704..030b9a9 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -431,6 +431,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['uid']->setLabel(t('User ID'))
       ->setDescription(t('The user ID.'));
 
+    $fields['uuid']->setDescription(t('The user UUID.'));
+
     $fields['langcode']->setLabel(t('Language code'))
       ->setDescription(t('The user language code.'))
       ->setDisplayOptions('form', ['type' => 'hidden']);