diff --git a/test/forge/fork/EthereumBundlerEthereumTest.sol b/test/forge/fork/BundlerForkTest.sol
similarity index 100%
rename from test/forge/fork/EthereumBundlerEthereumTest.sol
rename to test/forge/fork/BundlerForkTest.sol
diff --git a/test/forge/fork/Permit2BundlerEthereumTest.sol b/test/forge/fork/Permit2BundlerForkTest.sol
similarity index 100%
rename from test/forge/fork/Permit2BundlerEthereumTest.sol
rename to test/forge/fork/Permit2BundlerForkTest.sol
diff --git a/test/forge/fork/EthereumPermitBundlerEthereumTest.sol b/test/forge/fork/PermitBundlerForkTest.sol
similarity index 100%
rename from test/forge/fork/EthereumPermitBundlerEthereumTest.sol
rename to test/forge/fork/PermitBundlerForkTest.sol
diff --git a/test/forge/fork/EthereumStEthBundlerEthereumTest.sol b/test/forge/fork/StEthBundlerForkTest.sol
similarity index 100%
rename from test/forge/fork/EthereumStEthBundlerEthereumTest.sol
rename to test/forge/fork/StEthBundlerForkTest.sol
diff --git a/test/forge/fork/WNativeBundlerEthereumTest.sol b/test/forge/fork/WNativeBundlerForkTest.sol
similarity index 100%
rename from test/forge/fork/WNativeBundlerEthereumTest.sol
rename to test/forge/fork/WNativeBundlerForkTest.sol
diff --git a/test/forge/fork/migration/AaveV2MigrationBundlerEthereumTest.sol b/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol
similarity index 98%
rename from test/forge/fork/migration/AaveV2MigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol
index bbf2380e..6a0d2bc5 100644
--- a/test/forge/fork/migration/AaveV2MigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol
@@ -7,9 +7,9 @@ import {IERC4626} from "../../../../lib/openzeppelin-contracts/contracts/interfa
 
 import "../../../../src/migration/AaveV2MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract AaveV2MigrationBundlerEthereumTest is EthereumMigrationTest {
+contract AaveV2MigrationBundlerEthereumTest is MigrationForkTest {
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
     using MorphoLib for IMorpho;
diff --git a/test/forge/fork/migration/AaveV3MigrationBundlerEthereumTest.sol b/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol
similarity index 99%
rename from test/forge/fork/migration/AaveV3MigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol
index eadcd6ef..b9460e63 100644
--- a/test/forge/fork/migration/AaveV3MigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol
@@ -7,9 +7,9 @@ import {IAaveV3} from "../../../../src/migration/interfaces/IAaveV3.sol";
 import {SigUtils, Permit} from "../../helpers/SigUtils.sol";
 import "../../../../src/migration/AaveV3MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract AaveV3MigrationBundlerEthereumTest is EthereumMigrationTest {
+contract AaveV3MigrationBundlerEthereumTest is MigrationForkTest {
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
     using MorphoLib for IMorpho;
diff --git a/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerEthereumTest.sol b/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol
similarity index 98%
rename from test/forge/fork/migration/AaveV3OptimizerMigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol
index 0934f6cf..ea21313d 100644
--- a/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol
@@ -5,9 +5,9 @@ import {Authorization as AaveV3OptimizerAuthorization} from "../../../../src/mig
 
 import "../../../../src/migration/AaveV3OptimizerMigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract AaveV3OptimizerMigrationBundlerEthereumTest is EthereumMigrationTest {
+contract AaveV3OptimizerMigrationBundlerEthereumTest is MigrationForkTest {
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
     using MorphoLib for IMorpho;
diff --git a/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerEthereumTest.sol b/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol
similarity index 97%
rename from test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol
index 23e59b53..a162d1b6 100644
--- a/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol
@@ -5,9 +5,9 @@ import {IComptroller} from "../../../../src/migration/interfaces/IComptroller.so
 
 import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract CompoundV2EthLoanMigrationBundlerEthereumTest is EthereumMigrationTest {
+contract CompoundV2EthLoanMigrationBundlerEthereumTest is MigrationForkTest {
     using MathLib for uint256;
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
diff --git a/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerEthereumTest.sol b/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol
similarity index 97%
rename from test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol
index d52f09be..0fd19507 100644
--- a/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol
@@ -5,9 +5,9 @@ import {IComptroller} from "../../../../src/migration/interfaces/IComptroller.so
 
 import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract CompoundV2EthCollateralMigrationBundlerEthereumTest is EthereumMigrationTest {
+contract CompoundV2EthCollateralMigrationBundlerEthereumTest is MigrationForkTest {
     using MathLib for uint256;
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
diff --git a/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerEthereumTest.sol b/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol
similarity index 97%
rename from test/forge/fork/migration/CompoundV2NoEthMigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol
index a7bc4d36..dd59a332 100644
--- a/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol
@@ -5,9 +5,9 @@ import {IComptroller} from "../../../../src/migration/interfaces/IComptroller.so
 
 import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract CompoundV2NoEthMigrationBundlerEthereumTest is EthereumMigrationTest {
+contract CompoundV2NoEthMigrationBundlerEthereumTest is MigrationForkTest {
     using MathLib for uint256;
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
diff --git a/test/forge/fork/migration/CompoundV3MigrationBundlerEthereumTest.sol b/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol
similarity index 98%
rename from test/forge/fork/migration/CompoundV3MigrationBundlerEthereumTest.sol
rename to test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol
index b0a49eb9..91e3c11f 100644
--- a/test/forge/fork/migration/CompoundV3MigrationBundlerEthereumTest.sol
+++ b/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol
@@ -5,9 +5,9 @@ import {CompoundV3Authorization} from "../../helpers/SigUtils.sol";
 
 import "../../../../src/migration/CompoundV3MigrationBundlerV2.sol";
 
-import "./helpers/EthereumMigrationTest.sol";
+import "./helpers/MigrationForkTest.sol";
 
-contract CompoundV3MigrationBundlerEthereumTest is EthereumMigrationTest {
+contract CompoundV3MigrationBundlerEthereumTest is MigrationForkTest {
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
     using MorphoLib for IMorpho;
diff --git a/test/forge/fork/migration/helpers/EthereumMigrationTest.sol b/test/forge/fork/migration/helpers/MigrationForkTest.sol
similarity index 98%
rename from test/forge/fork/migration/helpers/EthereumMigrationTest.sol
rename to test/forge/fork/migration/helpers/MigrationForkTest.sol
index 7e02c9fa..6ccc0402 100644
--- a/test/forge/fork/migration/helpers/EthereumMigrationTest.sol
+++ b/test/forge/fork/migration/helpers/MigrationForkTest.sol
@@ -16,7 +16,7 @@ import {ERC4626Bundler} from "../../../../../src/ERC4626Bundler.sol";
 import {MorphoBundler} from "../../../../../src/MorphoBundler.sol";
 import {ERC4626Mock} from "../../../../../src/mocks/ERC4626Mock.sol";
 
-contract EthereumMigrationTest is ForkTest {
+contract MigrationForkTest is ForkTest {
     using SafeTransferLib for ERC20;
     using MarketParamsLib for MarketParams;
     using MorphoLib for IMorpho;