diff --git a/core/modules/migrate_drupal/migration_templates/d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_action_settings.yml
rename to core/modules/action/migration_templates/d6_action_settings.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
similarity index 88%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php
rename to core/modules/action/src/Plugin/migrate/source/d6/Action.php
index d3c7533..2ca7741 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php
+++ b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Action.
+ * Contains \Drupal\action\Plugin\migrate\source\d6\Action.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\action\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
similarity index 82%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
rename to core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
index 5f96136..b4b2540 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
+++ b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateActionConfigsTest.
+ * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\action\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to action.settings.yml.
  *
- * @group migrate_drupal
+ * @group action
  */
 class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
similarity index 88%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
rename to core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
index cc88aef..c45ebee 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
+++ b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ActionTest.
+ * Contains \Drupal\Tests\action\Unit\Plugin\migrate\source\d6\ActionTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\action\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 actions source plugin.
  *
- * @group migrate_drupal
+ * @group action
  */
 class ActionTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Action';
+  const PLUGIN_CLASS = 'Drupal\action\Plugin\migrate\source\d6\Action';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(