diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index 33cef2d..2298778 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -1098,6 +1098,21 @@ public function onInstanceDelete(FieldInstanceInterface $instance) {
    * {@inheritdoc}
    */
   public function onBundleRename($bundle, $bundle_new) {
+    if ($this->bundleKey) {
+      // Update entities to use new bundle name.
+      $this->database->update($this->entityType->getBaseTable())
+        ->fields(array($this->bundleKey => $bundle_new))
+        ->condition($this->bundleKey, $bundle)
+        ->execute();
+      if ($data_table = $this->entityType->getDataTable()) {
+        // Update data_table if any.
+        $this->database->update($data_table)
+          ->fields(array($this->bundleKey => $bundle_new))
+          ->condition($this->bundleKey, $bundle)
+          ->execute();
+      }
+    }
+
     // We need to account for deleted fields and instances. The method runs
     // before the instance definitions are updated, so we need to fetch them
     // using the old bundle name.
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
index 6131b30..8db3815 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
@@ -263,14 +263,24 @@ public function testBaseFieldComponent() {
    * Tests renaming and deleting a bundle.
    */
   public function testRenameDeleteBundle() {
-    $this->enableModules(array('field_test', 'node', 'system', 'text'));
-    $this->installSchema('node', array('node'));
+    $this->enableModules(array('field_test', 'node', 'system', 'text', 'filter', 'user'));
+    $this->installSchema('node', array('node', 'node_field_data', 'node_revision', 'node_field_revision'));
+    $this->installSchema('user', array('users'));
 
     // Create a node bundle, display and form display object.
     entity_create('node_type', array('type' => 'article'))->save();
     entity_get_display('node', 'article', 'default')->save();
     entity_get_form_display('node', 'article', 'default')->save();
 
+    // Add an article to verify if the type is renamed as expected.
+    entity_create('node', array(
+        'type' => 'article',
+        'status' => NODE_PUBLISHED,
+        'title' => $this->randomString(),
+        'body' => $this->randomString(),
+        'uid' => 1
+        ))->save();
+
     // Rename the article bundle and assert the entity display is renamed.
     $type = node_type_load('article');
     $type->old_type = 'article';
@@ -287,6 +297,10 @@ public function testRenameDeleteBundle() {
     $this->assertEqual('article_rename', $new_form_display->bundle);
     $this->assertEqual('node.article_rename.default', $new_form_display->id);
 
+    // Verify type field is correct for node_field_data table.
+    $node_field_data_type = db_query('SELECT type FROM {node_field_data} LIMIT 1')->fetchField();
+    $this->assertEqual('article_rename', $node_field_data_type);
+
     // Delete the bundle.
     $type->delete();
     $display = entity_load('entity_view_display', 'node.article_rename.default');
diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
index 2b36eb5..a7cfef9 100644
--- a/core/modules/node/lib/Drupal/node/Entity/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
@@ -182,16 +182,6 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
       // Clear the node type cache to reflect the rename.
       Cache::deleteTags(array('node_types' => TRUE));
 
-      $update_count = node_type_update_nodes($this->getOriginalId(), $this->id());
-      if ($update_count) {
-        drupal_set_message(format_plural($update_count,
-          'Changed the content type of 1 post from %old-type to %type.',
-          'Changed the content type of @count posts from %old-type to %type.',
-          array(
-            '%old-type' => $this->getOriginalId(),
-            '%type' => $this->id(),
-          )));
-      }
       entity_invoke_bundle_hook('rename', 'node', $this->getOriginalId(), $this->id());
     }
     else {
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 4b80b36..f739707 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -490,24 +490,6 @@ function node_field_extra_fields() {
 }
 
 /**
- * Updates all nodes of one type to be of another type.
- *
- * @param string $old_id
- *   The current node type of the nodes.
- * @param string $new_id
- *   The new node type of the nodes.
- *
- * @return
- *   The number of nodes whose node type field was modified.
- */
-function node_type_update_nodes($old_id, $new_id) {
-  return db_update('node')
-    ->fields(array('type' => $new_id))
-    ->condition('type', $old_id)
-    ->execute();
-}
-
-/**
  * Loads node entities from the database.
  *
  * This function should be used whenever you need to load more than one node