diff --git a/e2e/testsuite/grpc_query.go b/e2e/testsuite/grpc_query.go
index 87620f86329..44ba2614d94 100644
--- a/e2e/testsuite/grpc_query.go
+++ b/e2e/testsuite/grpc_query.go
@@ -412,7 +412,7 @@ func (s *E2ETestSuite) QueryGranterGrants(ctx context.Context, chain ibc.Chain,
 	return grants.Grants, nil
 }
 
-// QueryBalances returns all the balances on the given chain for the provided address.
+// QueryAllBalances returns all the balances on the given chain for the provided address.
 func (s *E2ETestSuite) QueryAllBalances(ctx context.Context, chain ibc.Chain, address string, resolveDenom bool) (sdk.Coins, error) {
 	queryClient := s.GetChainGRCPClients(chain).BankQueryClient
 	res, err := queryClient.AllBalances(ctx, &banktypes.QueryAllBalancesRequest{
diff --git a/modules/apps/27-interchain-accounts/host/ibc_module.go b/modules/apps/27-interchain-accounts/host/ibc_module.go
index 81dbb148679..b5163393f67 100644
--- a/modules/apps/27-interchain-accounts/host/ibc_module.go
+++ b/modules/apps/27-interchain-accounts/host/ibc_module.go
@@ -78,7 +78,7 @@ func (IBCModule) OnChanOpenAck(
 	return errorsmod.Wrap(icatypes.ErrInvalidChannelFlow, "channel handshake must be initiated by controller chain")
 }
 
-// OnChanOpenAck implements the IBCModule interface
+// OnChanOpenConfirm implements the IBCModule interface
 func (im IBCModule) OnChanOpenConfirm(
 	ctx sdk.Context,
 	portID,
diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go
index 4501788d749..c3bb9c8fefa 100644
--- a/modules/apps/29-fee/keeper/escrow.go
+++ b/modules/apps/29-fee/keeper/escrow.go
@@ -102,7 +102,7 @@ func (k Keeper) distributePacketFeeOnAcknowledgement(ctx sdk.Context, refundAddr
 	k.distributeFee(ctx, refundAddr, refundAddr, refundCoins)
 }
 
-// DistributePacketsFeesOnTimeout pays all the timeout fees for a given packetID while refunding the acknowledgement & receive fees to the refund account.
+// DistributePacketFeesOnTimeout pays all the timeout fees for a given packetID while refunding the acknowledgement & receive fees to the refund account.
 func (k Keeper) DistributePacketFeesOnTimeout(ctx sdk.Context, timeoutRelayer sdk.AccAddress, packetFees []types.PacketFee, packetID channeltypes.PacketId) {
 	// cache context before trying to distribute fees
 	// if the escrow account has insufficient balance then we want to avoid partially distributing fees
diff --git a/modules/apps/29-fee/types/keys.go b/modules/apps/29-fee/types/keys.go
index 9edd77ae14e..2d024579146 100644
--- a/modules/apps/29-fee/types/keys.go
+++ b/modules/apps/29-fee/types/keys.go
@@ -26,7 +26,7 @@ const (
 
 	Version = "ics29-1"
 
-	// FeeEnabledPrefix is the key prefix for storing fee enabled flag
+	// FeeEnabledKeyPrefix is the key prefix for storing fee enabled flag
 	FeeEnabledKeyPrefix = "feeEnabled"
 
 	// PayeeKeyPrefix is the key prefix for the fee payee address stored in state
diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go
index c2d8ba364e6..e11c2009852 100644
--- a/modules/apps/29-fee/types/msgs.go
+++ b/modules/apps/29-fee/types/msgs.go
@@ -131,7 +131,7 @@ func (msg MsgPayPacketFee) ValidateBasic() error {
 	return msg.Fee.Validate()
 }
 
-// NewMsgPayPacketAsync creates a new instance of MsgPayPacketFee
+// NewMsgPayPacketFeeAsync creates a new instance of MsgPayPacketFeeAsync
 func NewMsgPayPacketFeeAsync(packetID channeltypes.PacketId, packetFee PacketFee) *MsgPayPacketFeeAsync {
 	return &MsgPayPacketFeeAsync{
 		PacketId:  packetID,
diff --git a/modules/light-clients/08-wasm/testing/mock_engine.go b/modules/light-clients/08-wasm/testing/mock_engine.go
index 6e6e985e65a..b8cba81b430 100644
--- a/modules/light-clients/08-wasm/testing/mock_engine.go
+++ b/modules/light-clients/08-wasm/testing/mock_engine.go
@@ -140,7 +140,7 @@ func (m *MockWasmEngine) StoreCode(code wasmvm.WasmCode) (wasmvm.Checksum, error
 	return m.StoreCodeFn(code)
 }
 
-// StoreCode implements the WasmEngine interface.
+// StoreCodeUnchecked implements the WasmEngine interface.
 func (m *MockWasmEngine) StoreCodeUnchecked(code wasmvm.WasmCode) (wasmvm.Checksum, error) {
 	if m.StoreCodeUncheckedFn == nil {
 		panic(errors.New("mock engine is not properly initialized: StoreCodeUncheckedFn is nil"))
diff --git a/modules/light-clients/08-wasm/types/contract_api.go b/modules/light-clients/08-wasm/types/contract_api.go
index 20b39c3f0d8..0247951f6ed 100644
--- a/modules/light-clients/08-wasm/types/contract_api.go
+++ b/modules/light-clients/08-wasm/types/contract_api.go
@@ -95,7 +95,7 @@ type VerifyUpgradeAndUpdateStateMsg struct {
 	ProofUpgradeConsensusState []byte `json:"proof_upgrade_consensus_state"`
 }
 
-// MigrateClientStore is a sudoMsg sent to the contract to verify a given substitute client and update to its state.
+// MigrateClientStoreMsg is a sudoMsg sent to the contract to verify a given substitute client and update to its state.
 type MigrateClientStoreMsg struct{}
 
 // ContractResult is a type constraint that defines the expected results that can be returned by a contract call/query.
diff --git a/modules/light-clients/08-wasm/types/msgs.go b/modules/light-clients/08-wasm/types/msgs.go
index 000716469e3..fdc743db85c 100644
--- a/modules/light-clients/08-wasm/types/msgs.go
+++ b/modules/light-clients/08-wasm/types/msgs.go
@@ -17,7 +17,7 @@ var (
 	_ sdk.HasValidateBasic = (*MsgRemoveChecksum)(nil)
 )
 
-// MsgStoreCode creates a new MsgStoreCode instance
+// NewMsgStoreCode creates a new MsgStoreCode instance
 func NewMsgStoreCode(signer string, code []byte) *MsgStoreCode {
 	return &MsgStoreCode{
 		Signer:       signer,
diff --git a/testing/solomachine.go b/testing/solomachine.go
index 2a53a43b252..470f3b74943 100644
--- a/testing/solomachine.go
+++ b/testing/solomachine.go
@@ -439,7 +439,7 @@ func (solo *Solomachine) TimeoutPacket(chain *TestChain, packet channeltypes.Pac
 	require.NotNil(solo.t, res)
 }
 
-// TimeoutPacket creates a channel closed and unreceived packet proof and broadcasts a MsgTimeoutOnClose.
+// TimeoutPacketOnClose creates a channel closed and unreceived packet proof and broadcasts a MsgTimeoutOnClose.
 func (solo *Solomachine) TimeoutPacketOnClose(chain *TestChain, packet channeltypes.Packet, channelID string) {
 	closedProof := solo.GenerateChanClosedProof(transfertypes.PortID, transfertypes.Version, channelID)
 	unreceivedProof := solo.GenerateReceiptAbsenceProof(packet)