diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCommerce1TestBase.php
similarity index 94%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCommerce1TestBase.php
index c442037..641b782 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCommerce1TestBase.php
@@ -9,7 +9,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
  *
  * @package Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7
  */
-abstract class Commerce1TestBase extends MigrateDrupal7TestBase {
+abstract class MigrateCommerce1TestBase extends MigrateDrupal7TestBase {
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
index 4dc85a4..5c65d6a 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateCurrencyTest.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class CurrencyTest extends Commerce1TestBase {
+class MigrateCurrencyTest extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
similarity index 88%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
index cbe8a44..6b1c0d9 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateDefaultStoreTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateDefaultStoreTest extends Commerce1TestBase {
+class MigrateDefaultStoreTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
similarity index 98%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
index acbaa01..67bfe07 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class OrderItemTest extends Commerce1TestBase {
+class MigrateOrderItemTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
similarity index 88%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
index a41bde2..83e46e9 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderItemTypeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group migrate_drupal_7
  */
-class MigrateOrderItemTypeTest extends Commerce1TestBase {
+class MigrateOrderItemTypeTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderTestMigrate.php
similarity index 97%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderTestMigrate.php
index 0a27459..8e79e52 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateOrderTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\commerce_order\Entity\Order;
  *
  * @group commerce_migrate_commerce
  */
-class OrderTest extends Commerce1TestBase {
+class MigrateOrderTestMigrate extends MigrateCommerce1TestBase {
 
   /**
    * Modules to enable.
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
similarity index 95%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
index 0d76724..34b0dba 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class ProductTest extends Commerce1TestBase {
+class MigrateProductTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
similarity index 96%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
index b6a3fdd..e823269 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductTypeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class ProductTypeTest extends Commerce1TestBase {
+class MigrateProductTypeTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
similarity index 98%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
index a58e849..1e3fe96 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class ProductVariationTest extends Commerce1TestBase {
+class MigrateProductVariationTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
similarity index 93%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
index d57912c..7f53f00 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProductVariationTypeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class ProductVariationTypeTest extends Commerce1TestBase {
+class MigrateProductVariationTypeTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
similarity index 91%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
index ef94a77..84fc30c 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateProfileBillingTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_commerce
  */
-class ProfileBillingTest extends Commerce1TestBase {
+class MigrateProfileBillingTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
similarity index 89%
rename from modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
index 4f7dd6b..f70660f 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateStoreTest extends Commerce1TestBase {
+class MigrateStoreTestMigrate extends MigrateCommerce1TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
similarity index 97%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
index ac5f792..325b7db 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateAttributeTestMigrate.php
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateAttributeTest extends Ubercart6TestBase {
+class MigrateAttributeTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
similarity index 89%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
index 30664e0..1b484b0 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateCurrencyTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class CurrencyTest extends Ubercart6TestBase {
+class MigrateCurrencyTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
similarity index 96%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
index 1109408..c18f6a6 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderItemTestMigrate.php
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class OrderItemTest extends Ubercart6TestBase {
+class MigrateOrderItemTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
similarity index 96%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
index 0aaf552..81da9ba 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateOrderTestMigrate.php
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class OrderTest extends Ubercart6TestBase {
+class MigrateOrderTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
similarity index 94%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
index ec57e9b..2c91a70 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateProductAttributeTest extends Ubercart6TestBase {
+class MigrateProductAttributeTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
similarity index 95%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
index 6256b66..155245c 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductAttributeValueTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateProductAttributeValueTest extends Ubercart6TestBase {
+class MigrateProductAttributeValueTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
similarity index 95%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
index d9597b2..ab0aeb1 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class ProductTest extends Ubercart6TestBase {
+class MigrateProductTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
similarity index 95%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
index f45172e..72d07ba 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductTypeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class MigrateProductTypeTest extends Ubercart6TestBase {
+class MigrateProductTypeTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
similarity index 95%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
index 81acde1..817c6f2 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProductVariationTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class ProductVariationTest extends Ubercart6TestBase {
+class MigrateProductVariationTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
similarity index 98%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
index a150238..c4131dc 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTestMigrate.php
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class MigrateProfileBillingTest extends Ubercart6TestBase {
+class MigrateProfileBillingTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
similarity index 93%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
index ca168db..e76c073 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateStoreTestMigrate.php
@@ -11,7 +11,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart6
  */
-class StoreTest extends Ubercart6TestBase {
+class MigrateStoreTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/TaxTypeTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
similarity index 91%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/TaxTypeTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
index c15a773..73cfff5 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/TaxTypeTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateTaxTypeTestMigrate.php
@@ -9,7 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate
  */
-class TaxTypeTest extends Ubercart6TestBase {
+class MigrateTaxTypeTestMigrate extends MigrateUbercart6TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateUbercart6TestBase.php
similarity index 93%
rename from modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateUbercart6TestBase.php
index dc492da..f4a0667 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateUbercart6TestBase.php
@@ -7,7 +7,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 /**
  * Test base for Ubercart D6 tests.
  */
-abstract class Ubercart6TestBase extends MigrateDrupal6TestBase {
+abstract class MigrateUbercart6TestBase extends MigrateDrupal6TestBase {
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
similarity index 89%
rename from modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
index 6431332..4a0a76b 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateCurrencyTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart7
  */
-class CurrencyTest extends Ubercart7TestBase {
+class MigrateCurrencyTestMigrate extends MigrateUbercart7TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateMigrateUbercart7FixtureTest.php
similarity index 88%
rename from modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateMigrateUbercart7FixtureTest.php
index 22d2a77..d1e8818 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateMigrateUbercart7FixtureTest.php
@@ -10,7 +10,7 @@ use Drupal\user\Entity\User;
  * @group commerce_migrate
  * @group commerce_migrate_ubercart7
  */
-class Ubercart7FixtureTest extends Ubercart7TestBase {
+class MigrateMigrateUbercart7FixtureTest extends MigrateUbercart7TestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
similarity index 93%
rename from modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
index e120269..b0272ff 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateStoreTestMigrate.php
@@ -10,7 +10,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  *
  * @group commerce_migrate_ubercart7
  */
-class StoreTest extends Ubercart7TestBase {
+class MigrateStoreTestMigrate extends MigrateUbercart7TestBase {
 
   use CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateUbercart7TestBase.php
similarity index 95%
rename from modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateUbercart7TestBase.php
index 4302aa3..bb065c5 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/MigrateUbercart7TestBase.php
@@ -7,7 +7,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 /**
  * Test base for Ubercart D7 tests.
  */
-abstract class Ubercart7TestBase extends MigrateDrupal7TestBase {
+abstract class MigrateUbercart7TestBase extends MigrateDrupal7TestBase {
 
   /**
    * Modules to enable.
diff --git a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/BillingProfileTest.php b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateBillingProfileTest.php
similarity index 97%
rename from modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/BillingProfileTest.php
rename to modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateBillingProfileTest.php
index 1b41413..f06e276 100644
--- a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/BillingProfileTest.php
+++ b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateBillingProfileTest.php
@@ -10,7 +10,7 @@ use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
  * @covers \Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6\BillingProfile
  * @group commerce_migrate_ubercart
  */
-class BillingProfileTest extends MigrateSqlSourceTestBase {
+class MigrateBillingProfileTest extends MigrateSqlSourceTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductCurrencyTest.php b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductCurrencyTest.php
similarity index 97%
rename from modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductCurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductCurrencyTest.php
index c1b60c0..83effb0 100644
--- a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductCurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductCurrencyTest.php
@@ -10,7 +10,7 @@ use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
  * @covers \Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6\OrderProduct
  * @group commerce_migrate_ubercart
  */
-class OrderProductCurrencyTest extends MigrateSqlSourceTestBase {
+class MigrateOrderProductCurrencyTest extends MigrateSqlSourceTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductNoCurrencyTest.php b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductNoCurrencyTest.php
similarity index 97%
rename from modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductNoCurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductNoCurrencyTest.php
index 3b37a9a..313c257 100644
--- a/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/OrderProductNoCurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/MigrateOrderProductNoCurrencyTest.php
@@ -10,7 +10,7 @@ use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
  * @covers \Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6\OrderProduct
  * @group commerce_migrate_ubercart
  */
-class OrderProductNoCurrencyTest extends MigrateSqlSourceTestBase {
+class MigrateOrderProductNoCurrencyTest extends MigrateSqlSourceTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Kernel/CommerceMigrateTestTrait.php b/tests/src/Kernel/CommerceMigrateTestTrait.php
index af01307..6b7e848 100644
--- a/tests/src/Kernel/CommerceMigrateTestTrait.php
+++ b/tests/src/Kernel/CommerceMigrateTestTrait.php
@@ -214,7 +214,7 @@ trait CommerceMigrateTestTrait {
     $this->assertInstanceOf(OrderItemType::class, $order_item_type);
     $this->assertSame($expected_label, $order_item_type->label());
   }
-  
+
   /**
    * Asserts a product attribute entity.
    *
