diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
index 7f5d807be9..7ec5bf41d5 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
@@ -5,7 +5,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\FieldConfigInterface;
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\Tests\migrate\Kernel\NodeCommentComboTrait;
+use Drupal\Tests\migrate\Kernel\NodeCommentCombinationTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
@@ -15,7 +15,7 @@
  */
 class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
 
-  use NodeCommentComboTrait;
+  use NodeCommentCombinationTrait;
 
   /**
    * {@inheritdoc}
@@ -39,12 +39,12 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
   protected function setUp() {
     parent::setUp();
     $this->installConfig(static::$modules);
-    $this->createNodeCommentCombo('page');
-    $this->createNodeCommentCombo('article');
-    $this->createNodeCommentCombo('blog');
-    $this->createNodeCommentCombo('book');
-    $this->createNodeCommentCombo('forum', 'comment_forum');
-    $this->createNodeCommentCombo('test_content_type');
+    $this->createNodeCommentCombination('page');
+    $this->createNodeCommentCombination('article');
+    $this->createNodeCommentCombination('blog');
+    $this->createNodeCommentCombination('book');
+    $this->createNodeCommentCombination('forum', 'comment_forum');
+    $this->createNodeCommentCombination('test_content_type');
     Vocabulary::create(['vid' => 'test_vocabulary'])->save();
     $this->executeMigrations(['d7_field', 'd7_field_instance']);
   }
diff --git a/core/modules/migrate/tests/src/Kernel/NodeCommentComboTrait.php b/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
similarity index 86%
rename from core/modules/migrate/tests/src/Kernel/NodeCommentComboTrait.php
rename to core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
index 0ae3dd7085..4d1baafc0a 100644
--- a/core/modules/migrate/tests/src/Kernel/NodeCommentComboTrait.php
+++ b/core/modules/migrate/tests/src/Kernel/NodeCommentCombinationTrait.php
@@ -8,7 +8,7 @@
 /**
  * Provides methods for testing node and comment combinations.
  */
-trait NodeCommentComboTrait {
+trait NodeCommentCombinationTrait {
 
   /**
    * Creates a node type with a corresponding comment type.
@@ -18,7 +18,7 @@
    * @param string (optional) $comment_type
    *   The comment type ID, if not provided defaults to comment_node_{type}.
    */
-  protected function createNodeCommentCombo($node_type, $comment_type = NULL) {
+  protected function createNodeCommentCombination($node_type, $comment_type = NULL) {
     if (!$comment_type) {
       $comment_type = "comment_node_$node_type";
     }
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index 5de1b6abe7..bbfc41d77d 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\Tests\migrate\Kernel\NodeCommentComboTrait;
+use Drupal\Tests\migrate\Kernel\NodeCommentCombinationTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
@@ -17,7 +17,7 @@
  */
 class MigrateUserTest extends MigrateDrupal7TestBase {
 
-  use NodeCommentComboTrait;
+  use NodeCommentCombinationTrait;
 
   /**
    * {@inheritdoc}
@@ -44,12 +44,12 @@ protected function setUp() {
 
     // Prepare to migrate user pictures as well.
     $this->installEntitySchema('file');
-    $this->createNodeCommentCombo('page');
-    $this->createNodeCommentCombo('article');
-    $this->createNodeCommentCombo('blog');
-    $this->createNodeCommentCombo('book');
-    $this->createNodeCommentCombo('forum', 'comment_forum');
-    $this->createNodeCommentCombo('test_content_type');
+    $this->createNodeCommentCombination('page');
+    $this->createNodeCommentCombination('article');
+    $this->createNodeCommentCombination('blog');
+    $this->createNodeCommentCombination('book');
+    $this->createNodeCommentCombination('forum', 'comment_forum');
+    $this->createNodeCommentCombination('test_content_type');
     Vocabulary::create(['vid' => 'test_vocabulary'])->save();
     $this->executeMigrations([
       'language',