diff -u b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
--- b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -83,8 +82,6 @@
    *
    * @return string
    *   The entity type.
-   *
-   * @throws \Drupal\migrate\MigrateException
    */
   protected static function getEntityTypeId($plugin_id) {
     // Remove "entity:".
only in patch2:
unchanged:
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
only in patch2:
unchanged:
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
only in patch2:
unchanged:
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
only in patch2:
unchanged:
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -8,7 +8,6 @@ source:
 process:
   nid: nid
   vid: vid
-  type: type
   langcode:
     plugin: default_value
     source: language
only in patch2:
unchanged:
--- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -98,6 +98,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           '@type' => $node_type,
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['bundle'] = $node_type;
 
         // If this migration is based on the d6_node_revision migration, it
         // should explicitly depend on the corresponding d6_node variant.
only in patch2:
unchanged:
--- a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -92,6 +92,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           '@type' => $row->getSourceProperty('name'),
         ]);
         $values['source']['node_type'] = $node_type;
+        $values['destination']['bundle'] = $node_type;
 
         $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {