diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot
index 767dd868f89c..5919f2b9cd2c 100644
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -32,25 +32,25 @@ DisputeGameFactory_SetImplementation_Test:test_setImplementation_notOwner_revert
 DisputeGameFactory_SetImplementation_Test:test_setImplementation_succeeds() (gas: 44243)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_notOwner_reverts() (gas: 15950)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_succeeds() (gas: 18642)
-FaultDisputeGame_Test:test_clockTimeExceeded_reverts() (gas: 26474)
-FaultDisputeGame_Test:test_defendRoot_reverts() (gas: 13280)
-FaultDisputeGame_Test:test_duplicateClaim_reverts() (gas: 103381)
+FaultDisputeGame_Test:test_clockTimeExceeded_reverts() (gas: 26496)
+FaultDisputeGame_Test:test_defendRoot_reverts() (gas: 13236)
+FaultDisputeGame_Test:test_duplicateClaim_reverts() (gas: 103425)
 FaultDisputeGame_Test:test_extraData_succeeds() (gas: 17478)
 FaultDisputeGame_Test:test_gameData_succeeds() (gas: 17859)
-FaultDisputeGame_Test:test_gameDepthExceeded_reverts() (gas: 5907275)
+FaultDisputeGame_Test:test_gameDepthExceeded_reverts() (gas: 5907231)
 FaultDisputeGame_Test:test_gameStart_succeeds() (gas: 10337)
-FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8194)
-FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 17580)
-FaultDisputeGame_Test:test_moveAgainstNonexistentParent_reverts() (gas: 24609)
+FaultDisputeGame_Test:test_gameType_succeeds() (gas: 8259)
+FaultDisputeGame_Test:test_initialRootClaimData_succeeds() (gas: 17624)
+FaultDisputeGame_Test:test_moveAgainstNonexistentParent_reverts() (gas: 24632)
 FaultDisputeGame_Test:test_move_gameNotInProgress_reverts() (gas: 10945)
-FaultDisputeGame_Test:test_resolve_challenge_contested() (gas: 222404)
-FaultDisputeGame_Test:test_resolve_reverts() (gas: 27143)
-FaultDisputeGame_Test:test_resolve_root_contested() (gas: 107149)
-FaultDisputeGame_Test:test_resolve_root_uncontested() (gas: 24504)
-FaultDisputeGame_Test:test_resolve_team_deathmatch() (gas: 393619)
-FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8191)
+FaultDisputeGame_Test:test_resolve_challengeContested() (gas: 222383)
+FaultDisputeGame_Test:test_resolve_reverts() (gas: 27121)
+FaultDisputeGame_Test:test_resolve_rootContested() (gas: 107225)
+FaultDisputeGame_Test:test_resolve_rootUncontested() (gas: 24459)
+FaultDisputeGame_Test:test_resolve_teamDeathmatch() (gas: 393609)
+FaultDisputeGame_Test:test_rootClaim_succeeds() (gas: 8169)
 FaultDisputeGame_Test:test_simpleAttack_succeeds() (gas: 107389)
-FaultDisputeGame_Test:test_version_succeeds() (gas: 9802)
+FaultDisputeGame_Test:test_version_succeeds() (gas: 9780)
 FeeVault_Test:test_constructor_succeeds() (gas: 18185)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352113)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950320)
diff --git a/packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol b/packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol
index b33130c9e576..748411d5e2ed 100644
--- a/packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol
@@ -270,16 +270,16 @@ contract FaultDisputeGame_Test is DisputeGameFactory_Init {
     }
 
     /**
-     * @dev Static unit test for the correctness of resolution.
+     * @dev Static unit test for the correctness an uncontested root resolution.
      */
-    function test_resolve_root_uncontested() public {
+    function test_resolve_rootUncontested() public {
         GameStatus status = gameProxy.resolve();
         assertEq(uint8(status), uint8(GameStatus.DEFENDER_WINS));
         assertEq(uint8(gameProxy.status()), uint8(GameStatus.DEFENDER_WINS));
     }
 
     /**
-     * @dev Static unit test for the correctness of resolution.
+     * @dev Static unit test asserting that resolve reverts when the game is not in progress.
      */
     function test_resolve_reverts() public {
         gameProxy.resolve();
@@ -288,9 +288,9 @@ contract FaultDisputeGame_Test is DisputeGameFactory_Init {
     }
 
     /**
-     * @dev Static unit test for the correctness of resolution.
+     * @dev Static unit test for the correctness of resolving a single attack game state.
      */
-    function test_resolve_root_contested() public {
+    function test_resolve_rootContested() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
 
         GameStatus status = gameProxy.resolve();
@@ -299,9 +299,9 @@ contract FaultDisputeGame_Test is DisputeGameFactory_Init {
     }
 
     /**
-     * @dev Static unit test for the correctness of resolution.
+     * @dev Static unit test for the correctness of resolving a game with a contested challenge claim.
      */
-    function test_resolve_challenge_contested() public {
+    function test_resolve_challengeContested() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
         gameProxy.defend(1, Claim.wrap(bytes32(uint256(6))));
 
@@ -311,9 +311,9 @@ contract FaultDisputeGame_Test is DisputeGameFactory_Init {
     }
 
     /**
-     * @dev Static unit test for the correctness of resolution.
+     * @dev Static unit test for the correctness of resolving a game with multiplayer moves.
      */
-    function test_resolve_team_deathmatch() public {
+    function test_resolve_teamDeathmatch() public {
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(5))));
         gameProxy.attack(0, Claim.wrap(bytes32(uint256(4))));
         gameProxy.defend(1, Claim.wrap(bytes32(uint256(6))));