diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php
index ba69b7852c..d2b3a3f53d 100644
--- 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",
  * )
  */
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php
index 0c8e9ba705..bead7bc494 100644
--- 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",
  * )
  */
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 6bfaf42f1d..e3dccefeb5 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -67,6 +67,53 @@ class MigrateUpgradeForm extends ConfirmFormBase {
   protected $moduleHandler;
 
   /**
+   * 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',
+    'openid',
+    'php',
+    'poll',
+    'profile',
+    'trigger',
+    'tracker',
+    'variable',
+    'variable_admin',
+    'views',
+    'views_export',
+    'views_ui',
+  ];
+
+  /**
+   * Drupal 7 modules that do no need an upgrade path.
+   */
+  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',
+  ];
+
+  /**
    * Constructs the MigrateUpgradeForm.
    *
    * @param \Drupal\Core\State\StateInterface $state
@@ -507,9 +554,18 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) {
     // 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
+    // upgrade path.
+    $no_upgrade_path = ($version == '6') ? static::$d6_no_upgrade_path : static::$d7_no_upgrade_path;
+    foreach ($no_upgrade_path as $module) {
+      $table_data[$module]['core'][$module] = $module;
     }
 
     // Sort the table by source module names and within that destination
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
index 3717606cd8..cbb9198dac 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
@@ -121,6 +121,15 @@ protected function getAvailablePaths() {
       'upload',
       'user',
       'user_reference',
+      // Modules that have no upgrade path.
+      'date_api',
+      'help',
+      'imageapi',
+      'nodereference',
+      'php',
+      'userreference',
+      'variable_admin',
+      'views',
     ];
   }
 
@@ -129,7 +138,6 @@ protected function getAvailablePaths() {
    */
   protected function getMissingPaths() {
     return [
-      'date_api',
       'date_timezone',
       'event',
       'i18n',
@@ -139,9 +147,6 @@ protected function getMissingPaths() {
       'i18nmenu',
       'i18nprofile',
       'i18nstrings',
-      'imageapi',
-      'php',
-      'variable_admin',
     ];
   }
 
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
index 3cfe4bc6d7..5d6e9facc9 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
@@ -124,6 +124,17 @@ protected function getAvailablePaths() {
       'translation',
       'user',
       'user_reference',
+      // Modules that have no upgrade path.
+      'blog',
+      'contextual',
+      'date_api',
+      'entity',
+      'field_ui',
+      'help',
+      'overlay',
+      'php',
+      'toolbar',
+      'trigger',
     ];
   }
 
@@ -132,21 +143,12 @@ protected function getAvailablePaths() {
    */
   protected function getMissingPaths() {
     return [
-      'blog',
       'book',
       'color',
-      'contextual',
-      'date_api',
-      'entity',
-      'field_ui',
-      'help',
-      'php',
       'rdf',
       'simpletest',
       'syslog',
-      'toolbar',
       'tracker',
-      'trigger',
       'update',
     ];
   }