diff --git a/.gas-snapshot b/.gas-snapshot
index ecf05fa2..ab214d2b 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -9,14 +9,14 @@ IBCMockAppTest:testHandshakeBetweenDifferentPorts() (gas: 3339603)
 IBCMockAppTest:testPacketRelay() (gas: 13935831)
 IBCMockAppTest:testPacketTimeout() (gas: 4284259)
 ICS24HostTest:testValidatePortIdentifier() (gas: 37060)
-TestICS02:testCreateClient() (gas: 36638179)
+TestICS02:testCreateClient() (gas: 36638191)
 TestICS02:testHeightToUint128((uint64,uint64)) (runs: 256, μ: 887, ~: 887)
-TestICS02:testInvalidCreateClient() (gas: 36535290)
-TestICS02:testInvalidUpdateClient() (gas: 36534306)
-TestICS02:testRegisterClient() (gas: 36189972)
-TestICS02:testRegisterClientDuplicatedClientType() (gas: 36175281)
-TestICS02:testRegisterClientInvalidClientType() (gas: 36204787)
-TestICS02:testUpdateClient() (gas: 36702506)
+TestICS02:testInvalidCreateClient() (gas: 36535302)
+TestICS02:testInvalidUpdateClient() (gas: 36534318)
+TestICS02:testRegisterClient() (gas: 36189984)
+TestICS02:testRegisterClientDuplicatedClientType() (gas: 36175293)
+TestICS02:testRegisterClientInvalidClientType() (gas: 36204799)
+TestICS02:testUpdateClient() (gas: 36702518)
 TestICS03Handshake:testConnOpenAck() (gas: 1858230)
 TestICS03Handshake:testConnOpenConfirm() (gas: 2054143)
 TestICS03Handshake:testConnOpenInit() (gas: 1429838)
diff --git a/contracts/core/04-channel/IBCChannelUpgrade.sol b/contracts/core/04-channel/IBCChannelUpgrade.sol
index 9d931ae0..80b4948a 100644
--- a/contracts/core/04-channel/IBCChannelUpgrade.sol
+++ b/contracts/core/04-channel/IBCChannelUpgrade.sol
@@ -583,7 +583,10 @@ contract IBCChannelUpgradeInitTryAck is IBCChannelUpgradeBase, IIBCChannelUpgrad
     }
 }
 
-contract IBCChannelUpgradeConfirmTimeoutCancel is IBCChannelUpgradeBase, IIBCChannelUpgradeConfirmOpenTimeoutCancel {
+contract IBCChannelUpgradeConfirmOpenTimeoutCancel is
+    IBCChannelUpgradeBase,
+    IIBCChannelUpgradeConfirmOpenTimeoutCancel
+{
     /**
      * @dev See {IIBCChannelUpgrade-channelUpgradeConfirm}
      */
diff --git a/tests/foundry/src/Deploy.s.sol b/tests/foundry/src/Deploy.s.sol
index ff3d034d..8207dd56 100644
--- a/tests/foundry/src/Deploy.s.sol
+++ b/tests/foundry/src/Deploy.s.sol
@@ -10,7 +10,7 @@ import {IBCChannelPacketSendRecv} from "../../../contracts/core/04-channel/IBCCh
 import {IBCChannelPacketTimeout} from "../../../contracts/core/04-channel/IBCChannelPacketTimeout.sol";
 import {
     IBCChannelUpgradeInitTryAck,
-    IBCChannelUpgradeConfirmTimeoutCancel
+    IBCChannelUpgradeConfirmOpenTimeoutCancel
 } from "../../../contracts/core/04-channel/IBCChannelUpgrade.sol";
 import {IIBCHandler} from "../../../contracts/core/25-handler/IIBCHandler.sol";
 import {OwnableIBCHandler} from "../../../contracts/core/25-handler/OwnableIBCHandler.sol";
@@ -39,7 +39,7 @@ contract DeployScript is Script {
                 new IBCChannelPacketSendRecv(),
                 new IBCChannelPacketTimeout(),
                 new IBCChannelUpgradeInitTryAck(),
-                new IBCChannelUpgradeConfirmTimeoutCancel()
+                new IBCChannelUpgradeConfirmOpenTimeoutCancel()
             )
         );
 
diff --git a/tests/foundry/src/helpers/IBCTestHelper.t.sol b/tests/foundry/src/helpers/IBCTestHelper.t.sol
index f296957c..6d5aad2f 100644
--- a/tests/foundry/src/helpers/IBCTestHelper.t.sol
+++ b/tests/foundry/src/helpers/IBCTestHelper.t.sol
@@ -30,7 +30,7 @@ abstract contract IBCTestHelper is Test {
             new IBCChannelPacketSendRecv(),
             new IBCChannelPacketTimeout(),
             new IBCChannelUpgradeInitTryAck(),
-            new IBCChannelUpgradeConfirmTimeoutCancel()
+            new IBCChannelUpgradeConfirmOpenTimeoutCancel()
         );
     }