diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -70,14 +70,24 @@
    * Drupal 6 modules that do no need an upgrade path.
    */
   public static $d6_no_upgrade_path = [
+    'blog',
+    'color',
+    'date_timezone',
     'date_api',
     'help',
+    'i18nstrings',
     'imageapi',
-    'nodereference',
+    'openid',
     'php',
-    'userreference',
+    'poll',
+    'profile',
+    'trigger',
+    'tracker',
+    'variable',
     'variable_admin',
     'views',
+    'views_export',
+    'views_ui',
   ];
 
   /**
@@ -86,14 +96,21 @@
   public static $d7_no_upgrade_path = [
     'blog',
     'contextual',
+    'dashboard',
     'date_api',
     'entity',
     'field_ui',
     'help',
+    'openid',
     'overlay',
     'php',
+    'poll',
+    'profile',
+    'trigger',
     'toolbar',
     'trigger',
+    'views',
+    'views_ui',
   ];
 
   /**
@@ -537,9 +554,11 @@
     // Get the source_module and destination_module from the field plugins.
     $definitions = $this->fieldPluginManager->getDefinitions();
     foreach ($definitions as $definition) {
-      $source_module = $definition['source_module'];
-      $destination_module = $definition['destination_module'];
-      $table_data[$source_module][$destination_module][$definition['id']] = $definition['id'];
+      if (in_array($version, $definition['core'])) {
+        $source_module = $definition['source_module'];
+        $destination_module = $definition['destination_module'];
+        $table_data[$source_module][$destination_module][$definition['id']] = $definition['id'];
+      }
     }
 
     // Add source_module and destination_module for modules that do not need an
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
@@ -11,7 +11,7 @@
  *   type_map = {
  *     "nodereference" = "entity_reference",
  *   },
- *   source_module = "node_reference",
+ *   source_module = "nodereference",
  *   destination_module = "core",
  * )
  */
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
@@ -11,7 +11,7 @@
  *   type_map = {
  *     "userreference" = "entity_reference",
  *   },
- *   source_module = "user_reference",
+ *   source_module = "userreference",
  *   destination_module = "core",
  * )
  */