diff --git a/contracts/src/v0.8/ccip/test/MOAFT/CCIPTestSuite.sol b/contracts/src/v0.8/ccip/test/fork/CCIPTestSuite.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/CCIPTestSuite.sol
rename to contracts/src/v0.8/ccip/test/fork/CCIPTestSuite.sol
diff --git a/contracts/src/v0.8/ccip/test/MOAFT/ChainLoading.sol b/contracts/src/v0.8/ccip/test/fork/ChainLoading.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/ChainLoading.sol
rename to contracts/src/v0.8/ccip/test/fork/ChainLoading.sol
diff --git a/contracts/src/v0.8/ccip/test/MOAFT/ChainSelectors.sol b/contracts/src/v0.8/ccip/test/fork/ChainSelectors.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/ChainSelectors.sol
rename to contracts/src/v0.8/ccip/test/fork/ChainSelectors.sol
diff --git a/contracts/src/v0.8/ccip/test/MOAFT/ForkedChain.sol b/contracts/src/v0.8/ccip/test/fork/ForkedChain.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/ForkedChain.sol
rename to contracts/src/v0.8/ccip/test/fork/ForkedChain.sol
diff --git a/contracts/src/v0.8/ccip/test/MOAFT/ccip-owner-contracts/ManyChainMultiSig.sol b/contracts/src/v0.8/ccip/test/fork/ccip-owner-contracts/ManyChainMultiSig.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/ccip-owner-contracts/ManyChainMultiSig.sol
rename to contracts/src/v0.8/ccip/test/fork/ccip-owner-contracts/ManyChainMultiSig.sol
diff --git a/contracts/src/v0.8/ccip/test/MOAFT/ccip-owner-contracts/RBACTimelock.sol b/contracts/src/v0.8/ccip/test/fork/ccip-owner-contracts/RBACTimelock.sol
similarity index 100%
rename from contracts/src/v0.8/ccip/test/MOAFT/ccip-owner-contracts/RBACTimelock.sol
rename to contracts/src/v0.8/ccip/test/fork/ccip-owner-contracts/RBACTimelock.sol