diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml b/core/modules/config_translation/migration_templates/d6_system_maintenance_translation.yml
similarity index 79%
rename from core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
rename to core/modules/config_translation/migration_templates/d6_system_maintenance_translation.yml
index 1c99961..8fc973e 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml
+++ b/core/modules/config_translation/migration_templates/d6_system_maintenance_translation.yml
@@ -1,9 +1,9 @@
-id: d6_i18n_system_maintenance
+id: d6_system_maintenance_translation
 label: Maintenance page configuration
 migration_tags:
   - Drupal 6
 source:
-  plugin: i18n_variable
+  plugin: variable_translation
   variables:
     - site_offline_message
 process:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml b/core/modules/config_translation/migration_templates/d6_system_site_translation.yml
similarity index 91%
rename from core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
rename to core/modules/config_translation/migration_templates/d6_system_site_translation.yml
index 3c80821..af85366 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml
+++ b/core/modules/config_translation/migration_templates/d6_system_site_translation.yml
@@ -1,9 +1,9 @@
-id: d6_i18n_system_site
+id: d6_system_site_translation
 label: Site configuration
 migration_tags:
   - Drupal 6
 source:
-  plugin: i18n_variable
+  plugin: variable_translation
   constants:
     slash: '/'
   variables:
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml b/core/modules/config_translation/migration_templates/d6_user_mail_translation.yml
similarity index 97%
rename from core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
rename to core/modules/config_translation/migration_templates/d6_user_mail_translation.yml
index d1e5db5..f40d5da 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml
+++ b/core/modules/config_translation/migration_templates/d6_user_mail_translation.yml
@@ -1,9 +1,9 @@
-id: d6_i18n_user_mail
+id: d6_user_mail_translation
 label: User mail configuration
 migration_tags:
   - Drupal 6
 source:
-  plugin: i18n_variable
+  plugin: variable_translation
   variables:
     - user_mail_status_activated_subject
     - user_mail_status_activated_body
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml b/core/modules/config_translation/migration_templates/d6_user_profile_field_instance_translation.yml
similarity index 87%
rename from core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
rename to core/modules/config_translation/migration_templates/d6_user_profile_field_instance_translation.yml
index f2c6f95..5a3d7cc 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
+++ b/core/modules/config_translation/migration_templates/d6_user_profile_field_instance_translation.yml
@@ -1,9 +1,9 @@
-id: d6_i18n_user_profile_field_instance
+id: d6_user_profile_field_instance_translation
 label: User profile field instance configuration
 migration_tags:
   - Drupal 6
 source:
-  plugin: d6_i18n_profile_field
+  plugin: d6_profile_field_translation
   constants:
     entity_type: user
     bundle: user
diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml b/core/modules/config_translation/migration_templates/d6_user_settings_translation.yml
similarity index 91%
rename from core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
rename to core/modules/config_translation/migration_templates/d6_user_settings_translation.yml
index 36b0fa6c..c06a206 100644
--- a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml
+++ b/core/modules/config_translation/migration_templates/d6_user_settings_translation.yml
@@ -1,9 +1,9 @@
-id: d6_i18n_user_settings
+id: d6_user_settings_translation
 label: User configuration
 migration_tags:
   - Drupal 6
 source:
-  plugin: i18n_variable
+  plugin: variable_translation
   variables:
     - user_mail_status_blocked_notify
     - user_mail_status_activated_notify
diff --git a/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php b/core/modules/config_translation/src/Plugin/migrate/source/d6/ProfileFieldTranslation.php
similarity index 92%
rename from core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
rename to core/modules/config_translation/src/Plugin/migrate/source/d6/ProfileFieldTranslation.php
index 2989f96..47af621 100644
--- a/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
+++ b/core/modules/config_translation/src/Plugin/migrate/source/d6/ProfileFieldTranslation.php
@@ -8,11 +8,11 @@
  * i18n strings profile field source from database.
  *
  * @MigrateSource(
- *   id = "d6_i18n_profile_field",
+ *   id = "d6_profile_field_translation",
  *   source_provider = "i18n"
  * )
  */
-class I18nProfileField extends DrupalSqlBase {
+class ProfileFieldTranslation extends DrupalSqlBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
similarity index 84%
rename from core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php
rename to core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
index d1c5867..4caa314 100644
--- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemMaintenanceTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
@@ -9,7 +9,7 @@
  *
  * @group migrate_drupal_6
  */
-class MigrateI18nSystemMaintenanceTest extends MigrateDrupal6TestBase {
+class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal6TestBase {
 
   public static $modules = ['language', 'config_translation'];
 
@@ -18,7 +18,7 @@ class MigrateI18nSystemMaintenanceTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_i18n_system_maintenance');
+    $this->executeMigration('d6_system_maintenance_translation');
   }
 
   /**
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
similarity index 93%
rename from core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php
rename to core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
index 770b33c..29b816b 100644
--- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nSystemSiteTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
@@ -9,7 +9,7 @@
  *
  * @group migrate_drupal_6
  */
-class MigrateI18nSystemSiteTest extends MigrateDrupal6TestBase {
+class MigrateSystemSiteTranslationTest extends MigrateDrupal6TestBase {
 
   public static $modules = ['language', 'config_translation'];
 
@@ -18,7 +18,7 @@ class MigrateI18nSystemSiteTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_i18n_system_site');
+    $this->executeMigration('d6_system_site_translation');
   }
 
   /**
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
similarity index 97%
rename from core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
rename to core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
index f48e44f..08dbd7d 100644
--- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
@@ -10,7 +10,7 @@
  *
  * @group migrate_drupal_6
  */
-class MigrateI18nUserConfigsTest extends MigrateDrupal6TestBase {
+class MigrateUserConfigsTranslationTest extends MigrateDrupal6TestBase {
 
   use SchemaCheckTestTrait;
 
@@ -23,7 +23,7 @@ protected function setUp() {
     parent::setUp();
     $this->installSchema('locale',
       ['locales_source', 'locales_target', 'locales_location']);
-    $this->executeMigrations(['d6_i18n_user_mail', 'd6_i18n_user_settings']);
+    $this->executeMigrations(['d6_user_mail_translation', 'd6_user_settings_translation']);
   }
 
   /**
diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
similarity index 96%
rename from core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php
rename to core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
index 057c14a..64aa668 100644
--- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
@@ -9,7 +9,7 @@
  *
  * @group migrate_drupal_6
  */
-class MigrateI18nUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
+class MigrateUserProfileFieldInstanceTranslationTest extends MigrateDrupal6TestBase {
 
   /**
    * {@inheritdoc}
@@ -23,7 +23,7 @@ public function testUserProfileFields() {
     $this->executeMigrations([
       'user_profile_field',
       'user_profile_field_instance',
-      'd6_i18n_user_profile_field_instance',
+      'd6_user_profile_field_instance_translation',
     ]);
     $language_manager = $this->container->get('language_manager');
 
diff --git a/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php b/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/ProfileFieldTranslationTest.php
similarity index 89%
rename from core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php
rename to core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/ProfileFieldTranslationTest.php
index bd8d451..33f117a 100644
--- a/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php
+++ b/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/ProfileFieldTranslationTest.php
@@ -5,12 +5,12 @@
 use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
 
 /**
- * Tests the i18nProfileField source plugin.
+ * Tests the ProfileFieldTranslation source plugin.
  *
- * @covers \Drupal\config_translation\Plugin\migrate\source\d6\I18nProfileField
+ * @covers \Drupal\config_translation\Plugin\migrate\source\d6\ProfileFieldTranslation
  * @group migrate_drupal
  */
-class I18nProfileFieldTest extends MigrateSqlSourceTestBase {
+class ProfileFieldTranslationTest extends MigrateSqlSourceTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
rename to core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
index 93832aa..c933dcf 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
@@ -8,13 +8,13 @@
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
- * Drupal i18n_variable source from database.
+ * Drupal variable_translation source from database.
  *
  * @MigrateSource(
- *   id = "i18n_variable"
+ *   id = "variable_translation"
  * )
  */
-class i18nVariable extends DrupalSqlBase {
+class VariableTranslation extends DrupalSqlBase {
 
   /**
    * The variable names to fetch.
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
rename to core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
index 06059cf..1527067 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VariableTranslationTest.php
@@ -9,11 +9,11 @@
  *
  * @group migrate_drupal
  */
-class i18nVariableTest extends MigrateSqlSourceTestCase {
+class VariableTranslationTest 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\i18nVariable';
+  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\VariableTranslation';
 
   /**
    * Define bare minimum migration configuration.
@@ -22,7 +22,7 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
     'id' => 'test',
     'highWaterProperty' => ['field' => 'test'],
     'source' => [
-      'plugin' => 'i18n_variable',
+      'plugin' => 'variable_translation',
       'variables' => [
         'site_slogan',
         'site_name',
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 6b1fc1b..602deae 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -654,7 +654,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'profile',
       'destination_module' => 'user',
     ],
-    'd6_i18n_user_profile_field_instance' => [
+    'd6_user_profile_field_instance_translation' => [
       'source_module' => 'i18n',
       'destination_module' => 'user',
     ],