diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
index fa70066ecf..120b175a86 100644
--- a/contracts/gas-snapshots/ccip.gas-snapshot
+++ b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -131,9 +131,9 @@ EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_AddNewChain_Success() (ga
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ApplyZeroUpdates_Success() (gas: 12399)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChainOnRamp_Revert() (gas: 93193)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain_Success() (gas: 109906)
+EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_RouterAddress_Revert() (gas: 13267)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ZeroOnRampAddress_Revert() (gas: 17992)
 EVM2EVMMultiOffRamp_applySourceChainConfigUpdates:test_ZeroSourceChainSelector_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)
@@ -362,14 +362,12 @@ EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 27233)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 45570)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 27368)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithGasOverride_Success() (gas: 193046)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 190587)
-EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2326013)
-EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 145830)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Failure() (gas: 399324)
-EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithDestGasAmountOverride_Mismatch_Failure() (gas: 396610)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithReceiverExecutionGasOverride_Failure() (gas: 154933)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithTokenGasOverride_Failure() (gas: 399345)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithTokenGasOverride_Mismatch_Failure() (gas: 396631)
+EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 190587)
+EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails_Success() (gas: 2326013)
+EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 145830)
 EVM2EVMOffRamp_metadataHash:test_MetadataHash_Success() (gas: 8860)
 EVM2EVMOffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 40153)
 EVM2EVMOffRamp_setDynamicConfig:test_RouterZeroAddress_Revert() (gas: 38236)
diff --git a/core/gethwrappers/ccip/mocks/evm2_evm_off_ramp_interface.go b/core/gethwrappers/ccip/mocks/evm2_evm_off_ramp_interface.go
index 713ac66e0f..9fba79ff2f 100644
--- a/core/gethwrappers/ccip/mocks/evm2_evm_off_ramp_interface.go
+++ b/core/gethwrappers/ccip/mocks/evm2_evm_off_ramp_interface.go
@@ -240,9 +240,9 @@ func (_c *EVM2EVMOffRampInterface_CurrentRateLimiterState_Call) RunAndReturn(run
 	return _c
 }
 
-// ExecuteSingleMessage provides a mock function with given fields: opts, message, offchainTokenData, destGasAmounts
-func (_m *EVM2EVMOffRampInterface) ExecuteSingleMessage(opts *bind.TransactOpts, message evm_2_evm_offramp.InternalEVM2EVMMessage, offchainTokenData [][]byte, destGasAmounts []*big.Int) (*types.Transaction, error) {
-	ret := _m.Called(opts, message, offchainTokenData, destGasAmounts)
+// ExecuteSingleMessage provides a mock function with given fields: opts, message, offchainTokenData, tokenGasOverrides
+func (_m *EVM2EVMOffRampInterface) ExecuteSingleMessage(opts *bind.TransactOpts, message evm_2_evm_offramp.InternalEVM2EVMMessage, offchainTokenData [][]byte, tokenGasOverrides []*big.Int) (*types.Transaction, error) {
+	ret := _m.Called(opts, message, offchainTokenData, tokenGasOverrides)
 
 	if len(ret) == 0 {
 		panic("no return value specified for ExecuteSingleMessage")
@@ -251,10 +251,10 @@ func (_m *EVM2EVMOffRampInterface) ExecuteSingleMessage(opts *bind.TransactOpts,
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, evm_2_evm_offramp.InternalEVM2EVMMessage, [][]byte, []*big.Int) (*types.Transaction, error)); ok {
-		return rf(opts, message, offchainTokenData, destGasAmounts)
+		return rf(opts, message, offchainTokenData, tokenGasOverrides)
 	}
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, evm_2_evm_offramp.InternalEVM2EVMMessage, [][]byte, []*big.Int) *types.Transaction); ok {
-		r0 = rf(opts, message, offchainTokenData, destGasAmounts)
+		r0 = rf(opts, message, offchainTokenData, tokenGasOverrides)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*types.Transaction)
@@ -262,7 +262,7 @@ func (_m *EVM2EVMOffRampInterface) ExecuteSingleMessage(opts *bind.TransactOpts,
 	}
 
 	if rf, ok := ret.Get(1).(func(*bind.TransactOpts, evm_2_evm_offramp.InternalEVM2EVMMessage, [][]byte, []*big.Int) error); ok {
-		r1 = rf(opts, message, offchainTokenData, destGasAmounts)
+		r1 = rf(opts, message, offchainTokenData, tokenGasOverrides)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -279,12 +279,12 @@ type EVM2EVMOffRampInterface_ExecuteSingleMessage_Call struct {
 //   - opts *bind.TransactOpts
 //   - message evm_2_evm_offramp.InternalEVM2EVMMessage
 //   - offchainTokenData [][]byte
-//   - destGasAmounts []*big.Int
-func (_e *EVM2EVMOffRampInterface_Expecter) ExecuteSingleMessage(opts interface{}, message interface{}, offchainTokenData interface{}, destGasAmounts interface{}) *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call {
-	return &EVM2EVMOffRampInterface_ExecuteSingleMessage_Call{Call: _e.mock.On("ExecuteSingleMessage", opts, message, offchainTokenData, destGasAmounts)}
+//   - tokenGasOverrides []*big.Int
+func (_e *EVM2EVMOffRampInterface_Expecter) ExecuteSingleMessage(opts interface{}, message interface{}, offchainTokenData interface{}, tokenGasOverrides interface{}) *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call {
+	return &EVM2EVMOffRampInterface_ExecuteSingleMessage_Call{Call: _e.mock.On("ExecuteSingleMessage", opts, message, offchainTokenData, tokenGasOverrides)}
 }
 
-func (_c *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call) Run(run func(opts *bind.TransactOpts, message evm_2_evm_offramp.InternalEVM2EVMMessage, offchainTokenData [][]byte, destGasAmounts []*big.Int)) *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call {
+func (_c *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call) Run(run func(opts *bind.TransactOpts, message evm_2_evm_offramp.InternalEVM2EVMMessage, offchainTokenData [][]byte, tokenGasOverrides []*big.Int)) *EVM2EVMOffRampInterface_ExecuteSingleMessage_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		run(args[0].(*bind.TransactOpts), args[1].(evm_2_evm_offramp.InternalEVM2EVMMessage), args[2].([][]byte), args[3].([]*big.Int))
 	})