diff --git a/src/Entity/Vote.php b/src/Entity/Vote.php
index 042104d..c9cc146 100644
--- a/src/Entity/Vote.php
+++ b/src/Entity/Vote.php
@@ -7,6 +7,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\user\UserInterface;
 use Drupal\votingapi\VoteInterface;
 
@@ -161,27 +162,23 @@ class Vote extends ContentEntityBase implements VoteInterface {
    * {@inheritdoc}
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    /** @var \Drupal\Core\Field\BaseFieldDefinition[] $fields */
+    $fields = parent::baseFieldDefinitions($entity_type);
 
-    $fields['id'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('ID'))
-      ->setDescription(t('The vote ID.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
+    // Override parent id description.
+    $fields['id']->setDescription(new TranslatableMarkup('The vote ID.'));
 
-    $fields['uuid'] = BaseFieldDefinition::create('uuid')
-      ->setLabel(t('UUID'))
-      ->setDescription(t('The vote UUID.'))
-      ->setReadOnly(TRUE);
+    // Override parent uuid description.
+    $fields['uuid']->setDescription(new TranslatableMarkup('The vote UUID.'));
+
+    // Override the parent bundle label and description.
+    $fields['type']->setLabel(new TranslatableMarkup('Type'))
+      ->setDescription(new TranslatableMarkup('The vote type.'));
 
-    $fields['type'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Type'))
-      ->setDescription(t('The vote type.'))
-      ->setSetting('target_type', 'vote_type')
-      ->setReadOnly(TRUE);
 
     $fields['entity_type'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Entity Type'))
-      ->setDescription(t('The type from the voted entity.'))
+      ->setLabel(new TranslatableMarkup('Entity Type'))
+      ->setDescription(new TranslatableMarkup('The type from the voted entity.'))
       ->setDefaultValue('node')
       ->setSettings([
         'max_length' => 64,
@@ -189,19 +186,19 @@ class Vote extends ContentEntityBase implements VoteInterface {
       ->setRequired(TRUE);
 
     $fields['entity_id'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Voted entity'))
-      ->setDescription(t('The ID from the voted entity'))
+      ->setLabel(new TranslatableMarkup('Voted entity'))
+      ->setDescription(new TranslatableMarkup('The ID from the voted entity'))
       ->setDefaultValue(0)
       ->setRequired(TRUE);
 
     $fields['value'] = BaseFieldDefinition::create('float')
-      ->setLabel(t('Value'))
-      ->setDescription(t('The numeric value of the vote.'))
+      ->setLabel(new TranslatableMarkup('Value'))
+      ->setDescription(new TranslatableMarkup('The numeric value of the vote.'))
       ->setDefaultValue(0)
       ->setRequired(TRUE);
 
     $fields['value_type'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Value Type'))
+      ->setLabel(new TranslatableMarkup('Value Type'))
       ->setSettings([
         'max_length' => 64,
       ])
@@ -214,12 +211,12 @@ class Vote extends ContentEntityBase implements VoteInterface {
       ->setDefaultValueCallback('Drupal\votingapi\Entity\Vote::getCurrentUserId');
 
     $fields['timestamp'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Created'))
-      ->setDescription(t('The time that the entity was created.'));
+      ->setLabel(new TranslatableMarkup('Created'))
+      ->setDescription(new TranslatableMarkup('The time that the vote was created.'));
 
     $fields['vote_source'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Vote Source'))
-      ->setDescription(t('The IP address hash from the user who submitted the vote.'))
+      ->setLabel(new TranslatableMarkup('Vote Source'))
+      ->setDescription(new TranslatableMarkup('The IP address hash from the user who submitted the vote.'))
       ->setDefaultValueCallback('Drupal\votingapi\Entity\Vote::getCurrentIp')
       ->setSettings([
         'max_length' => 255,