diff --git a/modules/apps/transfer/v2/keeper/msg_server_test.go b/modules/apps/transfer/v2/keeper/msg_server_test.go
index cb88eef16cf..80150121695 100644
--- a/modules/apps/transfer/v2/keeper/msg_server_test.go
+++ b/modules/apps/transfer/v2/keeper/msg_server_test.go
@@ -265,15 +265,15 @@ func (suite *KeeperTestSuite) TestMsgRecvPacketTransfer() {
 			nil,
 		},
 		{
-			"failure: invalid destination channel on received packet",
+			"failure: invalid destination client on received packet",
 			func() {},
 			func() {
 				packet.DestinationClient = ibctesting.InvalidID
 			},
-			channeltypesv2.ErrChannelNotFound,
+			clienttypes.ErrClientNotFound,
 		},
 		{
-			"failure: counter party channel does not match source channel",
+			"failure: counter party client does not match source client",
 			func() {},
 			func() {
 				packet.SourceClient = ibctesting.InvalidID
@@ -593,7 +593,7 @@ func (suite *KeeperTestSuite) TestV2RetainsFungibility() {
 	denomBtoC := transfertypes.Denom{
 		Base: sdk.DefaultBondDenom,
 		Trace: []transfertypes.Hop{
-			transfertypes.NewHop(transfertypes.ModuleName, pathv2.EndpointB.ChannelID),
+			transfertypes.NewHop(transfertypes.ModuleName, pathv2.EndpointB.ClientID),
 			transfertypes.NewHop(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID),
 		},
 	}
diff --git a/modules/core/04-channel/v2/types/commitment_test.go b/modules/core/04-channel/v2/types/commitment_test.go
index 54b9890ef0b..bad4d42e465 100644
--- a/modules/core/04-channel/v2/types/commitment_test.go
+++ b/modules/core/04-channel/v2/types/commitment_test.go
@@ -26,7 +26,7 @@ func TestCommitPacket(t *testing.T) {
 		{
 			"json packet",
 			func() {}, // default is json packet
-			"450194f2ce25b12487f65593e106d91367a1e5c90b2efc03ed78265a54cfcebe",
+			"a096722aa6534040a0efbdae05765132a7b223ad306d6512f3734821bd046505",
 		},
 		{
 			"abi packet",
@@ -42,7 +42,7 @@ func TestCommitPacket(t *testing.T) {
 				packet.Payloads[0].Value = transferData
 				packet.Payloads[0].Encoding = transfertypes.EncodingABI
 			},
-			"b691a1950f6fb0bbbcf4bdb16fe2c4d0aa7ef783eb7803073f475cb8164d9b7a",
+			"d408dca5088b9b375edb3c4df6bae0e18084fc0dbd90fcd0d028506553c81b25",
 		},
 	}