diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
index c741e46..5c65d6a 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests currency migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateCurrencyTest extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
index 6d51d56..6b1c0d9 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests store migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateDefaultStoreTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
index adc06d5..67bfe07 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_order\Entity\OrderItem;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests order item migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateOrderItemTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
index d3d7d9b..83e46e9 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 
 /**
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateOrderItemTypeTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
index add074f..34b0dba 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests line item migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
index a85da26..e823269 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests line item migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductTypeTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
index b4aa365..1e3fe96 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_product\Entity\ProductVariation;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests line item migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductVariationTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
index 32708bb..7f53f00 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests product variation type migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductVariationTypeTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
index 5e2da29..84fc30c 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests billing profile migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProfileBillingTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
index c58511f..f70660f 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests store migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateStoreTestMigrate extends MigrateCommerce1TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
index 5dbbaee..325b7db 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\FieldStorageConfigInterface;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests attribute field storage migration.
@@ -13,7 +13,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateAttributeTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
index cbdb889..1b484b0 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests currency migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateCurrencyTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
index ed94faf..c18f6a6 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Entity\OrderItem;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests order item migration.
@@ -13,7 +13,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateOrderItemTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
index 6e78317..81da9ba 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Entity\Order;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests order migration.
@@ -13,7 +13,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateOrderTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
index c32e97f..2c91a70 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests product attribute migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductAttributeTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
index bcc207e..155245c 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests product attribute value migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductAttributeValueTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
index ad3aa34..ab0aeb1 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests Product migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
index d22b97b..72d07ba 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests product type migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductTypeTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
index 722a5fb..817c6f2 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests Product migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProductVariationTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
index 7a169b6..c4131dc 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\profile\Entity\Profile;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests billing profile migration.
@@ -13,7 +13,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateProfileBillingTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
index 4812652..e76c073 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_store\Entity\Store;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests store migration.
@@ -13,7 +13,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateStoreTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
index 3ce0e90..73cfff5 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests tax type migration.
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateTaxTypeTestMigrate extends MigrateUbercart6TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
index f290a46..4a0a76b 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests currency migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateCurrencyTestMigrate extends MigrateUbercart7TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
index 4c07a59..b0272ff 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\commerce_store\Entity\Store;
-use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
+use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
  * Tests store migration.
@@ -12,7 +12,7 @@ use Drupal\Tests\commerce_migrate\Kernel\MigrateCommerceMigrateTestTrait;
  */
 class MigrateStoreTestMigrate extends MigrateUbercart7TestBase {
 
-  use MigrateCommerceMigrateTestTrait;
+  use CommerceMigrateTestTrait;
 
   /**
    * {@inheritdoc}
diff --git a/modules/woocommerce/tests/src/Kernel/MigrateWoocommerceTestBase.php b/modules/woocommerce/tests/src/Kernel/WoocommerceTestBase.php
similarity index 92%
rename from modules/woocommerce/tests/src/Kernel/MigrateWoocommerceTestBase.php
rename to modules/woocommerce/tests/src/Kernel/WoocommerceTestBase.php
index fb7b434..5520b25 100644
--- a/modules/woocommerce/tests/src/Kernel/MigrateWoocommerceTestBase.php
+++ b/modules/woocommerce/tests/src/Kernel/WoocommerceTestBase.php
@@ -7,7 +7,7 @@ use Drupal\Tests\migrate\Kernel\MigrateTestBase;
 /**
  * Base class for Woocommerce migration tests.
  */
-abstract class MigrateWoocommerceTestBase extends MigrateTestBase {
+abstract class WoocommerceTestBase extends MigrateTestBase {
 
   /**
    * Modules to enable.
diff --git a/tests/src/Kernel/MigrateCommerceMigrateTestTrait.php b/tests/src/Kernel/CommerceMigrateTestTrait.php
similarity index 99%
rename from tests/src/Kernel/MigrateCommerceMigrateTestTrait.php
rename to tests/src/Kernel/CommerceMigrateTestTrait.php
index 6bc346f..7bdde65 100644
--- a/tests/src/Kernel/MigrateCommerceMigrateTestTrait.php
+++ b/tests/src/Kernel/CommerceMigrateTestTrait.php
@@ -22,7 +22,7 @@ use Drupal\commerce_order\Entity\OrderItemType;
 /**
  * Helper function to test migrations.
  */
-trait MigrateCommerceMigrateTestTrait {
+trait CommerceMigrateTestTrait {
 
   /**
    * Asserts an address field.
@@ -440,4 +440,4 @@ trait MigrateCommerceMigrateTestTrait {
     }
   }
 
-}
+}
\ No newline at end of file
diff --git a/tests/src/Kernel/MigrateCommerceMigrationLabelExistTest.php b/tests/src/Kernel/CommerceMigrationLabelExistTest.php
similarity index 95%
rename from tests/src/Kernel/MigrateCommerceMigrationLabelExistTest.php
rename to tests/src/Kernel/CommerceMigrationLabelExistTest.php
index 5eb3383..35e2ed5 100644
--- a/tests/src/Kernel/MigrateCommerceMigrationLabelExistTest.php
+++ b/tests/src/Kernel/CommerceMigrationLabelExistTest.php
@@ -10,7 +10,7 @@ use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
  *
  * @group commerce_migrate_commerce
  */
-class MigrateCommerceMigrationLabelExistTest extends MigrateDrupalTestBase {
+class CommerceMigrationLabelExistTest extends MigrateDrupalTestBase {
 
   use FileSystemModuleDiscoveryDataProviderTrait;
 
diff --git a/tests/src/Kernel/MigrateCommerceMigrationProvidersExistTest.php b/tests/src/Kernel/CommerceMigrationProvidersExistTest.php
similarity index 96%
rename from tests/src/Kernel/MigrateCommerceMigrationProvidersExistTest.php
rename to tests/src/Kernel/CommerceMigrationProvidersExistTest.php
index 95a5a09..e1b7d6a 100644
--- a/tests/src/Kernel/MigrateCommerceMigrationProvidersExistTest.php
+++ b/tests/src/Kernel/CommerceMigrationProvidersExistTest.php
@@ -10,7 +10,7 @@ use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
  *
  * @group commerce_migrate_commerce
  */
-class MigrateCommerceMigrationProvidersExistTest extends MigrateDrupalTestBase {
+class CommerceMigrationProvidersExistTest extends MigrateDrupalTestBase {
 
   use FileSystemModuleDiscoveryDataProviderTrait;