diff --git a/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php b/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php
index 6d5318a..b10f19c 100644
--- a/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php
+++ b/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php
@@ -31,7 +31,7 @@ public static function getSourcePlugin($source_plugin_id) {
         'plugin' => 'null',
       ],
     ];
-    return \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition)->getSourcePlugin();
+    return \Drupal::service('plugin.manager.migration')->createStubMigration($definition)->getSourcePlugin();
   }
 
 }
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
index 47096be..ceac596 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
@@ -226,18 +226,9 @@ protected function addDependency(array &$graph, $id, $dependency, $dynamic_ids)
   /**
    * {@inheritdoc}
    */
-  public function createMigrationFromCustomDefinition(array $definition) {
+  public function createStubMigration(array $definition) {
     $id = isset($definition['id']) ? $definition['id'] : uniqid();
-    return new Migration(
-      [],
-      $id,
-      $definition,
-      $this,
-      \Drupal::service('plugin.manager.migrate.source'),
-      \Drupal::service('plugin.manager.migrate.process'),
-      \Drupal::service('plugin.manager.migrate.destination'),
-      \Drupal::service('plugin.manager.migrate.id_map')
-    );
+    return Migration::create(\Drupal::getContainer(), [], $id, $definition);
   }
 
 }
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
index 97b4da0..5a78233 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
@@ -34,15 +34,15 @@
   public function createInstances($id, array $configuration = array());
 
   /**
-   * Creates a migration plugin from a definition array.
+   * Creates a stub migration plugin from a definition array.
    *
    * @param array $definition
    *   The migration definition. If an 'id' key is set then this will be used as
    *   the migration ID, if not a random ID will be assigned.
    *
    * @return \Drupal\migrate\Plugin\Migration
-   *   The migration.
+   *   The stub migration.
    */
-  public function createMigrationFromCustomDefinition(array $definition);
+  public function createStubMigration(array $definition);
 
 }
diff --git a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php b/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
index 5b8fbc5..8baa46d 100644
--- a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
+++ b/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
@@ -43,7 +43,7 @@ public function testEmbeddedData() {
       'destination' => ['plugin' => 'null'],
     ];
 
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $source = $migration->getSourcePlugin();
 
     // Validate the plugin returns the source data that was provided.
diff --git a/core/modules/migrate/src/Tests/MigrateEventsTest.php b/core/modules/migrate/src/Tests/MigrateEventsTest.php
index c7115cd..9933f1f 100644
--- a/core/modules/migrate/src/Tests/MigrateEventsTest.php
+++ b/core/modules/migrate/src/Tests/MigrateEventsTest.php
@@ -79,7 +79,7 @@ public function testMigrateEvents() {
       'destination' => ['plugin' => 'dummy'],
     ];
 
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
 
     $executable = new MigrateExecutable($migration, new MigrateMessage());
     // As the import runs, events will be dispatched, recording the received
diff --git a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
index 2a0698d..d4cafda 100644
--- a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
+++ b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
@@ -59,7 +59,7 @@ public function testMigrateEvents() {
       'destination' => ['plugin' => 'dummy'],
     ];
 
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
 
     $executable = new MigrateExecutable($migration, new MigrateMessage());
     // When the import runs, the first row imported will trigger an
diff --git a/core/modules/migrate/src/Tests/MigrateMessageTest.php b/core/modules/migrate/src/Tests/MigrateMessageTest.php
index d034fc8..493a205 100644
--- a/core/modules/migrate/src/Tests/MigrateMessageTest.php
+++ b/core/modules/migrate/src/Tests/MigrateMessageTest.php
@@ -75,7 +75,7 @@ protected function setUp() {
       ],
     ];
 
-    $this->migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $this->migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
   }
 
   /**
diff --git a/core/modules/migrate/src/Tests/MigrateRollbackTest.php b/core/modules/migrate/src/Tests/MigrateRollbackTest.php
index 6f99802..d2a9cff 100644
--- a/core/modules/migrate/src/Tests/MigrateRollbackTest.php
+++ b/core/modules/migrate/src/Tests/MigrateRollbackTest.php
@@ -64,7 +64,7 @@ public function testRollback() {
       'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
     ];
 
-    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $vocabulary_id_map = $vocabulary_migration->getIdMap();
 
     $this->assertTrue($vocabulary_migration->getDestinationPlugin()->supportsRollback());
@@ -105,7 +105,7 @@ public function testRollback() {
       'migration_dependencies' => ['required' => ['vocabularies']],
     ];
 
-    $term_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $term_id_map = $term_migration->getIdMap();
 
     $this->assertTrue($term_migration->getDestinationPlugin()->supportsRollback());
@@ -178,7 +178,7 @@ public function testRollback() {
       'migration_dependencies' => ['required' => ['vocabularies']],
     ];
 
-    $settings_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $settings_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $this->assertFalse($settings_migration->getDestinationPlugin()->supportsRollback());
   }
 
diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
index 3dcac63..e6998c6 100644
--- a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
+++ b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
@@ -53,7 +53,7 @@ public function testPrepareRowSkip() {
       'load' => ['plugin' => 'null'],
     ];
 
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
 
     $executable = new MigrateExecutable($migration, new MigrateMessage());
     $result = $executable->import();
diff --git a/core/modules/migrate/src/Tests/MigrateStatusTest.php b/core/modules/migrate/src/Tests/MigrateStatusTest.php
index 2390521..a35c8d7 100644
--- a/core/modules/migrate/src/Tests/MigrateStatusTest.php
+++ b/core/modules/migrate/src/Tests/MigrateStatusTest.php
@@ -31,7 +31,7 @@ public function testStatus() {
       ],
       'process' => ['foo' => 'bar'],
     ];
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
 
     // Default status is idle.
     $status = $migration->getStatus();
diff --git a/core/modules/migrate/src/Tests/MigrationTest.php b/core/modules/migrate/src/Tests/MigrationTest.php
index a92cfe1..d5c07d4 100644
--- a/core/modules/migrate/src/Tests/MigrationTest.php
+++ b/core/modules/migrate/src/Tests/MigrationTest.php
@@ -31,7 +31,7 @@ class MigrationTest extends KernelTestBase {
    * @covers ::set()
    */
   public function testSetInvalidation() {
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition([
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([
       'source' => ['plugin' => 'empty'],
       'destination' => ['plugin' => 'entity:entity_view_mode'],
     ]);
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
index 5837d84..9975700 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
@@ -28,7 +28,7 @@ class MigrationTest extends KernelTestBase {
    * @covers ::getProcessPlugins
    */
   public function testGetProcessPlugins() {
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition([]);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([]);
     $this->assertEquals([], $migration->getProcessPlugins([]));
   }
 
diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module
index d5d376e..dc3ab4e 100644
--- a/core/modules/migrate_drupal/migrate_drupal.module
+++ b/core/modules/migrate_drupal/migrate_drupal.module
@@ -42,7 +42,7 @@ function migrate_drupal_migration_plugins_alter(&$definitions) {
         'plugin' => 'null',
       ],
     ];
-    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($vocabulary_migration_definition);
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($vocabulary_migration_definition);
 
     try {
       $source_plugin = $vocabulary_migration->getSourcePlugin();
diff --git a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
index c633200..ef240ff 100644
--- a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
+++ b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
@@ -51,7 +51,7 @@ protected function createStub($entity_type_id) {
       'process' => [],
       'destination' => ['plugin' => 'entity:' . $entity_type_id],
     ];
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $destination_plugin = $migration->getDestinationPlugin(TRUE);
     $stub_row = new Row([], [], TRUE);
     $destination_ids = $destination_plugin->import($stub_row);
diff --git a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
index f435566..f6f8ba3 100644
--- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -110,7 +110,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           $values['migration_dependencies']['required'][] = 'd6_node:' . $node_type;
         }
 
-        $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($values);
+        $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {
           foreach ($fields[$node_type] as $field_name => $info) {
             $field_type = $info['type'];
diff --git a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
index 27a3130..6307fce 100644
--- a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -98,7 +98,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         ]);
         $values['source']['node_type'] = $node_type;
 
-        $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($values);
+        $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {
           foreach ($fields[$node_type] as $field_name => $info) {
             $field_type = $info['type'];
diff --git a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
index 3f194cc..d412610 100644
--- a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
@@ -68,7 +68,7 @@ public function testStubWithWeightMapping() {
       ],
       'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
     ];
-    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
     $vocabulary_executable->import();
 
diff --git a/core/modules/user/src/Plugin/migrate/ProfileValues.php b/core/modules/user/src/Plugin/migrate/ProfileValues.php
index 970ee59..0c3e51a 100644
--- a/core/modules/user/src/Plugin/migrate/ProfileValues.php
+++ b/core/modules/user/src/Plugin/migrate/ProfileValues.php
@@ -34,7 +34,7 @@ public function getProcess() {
       ] + $this->source;
       $definition['destination']['plugin'] = 'null';
       try {
-        $profile_field_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition);
+        $profile_field_migration = $this->migrationPluginManager->createStubMigration($definition);
         $source_plugin = $profile_field_migration->getSourcePlugin();
         $source_plugin->checkRequirements();
         foreach ($source_plugin as $row) {
diff --git a/core/modules/user/src/Plugin/migrate/User.php b/core/modules/user/src/Plugin/migrate/User.php
index a233466..0586016 100644
--- a/core/modules/user/src/Plugin/migrate/User.php
+++ b/core/modules/user/src/Plugin/migrate/User.php
@@ -35,7 +35,7 @@ public function getProcess() {
       $definition['destination']['plugin'] = 'null';
       if (\Drupal::moduleHandler()->moduleExists('field')) {
         $definition['source']['plugin'] = 'd7_field_instance';
-        $field_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition);
+        $field_migration = $this->migrationPluginManager->createStubMigration($definition);
         foreach ($field_migration->getSourcePlugin() as $row) {
           $field_name = $row->getSourceProperty('field_name');
           $this->process[$field_name] = $field_name;
@@ -43,7 +43,7 @@ public function getProcess() {
       }
       try {
         $definition['source']['plugin'] = 'profile_field';
-        $profile_migration = $this->migrationPluginManager->createMigrationFromCustomDefinition($definition);
+        $profile_migration = $this->migrationPluginManager->createStubMigration($definition);
         // Ensure that Profile is enabled in the source DB.
         $profile_migration->checkRequirements();
         foreach ($profile_migration->getSourcePlugin() as $row) {
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
index 3aa45ee..73532b8 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
+++ b/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
@@ -93,7 +93,7 @@ public function testAdminPasswordPreserved() {
       ],
       'destination' => ['plugin' => 'entity:user'],
     ];
-    $migration = \Drupal::service('plugin.manager.migration')->createMigrationFromCustomDefinition($definition);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $this->executeMigration($migration);
 
     // Verify that admin username and email were changed, but password was not.