diff -u b/core/modules/config_translation/src/Plugin/migrate/source/d6/ProfileFieldTranslation.php b/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
--- b/core/modules/config_translation/src/Plugin/migrate/source/d6/ProfileFieldTranslation.php
+++ b/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
@@ -4,50 +4,22 @@
 
+@trigger_error('The ' . __NAMESPACE__ . '\I18nProfileField is deprecated in
+Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use 
+' . __NAMESPACE__ . '\ProfileFieldTranslation', E_USER_DEPRECATED);
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
  * i18n strings profile field source from database.
  *
  * @MigrateSource(
- *   id = "d6_profile_field_translation",
+ *   id = "d6_i18n_profile_field",
  *   source_provider = "i18n"
  * )
+ *
+ * @deprecated in Drupal 8.4.x and will be removed in Drupal 9.0.x. Use
+ * \Drupal\config_translation\Plugin\migrate\source\d6\ProfileFieldTranslation
+ * instead.
+ *
  */
-class ProfileFieldTranslation extends DrupalSqlBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $query = $this->select('profile_fields', 'pf')
-      ->fields('pf', ['fid', 'name'])
-      ->fields('i18n', ['property'])
-      ->fields('lt', ['lid', 'translation', 'language']);
-    $query->leftJoin('i18n_strings', 'i18n', 'i18n.objectid = pf.name');
-    $query->leftJoin('locales_target', 'lt', 'lt.lid = i18n.lid');
-    return $query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fields() {
-    return [
-      'fid' => $this->t('Profile field ID.'),
-      'lid' => $this->t('Locales target language ID.'),
-      'language' => $this->t('Language for this field.'),
-      'translation' => $this->t('Translation of either the title or explanation.'),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIds() {
-    $ids['fid']['type'] = 'integer';
-    $ids['language']['type'] = 'string';
-    $ids['lid']['type'] = 'integer';
-    $ids['lid']['alias'] = 'lt';
-    return $ids;
-  }
-
+class I18nProfileField extends ProfileFieldTranslation {
 }
reverted:
--- b/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/ProfileFieldTranslationTest.php
+++ a/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.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 -u b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VariableTranslation.php
@@ -8,7 +8,7 @@
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
- * Drupal variable translation source from database.
+ * Drupal i18n_variable source from database.
  *
  * @MigrateSource(
  *   id = "variable_translation"
reverted:
--- b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/d6/VariableTranslationTest.php
+++ a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/d6/i18nVariableTest.php
@@ -7,11 +7,11 @@
 /**
  * Tests the variable source plugin.
  *
+ * @covers \Drupal\migrate_drupal\Plugin\migrate\source\d6\i18nVariable
- * @covers \Drupal\migrate_drupal\Plugin\migrate\source\d6\VariableTranslation
  *
  * @group migrate_drupal
  */
+class i18nVariableTest extends MigrateSqlSourceTestBase {
-class VariableTranslationTest extends MigrateSqlSourceTestBase {
 
   /**
    * {@inheritdoc}
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
@@ -666,7 +666,7 @@
       'source_module' => 'profile',
       'destination_module' => 'user',
     ],
-    'd6_user_profile_field_instance_translation' => [
+    'd6_i18n_user_profile_field_instance' => [
       'source_module' => 'i18n',
       'destination_module' => 'user',
     ],
@@ -678,7 +678,7 @@
       'source_module' => 'profile',
       'destination_module' => 'user',
     ],
-    'd6_i18n_user_profile_field_instance' => [
+    'd6_user_profile_field_instance_translation' => [
       'source_module' => 'i18n',
       'destination_module' => 'user',
     ],