diff --git a/test/accessControl.sol b/test/AccessControlTest.sol
similarity index 98%
rename from test/accessControl.sol
rename to test/AccessControlTest.sol
index 4bf70b8..be276a8 100644
--- a/test/accessControl.sol
+++ b/test/AccessControlTest.sol
@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 import "./HelperContract.sol";
 import {IERC20} from "ccip-v08/vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {Client} from "ccip/libraries/Client.sol";
-contract baseTest is HelperContract {
+contract AccessControlTest is HelperContract {
      // Arrange
     function setUp() public {
         // Deploy CCIP Sender
diff --git a/test/base.sol b/test/BaseTest.sol
similarity index 99%
rename from test/base.sol
rename to test/BaseTest.sol
index 4e9f051..38c6697 100644
--- a/test/base.sol
+++ b/test/BaseTest.sol
@@ -6,7 +6,7 @@ import "./HelperContract.sol";
 import {IERC20} from "ccip-v08/vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {ERC20Mock} from "openzeppelin-contracts/mocks/token/ERC20Mock.sol";
 import {Client} from "ccip/libraries/Client.sol";
-contract baseTest is HelperContract {
+contract BaseTest is HelperContract {
     ERC20Mock private erc20;
     address private ROUTER = address(0x1);
     event MessageData(string newMessageData);
diff --git a/test/routerTest.sol b/test/RouterTest.sol
similarity index 100%
rename from test/routerTest.sol
rename to test/RouterTest.sol
diff --git a/test/nativeToken/baseNativeToken.sol b/test/nativeToken/BaseNativeTokenTest.sol
similarity index 98%
rename from test/nativeToken/baseNativeToken.sol
rename to test/nativeToken/BaseNativeTokenTest.sol
index 36acf44..9507cd4 100644
--- a/test/nativeToken/baseNativeToken.sol
+++ b/test/nativeToken/BaseNativeTokenTest.sol
@@ -6,7 +6,7 @@ import "../HelperContract.sol";
 import {IERC20} from "ccip-v08/vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {ERC20Mock} from "openzeppelin-contracts/mocks/token/ERC20Mock.sol";
 import {Client} from "ccip/libraries/Client.sol";
-contract baseTest is HelperContract {
+contract BaseNativeTokenTest is HelperContract {
     ERC20Mock private erc20;
     address private ROUTER = address(0x1);
     uint256  NATIVE_TOKEN_SELECTION = 0;
diff --git a/test/nativeToken/routerTestNativeToken.sol b/test/nativeToken/routerNativeTokenTest.sol
similarity index 99%
rename from test/nativeToken/routerTestNativeToken.sol
rename to test/nativeToken/routerNativeTokenTest.sol
index 0c24a11..cea61a9 100644
--- a/test/nativeToken/routerTestNativeToken.sol
+++ b/test/nativeToken/routerNativeTokenTest.sol
@@ -7,7 +7,7 @@ import "../utils/router.sol";
 import {IERC20} from "ccip-v08/vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {ERC20Mock} from "openzeppelin-contracts/mocks/token/ERC20Mock.sol";
 import {Client} from "ccip/libraries/Client.sol";
-contract RouterTest is HelperContract {
+contract RouterNativeTest is HelperContract {
     uint256  NATIVE_TOKEN_SELECTION = 0;
     error ERC20InsufficientAllowance(address spender, uint256 allowance, uint256 needed);
     error ERC20InsufficientBalance(address sender, uint256 balance, uint256 needed);
diff --git a/test/simulator/Simulator.sol b/test/simulator/SimulatorTest.sol
similarity index 100%
rename from test/simulator/Simulator.sol
rename to test/simulator/SimulatorTest.sol