diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_display.yml
index 975106a..12f936a 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_display.yml
@@ -1,6 +1,6 @@
 id: d6_user_profile_entity_display
 source:
-  plugin: d6_profile_field
+  plugin: d6_user_profile_field
   constants:
     entity_type: user
     bundle: user
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_form_display.yml
index bd813e4..910d5dd 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -1,6 +1,6 @@
 id: d6_user_profile_entity_form_display
 source:
-  plugin: d6_profile_field
+  plugin: d6_user_profile_field
   constants:
     empty: {}
     entity_type: user
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field.yml
index e1154c1..68d5358 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field.yml
@@ -1,6 +1,6 @@
 id: d6_user_profile_field
 source:
-  plugin: d6_profile_field
+  plugin: d6_user_profile_field
   constants:
     entity_type: user
 process:
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field_instance.yml
index 566c1f7..c37ba07 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_user_profile_field_instance.yml
@@ -1,6 +1,6 @@
 id: d6_user_profile_field_instance
 source:
-  plugin: d6_profile_field
+  plugin: d6_user_profile_field
   constants:
     entity_type: user
     bundle: user
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserProfileField.php
similarity index 93%
rename from core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php
rename to core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserProfileField.php
index e75989f..eaaa139 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/ProfileField.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/UserProfileField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\d6\ProfileField.
+ * Contains \Drupal\migrate\Plugin\migrate\source\d6\USerProfileField.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
@@ -13,11 +13,11 @@
  * Drupal 6 profile fields source from database.
  *
  * @MigrateSource(
- *   id = "d6_profile_field",
+ *   id = "d6_user_profile_field",
  *   source_provider = "profile"
  * )
  */
-class ProfileField extends DrupalSqlBase {
+class UserProfileField extends DrupalSqlBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserProfileFieldTest.php
similarity index 96%
rename from core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php
rename to core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserProfileFieldTest.php
index a05e338..e14ab53 100644
--- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/ProfileFieldTest.php
+++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/d6/UserProfileFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Tests\source\d6\ProfileFieldTest.
+ * Contains \Drupal\migrate\Tests\source\d6\UserProfileFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\source\d6;
@@ -110,7 +110,7 @@ public static function getInfo() {
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\migrate_drupal\Plugin\migrate\source\d6\ProfileField;
 
-class TestProfileField extends ProfileField {
+class TestUserProfileField extends ProfileField {
   public function setDatabase(Connection $database) {
     $this->database = $database;
   }