diff --git a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
index 1657d15..c05cfad 100644
--- a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
+++ b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
@@ -41,7 +41,7 @@ public function validate($module) {
     $reasons = [];
     foreach ($entity_types as $entity_type) {
       if ($module == $entity_type->getProvider() && $entity_type instanceof ContentEntityTypeInterface && $this->entityManager->getStorage($entity_type->id())->hasData()) {
-        $reasons[] = $this->t('There is content for the entity type: @entity_type. Go <a href=":link">here</a> to remove these data.', [
+        $reasons[] = $this->t('There is content for the entity type: @entity_type. <a href=":link">Remove @entity_type entities</a>.', [
           '@entity_type' => $entity_type->getLabel(),
           ':link' => Url::fromRoute('system.prepare_modules_entity_uninstall', ['entity_type_id' => $entity_type->id()])->toString(),
         ]);
diff --git a/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php b/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
index fc8fe4e..525b2c3 100644
--- a/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
+++ b/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
@@ -29,20 +29,19 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
     $form['module'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Prepare uninstall'),
-      '#description' => $this->t('Clicking on this button, all @entity_type data (content) will be removed.', [
-        '@entity_type' => $entity_type->getLabel()
-      ]),
     ];
 
     // Display how many content entity/-ies there is/are to remove.
     $count = \Drupal::entityQuery($entity_type_id)->count()->execute();
     if ($count) {
-      $form['module']['text']['#markup'] = '<p>' . $this->formatPlural($count, 'There is 1 content entity to remove!', 'There are @count content entities to remove!') . '</p>';
+      $form['module']['text']['#markup'] = '<p>' . $this->formatPlural($count, 'There is 1 @entity_type entity to remove!', 'There are @count @entity_type entities to remove!', [
+          '@entity_type' => $entity_type->getLabel()
+        ]) . '</p>';
     }
 
     $form['module']['prepare_uninstall'] = [
       '#type' => 'submit',
-      '#value' => $this->t('Delete @entity_type data', [
+      '#value' => $this->t('Delete @entity_type entities', [
         '@entity_type' => $entity_type->getLabel(),
       ]),
     ];