diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index a61a773..311ee5f 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -338,12 +338,11 @@ public function save(EntityInterface $entity) {
       else {
         $entity->enforceIsNew();
         $return = drupal_write_record($this->entityInfo['base_table'], $record);
-        $entity->{$this->idKey}->value = $record->{$this->idKey};
+        $entity->{$this->idKey}->value = (string) $record->{$this->idKey};
         if ($this->revisionKey) {
           $entity->setNewRevision();
           $record->{$this->revisionKey} = $this->saveRevision($entity);
         }
-        $entity->{$this->idKey}->value = $record->{$this->idKey};
         if ($this->dataTable) {
           $this->savePropertyData($entity);
         }
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php
index 96e6f1a..dd7812a 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php
@@ -32,6 +32,7 @@ public static function getInfo() {
   public function setUp() {
     parent::setUp();
     $this->installSchema('node', 'node');
+    $this->installSchema('node', 'node_revision');
     $this->installSchema('node', 'node_field_data');
     $this->installSchema('node', 'node_field_revision');
   }
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
index edb40d0..f643b65 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
@@ -53,8 +53,8 @@ public function testNodeRevisionRelationship() {
     $node_revision->save();
     $column_map = array(
       'vid' => 'vid',
-      'node_field_revision_nid' => 'node_field_revision_nid',
-      'node_node_field_revision_nid' => 'node_node_field_revision_nid',
+      'node_revision_nid' => 'node_revision_nid',
+      'node_node_revision_nid' => 'node_node_revision_nid',
     );
 
     // Here should be two rows.
@@ -63,13 +63,13 @@ public function testNodeRevisionRelationship() {
     $resultset_nid = array(
       array(
         'vid' => '1',
-        'node_field_revision_nid' => '1',
-        'node_node_field_revision_nid' => '1',
+        'node_revision_nid' => '1',
+        'node_node_revision_nid' => '1',
       ),
       array(
         'vid' => '2',
-        'node_field_revision_nid' => '1',
-        'node_node_field_revision_nid' => '1',
+        'node_revision_nid' => '1',
+        'node_node_revision_nid' => '1',
       ),
     );
     $this->assertIdenticalResultset($view_nid, $resultset_nid, $column_map);
@@ -80,8 +80,8 @@ public function testNodeRevisionRelationship() {
     $resultset_vid = array(
       array(
         'vid' => '2',
-        'node_field_revision_nid' => '1',
-        'node_node_field_revision_nid' => '1',
+        'node_revision_nid' => '1',
+        'node_node_revision_nid' => '1',
       ),
     );
     $this->assertIdenticalResultset($view_vid, $resultset_vid, $column_map);
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
index c4e06a3..24ca887 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
@@ -1,5 +1,5 @@
 id: test_node_revision_nid
-base_table: node_field_revision
+base_table: node_revision
 core: 8
 display:
   default:
@@ -7,7 +7,7 @@ display:
       relationships:
         nid:
           id: nid
-          table: node_field_revision
+          table: node_revision
           field: nid
           required: true
           plugin_id: standard
@@ -15,13 +15,13 @@ display:
       fields:
         vid:
           id: vid
-          table: node_field_revision
+          table: node_revision
           field: vid
           plugin_id: standard
           provider: views
         nid_1:
           id: nid_1
-          table: node_field_revision
+          table: node_revision
           field: nid
           plugin_id: standard
           provider: views
@@ -35,7 +35,7 @@ display:
       arguments:
         nid:
           id: nid
-          table: node_field_revision
+          table: node_revision
           field: nid
           plugin_id: node_nid
           provider: node
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
index 38664e1..581aa2b 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
@@ -1,5 +1,5 @@
 id: test_node_revision_vid
-base_table: node_field_revision
+base_table: node_revision
 core: 8
 display:
   default:
@@ -7,7 +7,7 @@ display:
       relationships:
         vid:
           id: vid
-          table: node_field_revision
+          table: node_revision
           field: vid
           required: true
           plugin_id: standard
@@ -15,13 +15,13 @@ display:
       fields:
         vid:
           id: vid
-          table: node_field_revision
+          table: node_revision
           field: vid
           plugin_id: standard
           provider: views
         nid_1:
           id: nid_1
-          table: node_field_revision
+          table: node_revision
           field: nid
           plugin_id: standard
           provider: views
@@ -35,7 +35,7 @@ display:
       arguments:
         nid:
           id: nid
-          table: node_field_revision
+          table: node_revision
           field: nid
           plugin_id: node_nid
           provider: node