diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index 9769a2cc98..62b44ccc3f 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -133,7 +133,7 @@ EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChainOnRam
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain_Success() (gas: 109906)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ZeroOnRampAddress_Revert() (gas: 17992)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ZeroSourceChainSelector_Revert() (gas: 15347)
-EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_RouterAddress_Revert() (gas: 15347)
+EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_RouterAddress_Revert() (gas: 13267)
 EVM2EVMMultiOffRamp_batchExecute:test_MultipleReportsDifferentChains_Success() (gas: 296705)
 EVM2EVMMultiOffRamp_batchExecute:test_MultipleReportsSameChain_Success() (gas: 238095)
 EVM2EVMMultiOffRamp_batchExecute:test_MultipleReportsSkipDuplicate_Success() (gas: 157010)
@@ -220,7 +220,7 @@ EVM2EVMMultiOffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 36
 EVM2EVMMultiOffRamp_getExecutionState:test_GetDifferentChainExecutionState_Success() (gas: 118202)
 EVM2EVMMultiOffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 87461)
 EVM2EVMMultiOffRamp_manuallyExecute:test_ManualExecGasLimitMismatchSingleReport_Revert() (gas: 75600)
-EVM2EVMMultiOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27390)
+EVM2EVMMultiOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 26461)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 163139)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 205495)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_ForkedChain_Revert() (gas: 26004)
@@ -286,7 +286,7 @@ EVM2EVMMultiOnRamp_getFee:test_EnforceOutOfOrder_Revert() (gas: 74075)
 EVM2EVMMultiOnRamp_getFee:test_SingleTokenMessage_Success() (gas: 119799)
 EVM2EVMMultiOnRamp_getFee:test_Unhealthy_Revert() (gas: 43679)
 EVM2EVMMultiOnRamp_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10438)
-EVM2EVMMultiOnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35204)
+EVM2EVMMultiOnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35270)
 EVM2EVMMultiOnRamp_setDynamicConfig:test_SetConfigInvalidConfigFeeAggregatorEqAddressZero_Revert() (gas: 11155)
 EVM2EVMMultiOnRamp_setDynamicConfig:test_SetConfigInvalidConfigPriceRegistryEqAddressZero_Revert() (gas: 12740)
 EVM2EVMMultiOnRamp_setDynamicConfig:test_SetConfigInvalidConfig_Revert() (gas: 11112)
@@ -360,14 +360,14 @@ EVM2EVMOffRamp_manuallyExecute:test_LowGasLimitManualExec_Success() (gas: 485980
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecFailedTx_Revert() (gas: 189173)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 27188)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 45592)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27245)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27390)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithGasOverride_Success() (gas: 193068)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 190609)
 EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2326013)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 145852)
-EVM2EVMOffRamp_manuallyExecute::test_ManualExecWithDestGasAmountOverride_Failure() (gas: 145852)
-EVM2EVMOffRamp_manuallyExecute::test_ManualExecWithDestGasAmountOverride_Mismatch_Failure() (gas: 145852)
-EVM2EVMOffRamp_manuallyExecute::test_ManualExecWithReceiverExecutionGasOverride_Failure() (gas: 145852)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Failure() (gas: 145852)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Mismatch_Failure() (gas: 145852)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithReceiverExecutionGasOverride_Failure() (gas: 145852)
 EVM2EVMOffRamp_metadataHash:test_MetadataHash_Success() (gas: 8860)
 EVM2EVMOffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 40131)
 EVM2EVMOffRamp_setDynamicConfig:test_RouterZeroAddress_Revert() (gas: 38236)
@@ -423,7 +423,7 @@ EVM2EVMOnRamp_getFee:test_SingleTokenMessage_Success() (gas: 117858)
 EVM2EVMOnRamp_getFee:test_TooManyTokens_Revert() (gas: 19902)
 EVM2EVMOnRamp_getFee:test_ZeroDataAvailabilityMultiplier_Success() (gas: 64654)
 EVM2EVMOnRamp_getSupportedTokens:test_GetSupportedTokens_Revert() (gas: 10460)
-EVM2EVMOnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35270)
+EVM2EVMOnRamp_getTokenPool:test_GetTokenPool_Success() (gas: 35195)
 EVM2EVMOnRamp_getTokenTransferCost:test_CustomTokenBpsFee_Success() (gas: 45082)
 EVM2EVMOnRamp_getTokenTransferCost:test_FeeTokenBpsFee_Success() (gas: 33019)
 EVM2EVMOnRamp_getTokenTransferCost:test_LargeTokenTransferChargesMaxFeeAndGas_Success() (gas: 28296)