diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
index 531d1010713100475f3f7aa125f9ee944895541d..1a55637a87039cecb1479fef316161f3e368eb96 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
@@ -1137,7 +1137,7 @@ public static function _fieldSqlSchema(FieldConfigInterface $field, array $schem
 
     // Define the revision ID schema, default to integer if there is no revision
     // ID.
-    $revision_id_definition = $entity_type->hasKey('revision_id') ? $definitions[$entity_type->getKey('revision_id')] : NULL;
+    $revision_id_definition = $entity_type->hasKey('revision') ? $definitions[$entity_type->getKey('revision')] : NULL;
     if (!$revision_id_definition || $revision_id_definition->getType() == 'integer') {
       $revision_id_schema = array(
         'type' => 'int',
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
index 41358a6c4d3f5e4cdd866341a7cdd2e9a137b6f7..ef9bd2e707504497492af937af298930053057e5 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
@@ -52,11 +52,11 @@ public function testFieldSqlSchemaForEntityWithStringIdentifier() {
       ->method('getKey')
       ->will($this->returnValueMap(array(
         array('id', 'id'),
-        array('revision_id', 'revision_id'),
+        array('revision', 'revision'),
       )));
     $definition->expects($this->once())
       ->method('hasKey')
-      ->with('revision_id')
+      ->with('revision')
       ->will($this->returnValue(TRUE));
 
     $field_type_manager->expects($this->exactly(2))
@@ -68,8 +68,8 @@ public function testFieldSqlSchemaForEntityWithStringIdentifier() {
 
     $fields['id'] = FieldDefinition::create('string')
       ->setName('id');
-    $fields['revision_id'] = FieldDefinition::create('string')
-      ->setName('revision_id');
+    $fields['revision'] = FieldDefinition::create('string')
+      ->setName('revision');
 
     $entity_manager->expects($this->any())
       ->method('getDefinition')