diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index 863983e7a95..b5934148efa 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -3433,13 +3433,13 @@ type.
 
 ### MsgUpdateClient
 MsgUpdateClient defines an sdk.Msg to update a IBC client state using
-the given header.
+the given client message.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `client_id` | [string](#string) |  | client unique identifier |
-| `header` | [google.protobuf.Any](#google.protobuf.Any) |  | header to update the light client |
+| `client_message` | [google.protobuf.Any](#google.protobuf.Any) |  | client message to update the light client |
 | `signer` | [string](#string) |  | signer address |
 
 
diff --git a/modules/core/02-client/client/cli/cli.go b/modules/core/02-client/client/cli/cli.go
index be33557d7ed..2a2546f1ab1 100644
--- a/modules/core/02-client/client/cli/cli.go
+++ b/modules/core/02-client/client/cli/cli.go
@@ -44,7 +44,7 @@ func NewTxCmd() *cobra.Command {
 	txCmd.AddCommand(
 		NewCreateClientCmd(),
 		NewUpdateClientCmd(),
-		NewSubmitMisbehaviourCmd(),
+		NewSubmitMisbehaviourCmd(), // Deprecated
 		NewUpgradeClientCmd(),
 	)
 
diff --git a/modules/core/02-client/client/cli/tx.go b/modules/core/02-client/client/cli/tx.go
index 097baaa5f82..00cee6e5d2a 100644
--- a/modules/core/02-client/client/cli/tx.go
+++ b/modules/core/02-client/client/cli/tx.go
@@ -86,10 +86,10 @@ func NewCreateClientCmd() *cobra.Command {
 // NewUpdateClientCmd defines the command to update an IBC client.
 func NewUpdateClientCmd() *cobra.Command {
 	return &cobra.Command{
-		Use:     "update [client-id] [path/to/header.json]",
-		Short:   "update existing client with a header",
-		Long:    "update existing client with a header",
-		Example: fmt.Sprintf("%s tx ibc %s update [client-id] [path/to/header.json] --from node0 --home ../node0/<app>cli --chain-id $CID", version.AppName, types.SubModuleName),
+		Use:     "update [client-id] [path/to/client_msg.json]",
+		Short:   "update existing client with a client message",
+		Long:    "update existing client with a client message, for example a header, misbehaviour or batch update",
+		Example: fmt.Sprintf("%s tx ibc %s update [client-id] [path/to/client_msg.json] --from node0 --home ../node0/<app>cli --chain-id $CID", version.AppName, types.SubModuleName),
 		Args:    cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
@@ -100,22 +100,22 @@ func NewUpdateClientCmd() *cobra.Command {
 
 			cdc := codec.NewProtoCodec(clientCtx.InterfaceRegistry)
 
-			var header exported.ClientMessage
-			headerContentOrFileName := args[1]
-			if err := cdc.UnmarshalInterfaceJSON([]byte(headerContentOrFileName), &header); err != nil {
+			var clientMsg exported.ClientMessage
+			clientMsgContentOrFileName := args[1]
+			if err := cdc.UnmarshalInterfaceJSON([]byte(clientMsgContentOrFileName), &clientMsg); err != nil {
 
 				// check for file path if JSON input is not provided
-				contents, err := ioutil.ReadFile(headerContentOrFileName)
+				contents, err := ioutil.ReadFile(clientMsgContentOrFileName)
 				if err != nil {
 					return fmt.Errorf("neither JSON input nor path to .json file for header were provided: %w", err)
 				}
 
-				if err := cdc.UnmarshalInterfaceJSON(contents, &header); err != nil {
+				if err := cdc.UnmarshalInterfaceJSON(contents, &clientMsg); err != nil {
 					return fmt.Errorf("error unmarshalling header file: %w", err)
 				}
 			}
 
-			msg, err := types.NewMsgUpdateClient(clientID, header, clientCtx.GetFromAddress().String())
+			msg, err := types.NewMsgUpdateClient(clientID, clientMsg, clientCtx.GetFromAddress().String())
 			if err != nil {
 				return err
 			}
@@ -127,6 +127,8 @@ func NewUpdateClientCmd() *cobra.Command {
 
 // NewSubmitMisbehaviourCmd defines the command to submit a misbehaviour to prevent
 // future updates.
+// Deprecated: NewSubmitMisbehaviourCmd is deprecated and will be removed in a future release.
+// Please use NewUpdateClientCmd instead.
 func NewSubmitMisbehaviourCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "misbehaviour [clientID] [path/to/misbehaviour.json]",
diff --git a/modules/core/02-client/types/msgs.go b/modules/core/02-client/types/msgs.go
index 9d2d0f06d60..43d98a93493 100644
--- a/modules/core/02-client/types/msgs.go
+++ b/modules/core/02-client/types/msgs.go
@@ -101,16 +101,16 @@ func (msg MsgCreateClient) UnpackInterfaces(unpacker codectypes.AnyUnpacker) err
 
 // NewMsgUpdateClient creates a new MsgUpdateClient instance
 //nolint:interfacer
-func NewMsgUpdateClient(id string, header exported.ClientMessage, signer string) (*MsgUpdateClient, error) {
-	anyHeader, err := PackClientMessage(header)
+func NewMsgUpdateClient(id string, clientMsg exported.ClientMessage, signer string) (*MsgUpdateClient, error) {
+	anyClientMsg, err := PackClientMessage(clientMsg)
 	if err != nil {
 		return nil, err
 	}
 
 	return &MsgUpdateClient{
-		ClientId: id,
-		Header:   anyHeader,
-		Signer:   signer,
+		ClientId:      id,
+		ClientMessage: anyClientMsg,
+		Signer:        signer,
 	}, nil
 }
 
@@ -120,11 +120,11 @@ func (msg MsgUpdateClient) ValidateBasic() error {
 	if err != nil {
 		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err)
 	}
-	header, err := UnpackClientMessage(msg.Header)
+	clientMsg, err := UnpackClientMessage(msg.ClientMessage)
 	if err != nil {
 		return err
 	}
-	if err := header.ValidateBasic(); err != nil {
+	if err := clientMsg.ValidateBasic(); err != nil {
 		return err
 	}
 	return host.ClientIdentifierValidator(msg.ClientId)
@@ -141,8 +141,8 @@ func (msg MsgUpdateClient) GetSigners() []sdk.AccAddress {
 
 // UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces
 func (msg MsgUpdateClient) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
-	var header exported.ClientMessage
-	return unpacker.UnpackAny(msg.Header, &header)
+	var clientMsg exported.ClientMessage
+	return unpacker.UnpackAny(msg.ClientMessage, &clientMsg)
 }
 
 // NewMsgUpgradeClient creates a new MsgUpgradeClient instance
diff --git a/modules/core/02-client/types/msgs_test.go b/modules/core/02-client/types/msgs_test.go
index 65dcb900ba0..ee5bed3cfb8 100644
--- a/modules/core/02-client/types/msgs_test.go
+++ b/modules/core/02-client/types/msgs_test.go
@@ -278,7 +278,7 @@ func (suite *TypesTestSuite) TestMsgUpdateClient_ValidateBasic() {
 		{
 			"failed to unpack header",
 			func() {
-				msg.Header = nil
+				msg.ClientMessage = nil
 			},
 			false,
 		},
diff --git a/modules/core/02-client/types/tx.pb.go b/modules/core/02-client/types/tx.pb.go
index 97bf12ae73f..1b017c4dfde 100644
--- a/modules/core/02-client/types/tx.pb.go
+++ b/modules/core/02-client/types/tx.pb.go
@@ -111,12 +111,12 @@ func (m *MsgCreateClientResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_MsgCreateClientResponse proto.InternalMessageInfo
 
 // MsgUpdateClient defines an sdk.Msg to update a IBC client state using
-// the given header.
+// the given client message.
 type MsgUpdateClient struct {
 	// client unique identifier
 	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
-	// header to update the light client
-	Header *types.Any `protobuf:"bytes,2,opt,name=header,proto3" json:"header,omitempty"`
+	// client message to update the light client
+	ClientMessage *types.Any `protobuf:"bytes,2,opt,name=client_message,json=clientMessage,proto3" json:"client_message,omitempty"`
 	// signer address
 	Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"`
 }
@@ -376,46 +376,46 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/tx.proto", fileDescriptor_cb5dc4651eb49a04) }
 
 var fileDescriptor_cb5dc4651eb49a04 = []byte{
-	// 617 bytes of a gzipped FileDescriptorProto
+	// 621 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xbf, 0x6e, 0xd3, 0x40,
-	0x1c, 0x8e, 0x1b, 0x88, 0xda, 0x6b, 0xa0, 0x95, 0x09, 0xa9, 0xeb, 0xaa, 0x76, 0x64, 0x3a, 0x04,
-	0xd1, 0xda, 0x24, 0x59, 0x50, 0xc5, 0x42, 0x3a, 0x31, 0x44, 0x02, 0x57, 0x0c, 0xb0, 0x04, 0xff,
-	0xb9, 0x5e, 0x4e, 0xc4, 0xbe, 0xc8, 0x67, 0x47, 0xe4, 0x0d, 0x18, 0x19, 0x78, 0x80, 0x8a, 0x27,
-	0xe0, 0x31, 0x18, 0x3b, 0x30, 0x30, 0x45, 0x55, 0xb2, 0x30, 0xe7, 0x09, 0x50, 0x7c, 0x4e, 0xb0,
-	0x1d, 0x3b, 0x8a, 0x04, 0x6c, 0x3e, 0xff, 0xbe, 0xfb, 0xbe, 0xdf, 0xe7, 0xef, 0x77, 0x3e, 0x70,
-	0x84, 0x4d, 0x4b, 0xb3, 0x88, 0x07, 0x35, 0xab, 0x8f, 0xa1, 0xeb, 0x6b, 0xc3, 0x86, 0xe6, 0x7f,
-	0x54, 0x07, 0x1e, 0xf1, 0x09, 0xcf, 0x63, 0xd3, 0x52, 0xe7, 0x45, 0x95, 0x15, 0xd5, 0x61, 0x43,
-	0xac, 0x20, 0x82, 0x48, 0x58, 0xd6, 0xe6, 0x4f, 0x0c, 0x29, 0x1e, 0x22, 0x42, 0x50, 0x1f, 0x6a,
-	0xe1, 0xca, 0x0c, 0xae, 0x34, 0xc3, 0x1d, 0xb1, 0x92, 0x72, 0xcb, 0x81, 0xbd, 0x0e, 0x45, 0x17,
-	0x1e, 0x34, 0x7c, 0x78, 0x11, 0xf2, 0xf0, 0xaf, 0x40, 0x99, 0x31, 0x76, 0xa9, 0x6f, 0xf8, 0x50,
-	0xe0, 0x6a, 0x5c, 0x7d, 0xb7, 0x59, 0x51, 0x19, 0x8b, 0xba, 0x60, 0x51, 0x5f, 0xb8, 0xa3, 0xf6,
-	0xc1, 0x6c, 0x2c, 0x3f, 0x18, 0x19, 0x4e, 0xff, 0x5c, 0x89, 0xef, 0x51, 0xf4, 0x5d, 0xb6, 0xbc,
-	0x9c, 0xaf, 0xf8, 0xb7, 0x60, 0xcf, 0x22, 0x2e, 0x85, 0x2e, 0x0d, 0x68, 0x44, 0xba, 0xb5, 0x86,
-	0x54, 0x9c, 0x8d, 0xe5, 0x6a, 0x44, 0x9a, 0xdc, 0xa6, 0xe8, 0xf7, 0x97, 0x6f, 0x18, 0x75, 0x15,
-	0x94, 0x28, 0x46, 0x2e, 0xf4, 0x84, 0x62, 0x8d, 0xab, 0xef, 0xe8, 0xd1, 0xea, 0x7c, 0xfb, 0xd3,
-	0xb5, 0x5c, 0xf8, 0x75, 0x2d, 0x17, 0x94, 0x43, 0x70, 0x90, 0x72, 0xa8, 0x43, 0x3a, 0x98, 0xb3,
-	0x28, 0x5f, 0x98, 0xfb, 0x37, 0x03, 0xfb, 0x8f, 0xfb, 0x06, 0xd8, 0x89, 0x9c, 0x60, 0x3b, 0xb4,
-	0xbe, 0xd3, 0xae, 0xcc, 0xc6, 0xf2, 0x7e, 0xc2, 0x24, 0xb6, 0x15, 0x7d, 0x9b, 0x3d, 0xbf, 0xb4,
-	0xf9, 0x53, 0x50, 0xea, 0x41, 0xc3, 0x86, 0xde, 0x3a, 0x57, 0x7a, 0x84, 0xd9, 0xb8, 0xe3, 0x78,
-	0x57, 0xcb, 0x8e, 0x7f, 0x14, 0xc1, 0x7e, 0x58, 0x43, 0x9e, 0x61, 0xff, 0x45, 0xcb, 0xe9, 0x8c,
-	0xb7, 0xfe, 0x47, 0xc6, 0xc5, 0x7f, 0x94, 0xf1, 0x6b, 0x50, 0x19, 0x78, 0x84, 0x5c, 0x75, 0x03,
-	0x66, 0xbb, 0xcb, 0x74, 0x85, 0x3b, 0x35, 0xae, 0x5e, 0x6e, 0xcb, 0xb3, 0xb1, 0x7c, 0xc4, 0x98,
-	0xb2, 0x50, 0x8a, 0xce, 0x87, 0xaf, 0x93, 0x9f, 0xec, 0x03, 0x38, 0x4e, 0x81, 0x53, 0xbd, 0xdf,
-	0x0d, 0xb9, 0xeb, 0xb3, 0xb1, 0x7c, 0x92, 0xc9, 0x9d, 0xee, 0x59, 0x4c, 0x88, 0xe4, 0xcd, 0x68,
-	0x29, 0x27, 0x71, 0x11, 0x08, 0xe9, 0x54, 0x97, 0x91, 0x7f, 0xe3, 0xc0, 0xc3, 0x0e, 0x45, 0x97,
-	0x81, 0xe9, 0x60, 0xbf, 0x83, 0xa9, 0x09, 0x7b, 0xc6, 0x10, 0x93, 0xc0, 0xe3, 0x5b, 0xab, 0xb9,
-	0x57, 0xb3, 0x72, 0x17, 0xb8, 0x58, 0xf2, 0xcf, 0x41, 0xd9, 0x89, 0x91, 0xac, 0x4d, 0x7e, 0x4b,
-	0xe0, 0xf4, 0x04, 0x9a, 0x17, 0x93, 0xc3, 0x1b, 0x22, 0x56, 0xed, 0xc8, 0xe0, 0x38, 0xb3, 0xe3,
-	0x85, 0xa7, 0xe6, 0xd7, 0x22, 0x28, 0x76, 0x28, 0xe2, 0xdf, 0x83, 0x72, 0xe2, 0xd7, 0xf3, 0x48,
-	0x5d, 0xfd, 0xa9, 0xa9, 0xa9, 0xd3, 0x2b, 0x3e, 0xd9, 0x00, 0xb4, 0x50, 0x9a, 0x2b, 0x24, 0x8e,
-	0x77, 0x9e, 0x42, 0x1c, 0x94, 0xab, 0x90, 0x75, 0x24, 0x79, 0x0b, 0xdc, 0x4b, 0xce, 0xd6, 0x49,
-	0xee, 0xee, 0x18, 0x4a, 0x3c, 0xdd, 0x04, 0xb5, 0x14, 0xf1, 0x00, 0x9f, 0x31, 0x00, 0x8f, 0x73,
-	0x38, 0x56, 0xa1, 0x62, 0x63, 0x63, 0xe8, 0x42, 0xb3, 0xad, 0x7f, 0x9f, 0x48, 0xdc, 0xcd, 0x44,
-	0xe2, 0x6e, 0x27, 0x12, 0xf7, 0x79, 0x2a, 0x15, 0x6e, 0xa6, 0x52, 0xe1, 0xe7, 0x54, 0x2a, 0xbc,
-	0x7b, 0x86, 0xb0, 0xdf, 0x0b, 0x4c, 0xd5, 0x22, 0x8e, 0x66, 0x11, 0xea, 0x10, 0xaa, 0x61, 0xd3,
-	0x3a, 0x43, 0x44, 0x1b, 0xb6, 0x34, 0x87, 0xd8, 0x41, 0x1f, 0x52, 0x76, 0x6f, 0x3d, 0x6d, 0x9e,
-	0x45, 0x57, 0x97, 0x3f, 0x1a, 0x40, 0x6a, 0x96, 0xc2, 0xf9, 0x6a, 0xfd, 0x0e, 0x00, 0x00, 0xff,
-	0xff, 0x47, 0x75, 0x66, 0xe0, 0xda, 0x06, 0x00, 0x00,
+	0x1c, 0x8e, 0x1b, 0xa8, 0x9a, 0x6b, 0xfa, 0x47, 0x26, 0xa4, 0xae, 0xab, 0xda, 0x91, 0xe9, 0x10,
+	0x04, 0xb5, 0x49, 0xb2, 0xa0, 0xc2, 0x42, 0x3a, 0x31, 0x44, 0x02, 0x57, 0x0c, 0xb0, 0x04, 0xff,
+	0xb9, 0x5e, 0x4f, 0xc4, 0xbe, 0xc8, 0x67, 0x47, 0xe4, 0x0d, 0x18, 0x79, 0x84, 0x0a, 0x5e, 0x80,
+	0xc7, 0x60, 0xec, 0xc0, 0xc0, 0x14, 0x55, 0xc9, 0xc2, 0x9c, 0x27, 0x40, 0xf1, 0x39, 0xc1, 0x76,
+	0xec, 0x28, 0x12, 0xb0, 0xf9, 0xee, 0xf7, 0xdd, 0xf7, 0xfd, 0x3e, 0x7f, 0xbf, 0xb3, 0xc1, 0x11,
+	0x36, 0x2d, 0xcd, 0x22, 0x1e, 0xd4, 0xac, 0x1e, 0x86, 0xae, 0xaf, 0x0d, 0x1a, 0x9a, 0xff, 0x51,
+	0xed, 0x7b, 0xc4, 0x27, 0x3c, 0x8f, 0x4d, 0x4b, 0x9d, 0x15, 0x55, 0x56, 0x54, 0x07, 0x0d, 0xb1,
+	0x82, 0x08, 0x22, 0x61, 0x59, 0x9b, 0x3d, 0x31, 0xa4, 0x78, 0x88, 0x08, 0x41, 0x3d, 0xa8, 0x85,
+	0x2b, 0x33, 0xb8, 0xd4, 0x0c, 0x77, 0xc8, 0x4a, 0xca, 0x2d, 0x07, 0xf6, 0x3a, 0x14, 0x9d, 0x7b,
+	0xd0, 0xf0, 0xe1, 0x79, 0xc8, 0xc3, 0xbf, 0x02, 0x65, 0xc6, 0xd8, 0xa5, 0xbe, 0xe1, 0x43, 0x81,
+	0xab, 0x71, 0xf5, 0xed, 0x66, 0x45, 0x65, 0x2c, 0xea, 0x9c, 0x45, 0x7d, 0xe1, 0x0e, 0xdb, 0x07,
+	0xd3, 0x91, 0x7c, 0x6f, 0x68, 0x38, 0xbd, 0x33, 0x25, 0x7e, 0x46, 0xd1, 0xb7, 0xd9, 0xf2, 0x62,
+	0xb6, 0xe2, 0xdf, 0x82, 0x3d, 0x8b, 0xb8, 0x14, 0xba, 0x34, 0xa0, 0x11, 0xe9, 0xc6, 0x0a, 0x52,
+	0x71, 0x3a, 0x92, 0xab, 0x11, 0x69, 0xf2, 0x98, 0xa2, 0xef, 0x2e, 0x76, 0x18, 0x75, 0x15, 0x6c,
+	0x52, 0x8c, 0x5c, 0xe8, 0x09, 0xc5, 0x1a, 0x57, 0x2f, 0xe9, 0xd1, 0xea, 0x6c, 0xeb, 0xd3, 0xb5,
+	0x5c, 0xf8, 0x75, 0x2d, 0x17, 0x94, 0x43, 0x70, 0x90, 0x72, 0xa8, 0x43, 0xda, 0x9f, 0xb1, 0x28,
+	0x5f, 0x99, 0xfb, 0x37, 0x7d, 0xfb, 0x8f, 0xfb, 0x06, 0x28, 0x45, 0x4e, 0xb0, 0x1d, 0x5a, 0x2f,
+	0xb5, 0x2b, 0xd3, 0x91, 0xbc, 0x9f, 0x30, 0x89, 0x6d, 0x45, 0xdf, 0x62, 0xcf, 0x2f, 0x6d, 0xfe,
+	0x19, 0xd8, 0x8d, 0xf6, 0x1d, 0x48, 0xa9, 0x81, 0x56, 0xba, 0xd3, 0x77, 0x18, 0xb6, 0xc3, 0xa0,
+	0x6b, 0x1b, 0x88, 0x37, 0xb9, 0x30, 0xf0, 0xa3, 0x08, 0xf6, 0xc3, 0x1a, 0xf2, 0x0c, 0xfb, 0x2f,
+	0x1c, 0xa4, 0x23, 0xdf, 0xf8, 0x1f, 0x91, 0x17, 0xff, 0x51, 0xe4, 0xaf, 0x41, 0xa5, 0xef, 0x11,
+	0x72, 0xd9, 0x0d, 0x98, 0xed, 0x2e, 0xd3, 0x15, 0xee, 0xd4, 0xb8, 0x7a, 0xb9, 0x2d, 0x4f, 0x47,
+	0xf2, 0x11, 0x63, 0xca, 0x42, 0x29, 0x3a, 0x1f, 0x6e, 0x27, 0x5f, 0xd9, 0x07, 0x70, 0x9c, 0x02,
+	0xa7, 0x7a, 0xbf, 0x1b, 0x72, 0xd7, 0xa7, 0x23, 0xf9, 0x24, 0x93, 0x3b, 0xdd, 0xb3, 0x98, 0x10,
+	0xc9, 0x1b, 0xd9, 0xcd, 0x9c, 0xc4, 0x45, 0x20, 0xa4, 0x53, 0x5d, 0x44, 0xfe, 0x8d, 0x03, 0xf7,
+	0x3b, 0x14, 0x5d, 0x04, 0xa6, 0x83, 0xfd, 0x0e, 0xa6, 0x26, 0xbc, 0x32, 0x06, 0x98, 0x04, 0x1e,
+	0xdf, 0x5a, 0xce, 0xbd, 0x9a, 0x95, 0xbb, 0xc0, 0xc5, 0x92, 0x7f, 0x0e, 0xca, 0x4e, 0x8c, 0x64,
+	0x65, 0xf2, 0x1b, 0x02, 0xa7, 0x27, 0xd0, 0xbc, 0x98, 0x1c, 0xde, 0x10, 0xb1, 0x6c, 0x47, 0x06,
+	0xc7, 0x99, 0x1d, 0xcf, 0x3d, 0x35, 0xbf, 0x14, 0x41, 0xb1, 0x43, 0x11, 0xff, 0x1e, 0x94, 0x13,
+	0x5f, 0xa2, 0x07, 0xea, 0xf2, 0x37, 0x4e, 0x4d, 0x5d, 0x66, 0xf1, 0xd1, 0x1a, 0xa0, 0xb9, 0xd2,
+	0x4c, 0x21, 0x71, 0xdb, 0xf3, 0x14, 0xe2, 0xa0, 0x5c, 0x85, 0xac, 0x2b, 0xc9, 0x5b, 0x60, 0x27,
+	0x39, 0x5b, 0x27, 0xb9, 0xa7, 0x63, 0x28, 0xf1, 0xf1, 0x3a, 0xa8, 0x85, 0x88, 0x07, 0xf8, 0x8c,
+	0x01, 0x78, 0x98, 0xc3, 0xb1, 0x0c, 0x15, 0x1b, 0x6b, 0x43, 0xe7, 0x9a, 0x6d, 0xfd, 0xfb, 0x58,
+	0xe2, 0x6e, 0xc6, 0x12, 0x77, 0x3b, 0x96, 0xb8, 0xcf, 0x13, 0xa9, 0x70, 0x33, 0x91, 0x0a, 0x3f,
+	0x27, 0x52, 0xe1, 0xdd, 0x53, 0x84, 0xfd, 0xab, 0xc0, 0x54, 0x2d, 0xe2, 0x68, 0x16, 0xa1, 0x0e,
+	0xa1, 0x1a, 0x36, 0xad, 0x53, 0x44, 0xb4, 0x41, 0x4b, 0x73, 0x88, 0x1d, 0xf4, 0x20, 0x65, 0xbf,
+	0xb1, 0x27, 0xcd, 0xd3, 0xe8, 0x4f, 0xe6, 0x0f, 0xfb, 0x90, 0x9a, 0x9b, 0xe1, 0x7c, 0xb5, 0x7e,
+	0x07, 0x00, 0x00, 0xff, 0xff, 0x46, 0x72, 0x93, 0xc2, 0xe9, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -718,9 +718,9 @@ func (m *MsgUpdateClient) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1a
 	}
-	if m.Header != nil {
+	if m.ClientMessage != nil {
 		{
-			size, err := m.Header.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.ClientMessage.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -984,8 +984,8 @@ func (m *MsgUpdateClient) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
-	if m.Header != nil {
-		l = m.Header.Size()
+	if m.ClientMessage != nil {
+		l = m.ClientMessage.Size()
 		n += 1 + l + sovTx(uint64(l))
 	}
 	l = len(m.Signer)
@@ -1349,7 +1349,7 @@ func (m *MsgUpdateClient) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Header", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientMessage", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1376,10 +1376,10 @@ func (m *MsgUpdateClient) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.Header == nil {
-				m.Header = &types.Any{}
+			if m.ClientMessage == nil {
+				m.ClientMessage = &types.Any{}
 			}
-			if err := m.Header.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ClientMessage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go
index c7a8e87dffe..fd7ccbdff64 100644
--- a/modules/core/keeper/msg_server.go
+++ b/modules/core/keeper/msg_server.go
@@ -45,12 +45,12 @@ func (k Keeper) CreateClient(goCtx context.Context, msg *clienttypes.MsgCreateCl
 func (k Keeper) UpdateClient(goCtx context.Context, msg *clienttypes.MsgUpdateClient) (*clienttypes.MsgUpdateClientResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	header, err := clienttypes.UnpackClientMessage(msg.Header)
+	clientMsg, err := clienttypes.UnpackClientMessage(msg.ClientMessage)
 	if err != nil {
 		return nil, err
 	}
 
-	if err = k.ClientKeeper.UpdateClient(ctx, msg.ClientId, header); err != nil {
+	if err = k.ClientKeeper.UpdateClient(ctx, msg.ClientId, clientMsg); err != nil {
 		return nil, err
 	}
 
diff --git a/proto/ibc/core/client/v1/tx.proto b/proto/ibc/core/client/v1/tx.proto
index 51f03780c75..386bf9a51ee 100644
--- a/proto/ibc/core/client/v1/tx.proto
+++ b/proto/ibc/core/client/v1/tx.proto
@@ -40,15 +40,15 @@ message MsgCreateClient {
 message MsgCreateClientResponse {}
 
 // MsgUpdateClient defines an sdk.Msg to update a IBC client state using
-// the given header.
+// the given client message.
 message MsgUpdateClient {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
   // client unique identifier
   string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
-  // header to update the light client
-  google.protobuf.Any header = 2;
+  // client message to update the light client
+  google.protobuf.Any client_message = 2;
   // signer address
   string signer = 3;
 }