diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php
index 5347573..0731e68 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php
@@ -217,7 +217,7 @@ public function convertToRevisionable(array &$sandbox, array $fields_to_update =
       }
 
       // At this point the update process either finished successfully or any
-      // error has been handled already, so we can drop the initial entity
+      // error has been handled already, so we can drop the backup entity
       // tables.
       foreach ($sandbox['original_table_mapping']->getTableNames() as $table_name) {
         $old_table_name = TemporaryTableMapping::getTempTableName($table_name, 'old_');
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
index ec993da..3a0aca2 100644
--- a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
+++ b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
@@ -153,6 +153,12 @@ public function testMakeRevisionable() {
     foreach ($storage->getTableMapping()->getTableNames() as $table_name) {
       $this->assertFalse($schema->tableExists(TemporaryTableMapping::getTempTableName($table_name)));
     }
+
+    // Check that backup tables have been removed at the end of the process.
+    $schema = \Drupal::database()->schema();
+    foreach ($storage->getTableMapping()->getTableNames() as $table_name) {
+      $this->assertFalse($schema->tableExists(TemporaryTableMapping::getTempTableName($table_name, 'old_')));
+    }
   }
 
   /**
@@ -241,16 +247,16 @@ public function testMakeRevisionableErrorHandling() {
       ->fetchAllAssoc('id');
     $this->assertEqual('843e9ac7-3351-4cc1-a202-2dbffffae21c', $base_table_row[1]->uuid);
 
-    $data_table_table_row = \Drupal::database()->select('entity_test_update_data')
+    $data_table_row = \Drupal::database()->select('entity_test_update_data')
       ->fields('entity_test_update_data')
       ->condition('id', 1, '=')
       ->condition('langcode', 'en', '=')
       ->execute()
       ->fetchAllAssoc('id');
-    $this->assertEqual('1 - test single property', $data_table_table_row[1]->test_single_property);
-    $this->assertEqual('1 - test multiple properties - value1', $data_table_table_row[1]->test_multiple_properties__value1);
-    $this->assertEqual('1 - test multiple properties - value2', $data_table_table_row[1]->test_multiple_properties__value2);
-    $this->assertEqual('1 - test entity base field info', $data_table_table_row[1]->test_entity_base_field_info);
+    $this->assertEqual('1 - test single property', $data_table_row[1]->test_single_property);
+    $this->assertEqual('1 - test multiple properties - value1', $data_table_row[1]->test_multiple_properties__value1);
+    $this->assertEqual('1 - test multiple properties - value2', $data_table_row[1]->test_multiple_properties__value2);
+    $this->assertEqual('1 - test entity base field info', $data_table_row[1]->test_entity_base_field_info);
   }
 
 }