diff --git a/modules/apps/27-interchain-accounts/controller/types/controller.pb.go b/modules/apps/27-interchain-accounts/controller/types/controller.pb.go
index 7d8badd96e1..addbb2ec125 100644
--- a/modules/apps/27-interchain-accounts/controller/types/controller.pb.go
+++ b/modules/apps/27-interchain-accounts/controller/types/controller.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -27,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // The following parameters may be used to disable the controller submodule.
 type Params struct {
 	// controller_enabled enables or disables the controller submodule.
-	ControllerEnabled bool `protobuf:"varint,1,opt,name=controller_enabled,json=controllerEnabled,proto3" json:"controller_enabled,omitempty" yaml:"controller_enabled"`
+	ControllerEnabled bool `protobuf:"varint,1,opt,name=controller_enabled,json=controllerEnabled,proto3" json:"controller_enabled,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -79,23 +78,21 @@ func init() {
 }
 
 var fileDescriptor_177fd0fec5eb3400 = []byte{
-	// 254 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0xce, 0x4c, 0x4a, 0xd6,
-	0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b,
-	0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29,
-	0xd6, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0xca, 0xcf, 0xc9, 0x49, 0x2d, 0xd2, 0x2f, 0x33, 0x44, 0xe2,
-	0xe9, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x19, 0x65, 0x26, 0x25, 0xeb, 0x21, 0x1b, 0xa2, 0x87,
-	0xc5, 0x10, 0x3d, 0x24, 0x6d, 0x65, 0x86, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xed, 0xfa,
-	0x20, 0x16, 0xc4, 0x24, 0xa5, 0x30, 0x2e, 0xb6, 0x80, 0xc4, 0xa2, 0xc4, 0xdc, 0x62, 0x21, 0x1f,
-	0x2e, 0x21, 0x84, 0x86, 0xf8, 0xd4, 0xbc, 0xc4, 0xa4, 0x9c, 0xd4, 0x14, 0x09, 0x46, 0x05, 0x46,
-	0x0d, 0x0e, 0x27, 0xd9, 0x4f, 0xf7, 0xe4, 0x25, 0x2b, 0x13, 0x73, 0x73, 0xac, 0x94, 0x30, 0xd5,
-	0x28, 0x05, 0x09, 0x22, 0x04, 0x5d, 0x21, 0x62, 0x4e, 0x59, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78,
-	0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc,
-	0x78, 0x2c, 0xc7, 0x10, 0x15, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab,
-	0x9f, 0x9c, 0x5f, 0x9c, 0x9b, 0x5f, 0xac, 0x9f, 0x99, 0x94, 0xac, 0x9b, 0x9e, 0xaf, 0x5f, 0x66,
-	0xae, 0x9f, 0x9b, 0x9f, 0x52, 0x9a, 0x93, 0x5a, 0x0c, 0x0a, 0xa0, 0x62, 0x7d, 0x23, 0x73, 0x5d,
-	0x84, 0xb7, 0x74, 0xb1, 0x85, 0x4d, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x2b, 0xc6,
-	0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xf2, 0x00, 0xac, 0x5b, 0x01, 0x00, 0x00,
+	// 220 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x86, 0xe3, 0xa5, 0x42, 0xd9, 0xc8, 0xc4, 0x64, 0x21, 0x26, 0x96, 0xf8, 0xd4, 0x32, 0x64,
+	0x07, 0xb1, 0x57, 0x8c, 0x2c, 0x95, 0x7d, 0xb5, 0xda, 0x43, 0x8e, 0x2f, 0xf2, 0x39, 0x91, 0x78,
+	0x0b, 0x1e, 0x8b, 0xb1, 0x23, 0x23, 0x4a, 0x5e, 0x04, 0x01, 0x43, 0x32, 0x64, 0x3c, 0x7d, 0xba,
+	0x4f, 0xff, 0x57, 0x3e, 0x91, 0x43, 0xb0, 0x5d, 0x17, 0x08, 0x6d, 0x26, 0x8e, 0x02, 0x14, 0xb3,
+	0x4f, 0x78, 0xb6, 0x14, 0x0f, 0x16, 0x91, 0xfb, 0x98, 0x05, 0x90, 0x63, 0x4e, 0x1c, 0x82, 0x4f,
+	0x30, 0x6c, 0x17, 0x97, 0xe9, 0x12, 0x67, 0xae, 0x76, 0xe4, 0xd0, 0x2c, 0x25, 0x66, 0x45, 0x62,
+	0x16, 0x6f, 0xc3, 0xf6, 0xae, 0x29, 0x37, 0x7b, 0x9b, 0x6c, 0x2b, 0x55, 0x5d, 0x56, 0x33, 0x3a,
+	0xf8, 0x68, 0x5d, 0xf0, 0xc7, 0x1b, 0x75, 0xab, 0xee, 0xaf, 0x5e, 0xae, 0x67, 0xf2, 0xfc, 0x0f,
+	0x1e, 0xdf, 0x3e, 0x47, 0xad, 0x2e, 0xa3, 0x56, 0xdf, 0xa3, 0x56, 0x1f, 0x93, 0x2e, 0x2e, 0x93,
+	0x2e, 0xbe, 0x26, 0x5d, 0xbc, 0xee, 0x4f, 0x94, 0xcf, 0xbd, 0x33, 0xc8, 0x2d, 0x20, 0x4b, 0xcb,
+	0x02, 0xe4, 0xb0, 0x3e, 0x31, 0x0c, 0x0d, 0xb4, 0x7c, 0xec, 0x83, 0x97, 0xdf, 0x56, 0x81, 0x5d,
+	0x53, 0xcf, 0x0b, 0xeb, 0xb5, 0xcc, 0xfc, 0xde, 0x79, 0x71, 0x9b, 0xbf, 0xbe, 0x87, 0x9f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xe8, 0xe6, 0x80, 0x41, 0x26, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/27-interchain-accounts/controller/types/query.pb.go b/modules/apps/27-interchain-accounts/controller/types/query.pb.go
index c1900bbc179..3b4863f19d5 100644
--- a/modules/apps/27-interchain-accounts/controller/types/query.pb.go
+++ b/modules/apps/27-interchain-accounts/controller/types/query.pb.go
@@ -6,7 +6,6 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
@@ -32,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // QueryInterchainAccountRequest is the request type for the Query/InterchainAccount RPC method.
 type QueryInterchainAccountRequest struct {
 	Owner        string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
-	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 }
 
 func (m *QueryInterchainAccountRequest) Reset()         { *m = QueryInterchainAccountRequest{} }
@@ -222,37 +221,35 @@ func init() {
 }
 
 var fileDescriptor_df0d8b259d72854e = []byte{
-	// 465 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6b, 0x14, 0x31,
-	0x14, 0xc7, 0x77, 0x56, 0xba, 0x62, 0xd4, 0x83, 0x71, 0x0f, 0xcb, 0xa2, 0xa3, 0xcc, 0xc9, 0xcb,
-	0x26, 0x74, 0x14, 0x0a, 0x0b, 0x0a, 0x56, 0x50, 0x7a, 0x6b, 0xe7, 0x20, 0xe2, 0xc1, 0x92, 0xcd,
-	0x84, 0x69, 0x64, 0x26, 0x6f, 0x9a, 0x64, 0x56, 0x96, 0xd2, 0x8b, 0x9f, 0x40, 0xf0, 0xe6, 0x27,
-	0xf2, 0x58, 0x10, 0xc1, 0x93, 0xc8, 0xae, 0x9f, 0xc0, 0xb3, 0x07, 0x99, 0x4c, 0x74, 0x3b, 0x58,
-	0xc5, 0x5d, 0x7b, 0x9a, 0xbc, 0xf7, 0x78, 0xff, 0xdf, 0x7b, 0xf9, 0x67, 0xd0, 0x03, 0x39, 0xe1,
-	0x94, 0x95, 0x65, 0x2e, 0x39, 0xb3, 0x12, 0x94, 0xa1, 0x52, 0x59, 0xa1, 0xf9, 0x01, 0x93, 0x6a,
-	0x9f, 0x71, 0x0e, 0x95, 0xb2, 0x86, 0x72, 0x50, 0x56, 0x43, 0x9e, 0x0b, 0x4d, 0xa7, 0x9b, 0xf4,
-	0xb0, 0x12, 0x7a, 0x46, 0x4a, 0x0d, 0x16, 0x70, 0x2c, 0x27, 0x9c, 0x9c, 0xee, 0x27, 0x67, 0xf4,
-	0x93, 0x65, 0x3f, 0x99, 0x6e, 0x0e, 0x1f, 0xad, 0xc1, 0x3c, 0xa5, 0xe0, 0xc0, 0xc3, 0x7e, 0x06,
-	0x19, 0xb8, 0x23, 0xad, 0x4f, 0x3e, 0x7b, 0x23, 0x03, 0xc8, 0x72, 0x41, 0x59, 0x29, 0x29, 0x53,
-	0x0a, 0xac, 0x1f, 0xca, 0x55, 0x23, 0x8b, 0x6e, 0xee, 0xd5, 0xb3, 0xef, 0xfc, 0xc2, 0x3d, 0x6c,
-	0x68, 0x89, 0x38, 0xac, 0x84, 0xb1, 0xb8, 0x8f, 0x36, 0xe0, 0x95, 0x12, 0x7a, 0x10, 0xdc, 0x0e,
-	0xee, 0x5c, 0x4a, 0x9a, 0x00, 0xdf, 0x47, 0x57, 0x39, 0x28, 0x25, 0x78, 0xad, 0xb5, 0x2f, 0xd3,
-	0x41, 0xb7, 0xae, 0x6e, 0x0f, 0xbe, 0x7d, 0xbe, 0xd5, 0x9f, 0xb1, 0x22, 0x1f, 0x47, 0xad, 0x72,
-	0x94, 0x5c, 0x59, 0xc6, 0x3b, 0x69, 0x34, 0x46, 0xe1, 0x9f, 0xa8, 0xa6, 0x04, 0x65, 0x04, 0x1e,
-	0xa0, 0x8b, 0x2c, 0x4d, 0xb5, 0x30, 0xc6, 0x83, 0x7f, 0x86, 0x51, 0x1f, 0x61, 0xd7, 0xbb, 0xcb,
-	0x34, 0x2b, 0x8c, 0x1f, 0x33, 0x92, 0xe8, 0x7a, 0x2b, 0xeb, 0x65, 0x12, 0xd4, 0x2b, 0x5d, 0xc6,
-	0xa9, 0x5c, 0x8e, 0xc7, 0x64, 0x75, 0x73, 0x88, 0xd7, 0xf4, 0x4a, 0xf1, 0xf7, 0x0b, 0x68, 0xc3,
-	0xb1, 0xf0, 0xbb, 0x2e, 0xba, 0xf6, 0xdb, 0x0a, 0x78, 0x6f, 0x1d, 0xc6, 0x5f, 0x4d, 0x18, 0x26,
-	0xe7, 0x29, 0xd9, 0x5c, 0x4d, 0xf4, 0xe2, 0xf5, 0x87, 0xaf, 0x6f, 0xbb, 0xcf, 0xf0, 0x53, 0xea,
-	0xdf, 0xde, 0xbf, 0xbc, 0x39, 0xe7, 0xbe, 0xa1, 0x47, 0xee, 0x7b, 0x4c, 0x97, 0xa6, 0x1a, 0x7a,
-	0xd4, 0x72, 0xfc, 0x18, 0x7f, 0x0c, 0x50, 0xaf, 0xb9, 0x39, 0xfc, 0x78, 0xed, 0xf1, 0x5b, 0x26,
-	0x0f, 0x9f, 0xfc, 0xb7, 0x8e, 0xdf, 0x7d, 0xec, 0x76, 0xbf, 0x87, 0xe3, 0x55, 0x76, 0x6f, 0xec,
-	0xdf, 0x7e, 0xf9, 0x7e, 0x1e, 0x06, 0x27, 0xf3, 0x30, 0xf8, 0x32, 0x0f, 0x83, 0x37, 0x8b, 0xb0,
-	0x73, 0xb2, 0x08, 0x3b, 0x9f, 0x16, 0x61, 0xe7, 0xf9, 0x6e, 0x26, 0xed, 0x41, 0x35, 0x21, 0x1c,
-	0x0a, 0xca, 0xc1, 0x14, 0x60, 0x6a, 0xf9, 0x51, 0x06, 0x74, 0xba, 0x45, 0x0b, 0x48, 0xab, 0x5c,
-	0x98, 0x06, 0x16, 0x6f, 0x8d, 0x96, 0xbc, 0xd1, 0x59, 0x3c, 0x3b, 0x2b, 0x85, 0x99, 0xf4, 0xdc,
-	0x4f, 0x7a, 0xf7, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x23, 0x39, 0x1f, 0x93, 0x04, 0x00,
-	0x00,
+	// 439 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd4, 0x30,
+	0x14, 0xc7, 0xa7, 0x23, 0x3b, 0x62, 0xd4, 0x83, 0x71, 0x0f, 0x43, 0xd1, 0x22, 0xf5, 0xe2, 0x65,
+	0x12, 0xb6, 0x0a, 0x0b, 0x73, 0x10, 0x54, 0x50, 0xf6, 0xb6, 0xdb, 0x83, 0xc8, 0x1e, 0x5c, 0xd2,
+	0x34, 0x74, 0x23, 0x6d, 0x5e, 0x37, 0x49, 0x47, 0x96, 0x65, 0x2f, 0x7e, 0x02, 0xc1, 0x9b, 0x9f,
+	0xc8, 0xe3, 0x82, 0x08, 0x1e, 0x65, 0xc6, 0x8f, 0xe1, 0x41, 0x26, 0x8d, 0x76, 0x06, 0x47, 0x71,
+	0x46, 0x4f, 0x25, 0x2f, 0xbc, 0xdf, 0xff, 0xbd, 0xff, 0x3f, 0x45, 0x0f, 0x65, 0xc6, 0x29, 0xab,
+	0xeb, 0x52, 0x72, 0x66, 0x25, 0x28, 0x43, 0xa5, 0xb2, 0x42, 0xf3, 0x63, 0x26, 0xd5, 0x11, 0xe3,
+	0x1c, 0x1a, 0x65, 0x0d, 0xe5, 0xa0, 0xac, 0x86, 0xb2, 0x14, 0x9a, 0x4e, 0x76, 0xe8, 0x49, 0x23,
+	0xf4, 0x29, 0xa9, 0x35, 0x58, 0xc0, 0x89, 0xcc, 0x38, 0x59, 0xec, 0x27, 0x2b, 0xfa, 0x49, 0xd7,
+	0x4f, 0x26, 0x3b, 0xe1, 0x93, 0x0d, 0x34, 0x17, 0x08, 0x4e, 0x38, 0xbc, 0x55, 0x00, 0x14, 0xa5,
+	0xa0, 0xac, 0x96, 0x94, 0x29, 0x05, 0xd6, 0xcb, 0xbb, 0xdb, 0xf8, 0x10, 0xdd, 0x3e, 0x98, 0x4f,
+	0xb9, 0xf7, 0x13, 0xfc, 0xa8, 0xe5, 0xa6, 0xe2, 0xa4, 0x11, 0xc6, 0xe2, 0x6d, 0xb4, 0x05, 0xaf,
+	0x95, 0xd0, 0xc3, 0xe0, 0x4e, 0x70, 0xef, 0x4a, 0xda, 0x1e, 0xf0, 0x5d, 0x74, 0x9d, 0x83, 0x52,
+	0x82, 0xcf, 0x59, 0x47, 0x32, 0x1f, 0xf6, 0xdd, 0xed, 0xb5, 0xae, 0xb8, 0x97, 0xc7, 0x63, 0x14,
+	0xfd, 0x8e, 0x6d, 0x6a, 0x50, 0x46, 0xe0, 0x21, 0xba, 0xcc, 0xf2, 0x5c, 0x0b, 0x63, 0x3c, 0xfe,
+	0xc7, 0x31, 0xde, 0x46, 0xd8, 0xf5, 0xee, 0x33, 0xcd, 0x2a, 0xe3, 0x87, 0x89, 0x25, 0xba, 0xb9,
+	0x54, 0xf5, 0x98, 0x14, 0x0d, 0x6a, 0x57, 0x71, 0x94, 0xab, 0xc9, 0x98, 0xac, 0x6f, 0x36, 0xf1,
+	0x4c, 0x4f, 0x4a, 0xbe, 0x5d, 0x42, 0x5b, 0x4e, 0x0b, 0xbf, 0xef, 0xa3, 0x1b, 0xbf, 0xac, 0x80,
+	0x0f, 0x36, 0xd1, 0xf8, 0xa3, 0xd5, 0x61, 0xfa, 0x3f, 0x91, 0xad, 0x35, 0xf1, 0xcb, 0x37, 0x1f,
+	0xbf, 0xbe, 0xeb, 0xbf, 0xc0, 0xcf, 0xa9, 0x7f, 0x4b, 0x7f, 0xf3, 0x86, 0x5c, 0xc6, 0x86, 0x9e,
+	0xb9, 0xef, 0x39, 0xed, 0x42, 0x35, 0xf4, 0x6c, 0x29, 0xf6, 0x73, 0xfc, 0x29, 0x40, 0x83, 0xd6,
+	0x39, 0xfc, 0x74, 0xe3, 0xf1, 0x97, 0x42, 0x0e, 0x9f, 0xfd, 0x33, 0xc7, 0xef, 0x3e, 0x76, 0xbb,
+	0x3f, 0xc0, 0xc9, 0x3a, 0xbb, 0xb7, 0xf1, 0x3f, 0x7e, 0xf5, 0x61, 0x1a, 0x05, 0x17, 0xd3, 0x28,
+	0xf8, 0x32, 0x8d, 0x82, 0xb7, 0xb3, 0xa8, 0x77, 0x31, 0x8b, 0x7a, 0x9f, 0x67, 0x51, 0xef, 0x70,
+	0xbf, 0x90, 0xf6, 0xb8, 0xc9, 0x08, 0x87, 0x8a, 0x72, 0x30, 0x15, 0x98, 0x39, 0x7e, 0x54, 0x00,
+	0x9d, 0xec, 0xd2, 0x0a, 0xf2, 0xa6, 0x14, 0xa6, 0x15, 0x4b, 0x76, 0x47, 0x9d, 0xde, 0x68, 0x95,
+	0x9e, 0x3d, 0xad, 0x85, 0xc9, 0x06, 0xee, 0x57, 0xbc, 0xff, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x3b,
+	0xeb, 0xe1, 0x31, 0x63, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
index b15979a713e..b0e26d5da71 100644
--- a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
+++ b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go
@@ -32,7 +32,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // MsgRegisterInterchainAccount defines the payload for Msg/RegisterAccount
 type MsgRegisterInterchainAccount struct {
 	Owner        string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
-	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 	Version      string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
 }
 
@@ -71,8 +71,8 @@ var xxx_messageInfo_MsgRegisterInterchainAccount proto.InternalMessageInfo
 
 // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount
 type MsgRegisterInterchainAccountResponse struct {
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
-	PortId    string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	PortId    string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 }
 
 func (m *MsgRegisterInterchainAccountResponse) Reset()         { *m = MsgRegisterInterchainAccountResponse{} }
@@ -125,11 +125,11 @@ func (m *MsgRegisterInterchainAccountResponse) GetPortId() string {
 // MsgSendTx defines the payload for Msg/SendTx
 type MsgSendTx struct {
 	Owner        string                            `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
-	ConnectionId string                            `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
-	PacketData   types.InterchainAccountPacketData `protobuf:"bytes,3,opt,name=packet_data,json=packetData,proto3" json:"packet_data" yaml:"packet_data"`
+	ConnectionId string                            `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	PacketData   types.InterchainAccountPacketData `protobuf:"bytes,3,opt,name=packet_data,json=packetData,proto3" json:"packet_data"`
 	// Relative timeout timestamp provided will be added to the current block time during transaction execution.
 	// The timeout timestamp must be non-zero.
-	RelativeTimeout uint64 `protobuf:"varint,4,opt,name=relative_timeout,json=relativeTimeout,proto3" json:"relative_timeout,omitempty" yaml:"relative_timeout"`
+	RelativeTimeout uint64 `protobuf:"varint,4,opt,name=relative_timeout,json=relativeTimeout,proto3" json:"relative_timeout,omitempty"`
 }
 
 func (m *MsgSendTx) Reset()         { *m = MsgSendTx{} }
@@ -222,43 +222,39 @@ func init() {
 }
 
 var fileDescriptor_7def041328c84a30 = []byte{
-	// 570 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xbf, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0xed, 0x34, 0xa4, 0xcd, 0x95, 0x5f, 0xb5, 0x82, 0x30, 0x06, 0xd9, 0x95, 0xc5, 0x50,
-	0x09, 0xc5, 0xa7, 0x84, 0x4a, 0x95, 0x8a, 0x3a, 0x10, 0x15, 0xa4, 0x0c, 0x91, 0x22, 0xd3, 0x01,
-	0xb1, 0x44, 0x97, 0xf3, 0xc9, 0x39, 0x70, 0xee, 0x8c, 0xef, 0x62, 0xda, 0x91, 0x0d, 0x16, 0xc4,
-	0xc6, 0xda, 0xbf, 0x82, 0x7f, 0x81, 0x8e, 0x1d, 0x99, 0xac, 0x2a, 0x59, 0x98, 0xf3, 0x17, 0x20,
-	0xdb, 0x89, 0x53, 0xa0, 0x54, 0xe5, 0x47, 0x37, 0xbf, 0x7b, 0xf7, 0x79, 0xef, 0x7b, 0xef, 0x3d,
-	0x3f, 0xf0, 0x88, 0xf6, 0x31, 0x44, 0x61, 0x18, 0x50, 0x8c, 0x24, 0xe5, 0x4c, 0x40, 0xca, 0x24,
-	0x89, 0xf0, 0x00, 0x51, 0xd6, 0x43, 0x18, 0xf3, 0x11, 0x93, 0x02, 0x62, 0xce, 0x64, 0xc4, 0x83,
-	0x80, 0x44, 0x30, 0x6e, 0x40, 0xb9, 0xef, 0x84, 0x11, 0x97, 0x5c, 0x6b, 0xd2, 0x3e, 0x76, 0x4e,
-	0xc3, 0xce, 0x19, 0xb0, 0xb3, 0x80, 0x9d, 0xb8, 0x61, 0xd4, 0x7c, 0xee, 0xf3, 0x0c, 0x87, 0xe9,
-	0x57, 0x1e, 0xc9, 0xd8, 0xbc, 0x90, 0x8c, 0xb8, 0x01, 0x43, 0x84, 0x5f, 0x11, 0x99, 0x53, 0xf6,
-	0x27, 0x15, 0xdc, 0xeb, 0x08, 0xdf, 0x25, 0x3e, 0x15, 0x92, 0x44, 0xed, 0x02, 0x79, 0x9c, 0x13,
-	0x5a, 0x0d, 0x5c, 0xe1, 0x6f, 0x18, 0x89, 0x74, 0x75, 0x5d, 0xdd, 0xa8, 0xba, 0xb9, 0xa1, 0xed,
-	0x80, 0x6b, 0x98, 0x33, 0x46, 0x70, 0x9a, 0xa9, 0x47, 0x3d, 0xbd, 0x94, 0x7a, 0x5b, 0xfa, 0x34,
-	0xb1, 0x6a, 0x07, 0x68, 0x18, 0x6c, 0xdb, 0x3f, 0xb8, 0x6d, 0xf7, 0xea, 0xc2, 0x6e, 0x7b, 0x9a,
-	0x0e, 0x96, 0x63, 0x12, 0x09, 0xca, 0x99, 0xbe, 0x94, 0x85, 0x9d, 0x9b, 0xdb, 0x2b, 0xef, 0x0e,
-	0x2d, 0xe5, 0xdb, 0xa1, 0xa5, 0xd8, 0xef, 0x55, 0x70, 0xff, 0x3c, 0x65, 0x2e, 0x11, 0x21, 0x67,
-	0x82, 0x68, 0x9b, 0x00, 0xe0, 0x01, 0x62, 0x8c, 0x04, 0xa9, 0x90, 0x4c, 0x66, 0xeb, 0xd6, 0x34,
-	0xb1, 0xd6, 0x66, 0x42, 0x0a, 0x9f, 0xed, 0x56, 0x67, 0x46, 0xdb, 0xd3, 0x1e, 0x80, 0xe5, 0x90,
-	0x47, 0x72, 0xa1, 0x5d, 0x9b, 0x26, 0xd6, 0xf5, 0x1c, 0x99, 0x39, 0x6c, 0xb7, 0x92, 0x7e, 0xb5,
-	0x3d, 0xfb, 0x73, 0x09, 0x54, 0x3b, 0xc2, 0x7f, 0x46, 0x98, 0xb7, 0xb7, 0x7f, 0x39, 0x25, 0x79,
-	0xab, 0x82, 0xd5, 0xbc, 0x33, 0x3d, 0x0f, 0x49, 0x94, 0xd5, 0x65, 0xb5, 0xb9, 0xeb, 0x5c, 0x68,
-	0x3e, 0xe2, 0x86, 0xf3, 0x4b, 0x7d, 0xba, 0x59, 0xb0, 0x5d, 0x24, 0x51, 0xcb, 0x38, 0x4a, 0x2c,
-	0x65, 0x9a, 0x58, 0xda, 0xec, 0x79, 0x8b, 0x34, 0xb6, 0x0b, 0xc2, 0xe2, 0x9e, 0xf6, 0x14, 0xdc,
-	0x8c, 0x48, 0x80, 0x24, 0x8d, 0x49, 0x4f, 0xd2, 0x21, 0xe1, 0x23, 0xa9, 0x97, 0xd7, 0xd5, 0x8d,
-	0x72, 0xeb, 0xee, 0x34, 0xb1, 0x6e, 0xe7, 0xf4, 0xcf, 0x37, 0x6c, 0xf7, 0xc6, 0xfc, 0x68, 0x2f,
-	0x3f, 0x39, 0xd5, 0x44, 0x08, 0xd6, 0x8a, 0xba, 0x15, 0x0d, 0x33, 0xc0, 0x8a, 0x20, 0xaf, 0x47,
-	0x84, 0x61, 0x92, 0x95, 0xb0, 0xec, 0x16, 0x76, 0xf3, 0xa4, 0x04, 0x96, 0x3a, 0xc2, 0xd7, 0xbe,
-	0xa8, 0xe0, 0xce, 0xef, 0x87, 0xb2, 0xeb, 0xfc, 0xf9, 0x6f, 0xe3, 0x9c, 0x37, 0x4c, 0xc6, 0xf3,
-	0xff, 0x1d, 0xb1, 0x78, 0xed, 0x07, 0x15, 0x54, 0x66, 0x83, 0xb3, 0xf3, 0x97, 0x49, 0x72, 0xdc,
-	0x78, 0xf2, 0x4f, 0xf8, 0x5c, 0x50, 0xeb, 0xe5, 0xd1, 0xd8, 0x54, 0x8f, 0xc7, 0xa6, 0x7a, 0x32,
-	0x36, 0xd5, 0x8f, 0x13, 0x53, 0x39, 0x9e, 0x98, 0xca, 0xd7, 0x89, 0xa9, 0xbc, 0xe8, 0xfa, 0x54,
-	0x0e, 0x46, 0x7d, 0x07, 0xf3, 0x21, 0xc4, 0x5c, 0x0c, 0xb9, 0x80, 0xb4, 0x8f, 0xeb, 0x3e, 0x87,
-	0xf1, 0x16, 0x1c, 0x72, 0x6f, 0x14, 0x10, 0x91, 0xae, 0x18, 0x01, 0x9b, 0x5b, 0xf5, 0x45, 0xea,
-	0xfa, 0x59, 0x4b, 0x4e, 0x1e, 0x84, 0x44, 0xf4, 0x2b, 0xd9, 0x96, 0x79, 0xf8, 0x3d, 0x00, 0x00,
-	0xff, 0xff, 0xf0, 0x81, 0x7c, 0xb2, 0x24, 0x05, 0x00, 0x00,
+	// 507 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x31, 0x6f, 0xd3, 0x40,
+	0x14, 0xc7, 0xed, 0x36, 0xa4, 0xcd, 0x15, 0x04, 0x58, 0x95, 0x08, 0x11, 0x38, 0x55, 0x60, 0x28,
+	0x43, 0xee, 0x94, 0x80, 0x54, 0x09, 0xc4, 0x40, 0x55, 0x86, 0x0c, 0x91, 0x22, 0xd3, 0x01, 0x31,
+	0x10, 0x5d, 0xce, 0x4f, 0xce, 0x51, 0xe7, 0x9e, 0xf1, 0x9d, 0x4d, 0x19, 0xd8, 0x99, 0x10, 0x1f,
+	0xa1, 0xdf, 0x86, 0x8e, 0x1d, 0x99, 0x50, 0x95, 0x2c, 0xfd, 0x18, 0xc8, 0x76, 0xe3, 0x54, 0xa2,
+	0x54, 0x85, 0x76, 0xf3, 0x7b, 0xa7, 0xdf, 0xfb, 0xbf, 0xff, 0x7b, 0x77, 0x26, 0x2f, 0xe4, 0x48,
+	0x30, 0x1e, 0x45, 0xa1, 0x14, 0xdc, 0x48, 0x54, 0x9a, 0x49, 0x65, 0x20, 0x16, 0x63, 0x2e, 0xd5,
+	0x90, 0x0b, 0x81, 0x89, 0x32, 0x9a, 0x09, 0x54, 0x26, 0xc6, 0x30, 0x84, 0x98, 0xa5, 0x1d, 0x66,
+	0xf6, 0x69, 0x14, 0xa3, 0x41, 0xa7, 0x2b, 0x47, 0x82, 0x9e, 0x85, 0xe9, 0x39, 0x30, 0x5d, 0xc0,
+	0x34, 0xed, 0x34, 0xd6, 0x03, 0x0c, 0x30, 0xc7, 0x59, 0xf6, 0x55, 0x54, 0x6a, 0x3c, 0xbb, 0x54,
+	0x1b, 0x69, 0x87, 0x45, 0x5c, 0xec, 0x81, 0x29, 0xa8, 0xd6, 0x17, 0xf2, 0xa0, 0xaf, 0x03, 0x0f,
+	0x02, 0xa9, 0x0d, 0xc4, 0xbd, 0x92, 0x78, 0x55, 0x00, 0xce, 0x3a, 0xb9, 0x81, 0x9f, 0x14, 0xc4,
+	0x75, 0x7b, 0xc3, 0xde, 0xac, 0x79, 0x45, 0xe0, 0x3c, 0x22, 0xb7, 0x04, 0x2a, 0x05, 0x22, 0x13,
+	0x1a, 0x4a, 0xbf, 0xbe, 0x94, 0x9f, 0xde, 0x5c, 0x24, 0x7b, 0xbe, 0x53, 0x27, 0x2b, 0x29, 0xc4,
+	0x5a, 0xa2, 0xaa, 0x2f, 0xe7, 0xc7, 0xf3, 0xf0, 0xf9, 0xea, 0xd7, 0x83, 0xa6, 0x75, 0x72, 0xd0,
+	0xb4, 0x5a, 0xef, 0xc9, 0xe3, 0x8b, 0xe4, 0x3d, 0xd0, 0x11, 0x2a, 0x0d, 0xce, 0x43, 0x42, 0xc4,
+	0x98, 0x2b, 0x05, 0x61, 0xa6, 0x56, 0xf4, 0x52, 0x3b, 0xcd, 0xf4, 0x7c, 0xe7, 0x1e, 0x59, 0x89,
+	0x30, 0x36, 0x8b, 0x4e, 0xaa, 0x59, 0xd8, 0xf3, 0x5b, 0x27, 0x36, 0xa9, 0xf5, 0x75, 0xf0, 0x06,
+	0x94, 0xbf, 0xbb, 0x7f, 0x15, 0x33, 0x7b, 0x64, 0xad, 0x98, 0xdb, 0xd0, 0xe7, 0x86, 0xe7, 0x86,
+	0xd6, 0xba, 0x3b, 0xf4, 0x52, 0xdb, 0x4b, 0x3b, 0xf4, 0x0f, 0x67, 0x83, 0xbc, 0xd8, 0x0e, 0x37,
+	0x7c, 0xbb, 0x72, 0xf8, 0xab, 0x69, 0x79, 0x24, 0x2a, 0x33, 0xce, 0x13, 0x72, 0x27, 0x86, 0x90,
+	0x1b, 0x99, 0xc2, 0xd0, 0xc8, 0x09, 0x60, 0x62, 0xea, 0x95, 0x0d, 0x7b, 0xb3, 0xe2, 0xdd, 0x9e,
+	0xe7, 0x77, 0x8b, 0xf4, 0x99, 0x51, 0x32, 0x72, 0xb7, 0x74, 0x5a, 0xce, 0xad, 0x41, 0x56, 0x35,
+	0x7c, 0x4c, 0x40, 0x09, 0xc8, 0x4d, 0x57, 0xbc, 0x32, 0xee, 0x1e, 0x2f, 0x91, 0xe5, 0xbe, 0x0e,
+	0x9c, 0x1f, 0x36, 0xb9, 0xff, 0xf7, 0x0b, 0x30, 0xa0, 0xff, 0x7e, 0x43, 0xe9, 0x45, 0x3b, 0x6d,
+	0xbc, 0xbd, 0xee, 0x8a, 0xa5, 0xdb, 0x6f, 0x36, 0xa9, 0x9e, 0xae, 0xfa, 0xe5, 0x7f, 0x8a, 0x14,
+	0x78, 0xe3, 0xf5, 0x95, 0xf0, 0x79, 0x43, 0xdb, 0x1f, 0x0e, 0xa7, 0xae, 0x7d, 0x34, 0x75, 0xed,
+	0xe3, 0xa9, 0x6b, 0x7f, 0x9f, 0xb9, 0xd6, 0xd1, 0xcc, 0xb5, 0x7e, 0xce, 0x5c, 0xeb, 0xdd, 0x20,
+	0x90, 0x66, 0x9c, 0x8c, 0xa8, 0xc0, 0x09, 0x13, 0xa8, 0x27, 0xa8, 0x99, 0x1c, 0x89, 0x76, 0x80,
+	0x2c, 0xdd, 0x62, 0x13, 0xf4, 0x93, 0x10, 0x74, 0xf6, 0x9a, 0x35, 0xeb, 0x6e, 0xb5, 0x17, 0xd2,
+	0xed, 0xf3, 0xfe, 0x27, 0xe6, 0x73, 0x04, 0x7a, 0x54, 0xcd, 0x1f, 0xf4, 0xd3, 0xdf, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0xce, 0xb7, 0x7e, 0xfb, 0x8f, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
index 8e551ec1d62..ddfc654e631 100644
--- a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
+++ b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
@@ -27,8 +27,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // GenesisState defines the interchain accounts genesis state
 type GenesisState struct {
-	ControllerGenesisState ControllerGenesisState `protobuf:"bytes,1,opt,name=controller_genesis_state,json=controllerGenesisState,proto3" json:"controller_genesis_state" yaml:"controller_genesis_state"`
-	HostGenesisState       HostGenesisState       `protobuf:"bytes,2,opt,name=host_genesis_state,json=hostGenesisState,proto3" json:"host_genesis_state" yaml:"host_genesis_state"`
+	ControllerGenesisState ControllerGenesisState `protobuf:"bytes,1,opt,name=controller_genesis_state,json=controllerGenesisState,proto3" json:"controller_genesis_state"`
+	HostGenesisState       HostGenesisState       `protobuf:"bytes,2,opt,name=host_genesis_state,json=hostGenesisState,proto3" json:"host_genesis_state"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -80,8 +80,8 @@ func (m *GenesisState) GetHostGenesisState() HostGenesisState {
 
 // ControllerGenesisState defines the interchain accounts controller genesis state
 type ControllerGenesisState struct {
-	ActiveChannels     []ActiveChannel               `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels" yaml:"active_channels"`
-	InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts" yaml:"interchain_accounts"`
+	ActiveChannels     []ActiveChannel               `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels"`
+	InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts"`
 	Ports              []string                      `protobuf:"bytes,3,rep,name=ports,proto3" json:"ports,omitempty"`
 	Params             types.Params                  `protobuf:"bytes,4,opt,name=params,proto3" json:"params"`
 }
@@ -149,8 +149,8 @@ func (m *ControllerGenesisState) GetParams() types.Params {
 
 // HostGenesisState defines the interchain accounts host genesis state
 type HostGenesisState struct {
-	ActiveChannels     []ActiveChannel               `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels" yaml:"active_channels"`
-	InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts" yaml:"interchain_accounts"`
+	ActiveChannels     []ActiveChannel               `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels"`
+	InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts"`
 	Port               string                        `protobuf:"bytes,3,opt,name=port,proto3" json:"port,omitempty"`
 	Params             types1.Params                 `protobuf:"bytes,4,opt,name=params,proto3" json:"params"`
 }
@@ -219,10 +219,10 @@ func (m *HostGenesisState) GetParams() types1.Params {
 // ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to
 // indicate if the channel is middleware enabled
 type ActiveChannel struct {
-	ConnectionId        string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
-	PortId              string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId           string `protobuf:"bytes,3,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
-	IsMiddlewareEnabled bool   `protobuf:"varint,4,opt,name=is_middleware_enabled,json=isMiddlewareEnabled,proto3" json:"is_middleware_enabled,omitempty" yaml:"is_middleware_enabled"`
+	ConnectionId        string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	PortId              string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId           string `protobuf:"bytes,3,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	IsMiddlewareEnabled bool   `protobuf:"varint,4,opt,name=is_middleware_enabled,json=isMiddlewareEnabled,proto3" json:"is_middleware_enabled,omitempty"`
 }
 
 func (m *ActiveChannel) Reset()         { *m = ActiveChannel{} }
@@ -288,9 +288,9 @@ func (m *ActiveChannel) GetIsMiddlewareEnabled() bool {
 
 // RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address
 type RegisteredInterchainAccount struct {
-	ConnectionId   string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
-	PortId         string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	AccountAddress string `protobuf:"bytes,3,opt,name=account_address,json=accountAddress,proto3" json:"account_address,omitempty" yaml:"account_address"`
+	ConnectionId   string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	PortId         string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	AccountAddress string `protobuf:"bytes,3,opt,name=account_address,json=accountAddress,proto3" json:"account_address,omitempty"`
 }
 
 func (m *RegisteredInterchainAccount) Reset()         { *m = RegisteredInterchainAccount{} }
@@ -360,51 +360,44 @@ func init() {
 }
 
 var fileDescriptor_d4aa48c8e29a1947 = []byte{
-	// 692 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0x4d, 0x6b, 0xdb, 0x3e,
-	0x1c, 0xc7, 0xe3, 0xa4, 0xff, 0xfe, 0x17, 0xf5, 0x61, 0x9d, 0xfa, 0x80, 0x97, 0x0d, 0x3b, 0xf3,
-	0x65, 0x81, 0x51, 0x9b, 0x76, 0x85, 0x42, 0xa1, 0x83, 0x38, 0x8c, 0x2e, 0xb0, 0xc2, 0xf0, 0x76,
-	0x18, 0xbb, 0x18, 0x45, 0x16, 0x8e, 0xc0, 0xb1, 0x82, 0xa5, 0x66, 0xf4, 0x15, 0xf4, 0x3a, 0xf6,
-	0x0e, 0x76, 0x1b, 0x7b, 0x01, 0x7b, 0x0d, 0x3d, 0x8d, 0x1e, 0x77, 0x0a, 0xa3, 0x7d, 0x07, 0x79,
-	0x05, 0x43, 0xb2, 0x9a, 0xa4, 0x69, 0x3a, 0x92, 0xcb, 0x4e, 0x3b, 0x59, 0x0f, 0xbf, 0xef, 0xf7,
-	0xf7, 0x91, 0x7e, 0xb2, 0x04, 0x0e, 0x69, 0x0b, 0x7b, 0xa8, 0xdb, 0x4d, 0x28, 0x46, 0x82, 0xb2,
-	0x94, 0x7b, 0x34, 0x15, 0x24, 0xc3, 0x6d, 0x44, 0xd3, 0x10, 0x61, 0xcc, 0x4e, 0x52, 0xc1, 0xbd,
-	0x98, 0xa4, 0x84, 0x53, 0xee, 0xf5, 0x76, 0xae, 0x9b, 0x6e, 0x37, 0x63, 0x82, 0x41, 0x8f, 0xb6,
-	0xb0, 0x3b, 0x2e, 0x77, 0xa7, 0xc8, 0xdd, 0x6b, 0x4d, 0x6f, 0xa7, 0xb2, 0x11, 0xb3, 0x98, 0x29,
-	0xad, 0x27, 0x5b, 0xb9, 0x4d, 0xa5, 0x31, 0x13, 0x05, 0x66, 0xa9, 0xc8, 0x58, 0x92, 0x90, 0x4c,
-	0x82, 0x8c, 0x7a, 0xda, 0x64, 0x7f, 0x26, 0x93, 0x36, 0xe3, 0x42, 0xca, 0xe5, 0x37, 0x17, 0x3a,
-	0x17, 0x45, 0xb0, 0x7c, 0x94, 0x23, 0xbe, 0x15, 0x48, 0x10, 0xf8, 0xcd, 0x00, 0xe6, 0xc8, 0x3e,
-	0xd4, 0xf8, 0x21, 0x97, 0x93, 0xa6, 0x51, 0x35, 0x6a, 0x4b, 0xbb, 0x47, 0xee, 0x9c, 0x2b, 0x77,
-	0x1b, 0x43, 0xc3, 0xf1, 0x5c, 0xfe, 0xd3, 0xf3, 0xbe, 0x5d, 0x18, 0xf4, 0x6d, 0xfb, 0x14, 0x75,
-	0x92, 0x03, 0xe7, 0xae, 0xb4, 0x4e, 0xb0, 0x85, 0xa7, 0x1a, 0xc0, 0xcf, 0x06, 0x80, 0x72, 0x31,
-	0x13, 0x98, 0x45, 0x85, 0x59, 0x9f, 0x1b, 0xf3, 0x15, 0xe3, 0xe2, 0x06, 0xe0, 0x13, 0x0d, 0xf8,
-	0x30, 0x07, 0xbc, 0x9d, 0xca, 0x09, 0xd6, 0xda, 0x13, 0x22, 0xe7, 0x7b, 0x09, 0x6c, 0x4d, 0x5f,
-	0x30, 0x3c, 0x33, 0xc0, 0x7d, 0x84, 0x05, 0xed, 0x91, 0x10, 0xb7, 0x51, 0x9a, 0x92, 0x84, 0x9b,
-	0x46, 0xb5, 0x54, 0x5b, 0xda, 0x7d, 0x31, 0x37, 0x6c, 0x5d, 0xf9, 0x34, 0x72, 0x1b, 0xdf, 0xd2,
-	0xa4, 0x5b, 0x39, 0xe9, 0x44, 0x12, 0x27, 0x58, 0x45, 0xe3, 0xe1, 0x1c, 0x7e, 0x31, 0xc0, 0xfa,
-	0x94, 0x04, 0x66, 0x51, 0xd1, 0xbc, 0x9e, 0x9b, 0x26, 0x20, 0x31, 0xe5, 0x82, 0x64, 0x24, 0x6a,
-	0x0e, 0x03, 0xeb, 0x79, 0x9c, 0xef, 0x68, 0xb6, 0x4a, 0xce, 0x36, 0xc5, 0xc9, 0x09, 0x20, 0x9d,
-	0x94, 0x71, 0xb8, 0x01, 0xfe, 0xeb, 0xb2, 0x4c, 0x70, 0xb3, 0x54, 0x2d, 0xd5, 0xca, 0x41, 0xde,
-	0x81, 0xef, 0xc1, 0x62, 0x17, 0x65, 0xa8, 0xc3, 0xcd, 0x05, 0x55, 0xe6, 0x83, 0xd9, 0x58, 0xc7,
-	0x7e, 0x99, 0xde, 0x8e, 0xfb, 0x46, 0x39, 0xf8, 0x0b, 0x92, 0x2c, 0xd0, 0x7e, 0xce, 0xd7, 0x12,
-	0x58, 0x9b, 0x3c, 0x02, 0xff, 0x4a, 0x36, 0x57, 0xc9, 0x20, 0x58, 0x90, 0x55, 0x32, 0x4b, 0x55,
-	0xa3, 0x56, 0x0e, 0x54, 0x1b, 0x06, 0x13, 0x05, 0xdb, 0x9b, 0x8d, 0x54, 0x5d, 0x52, 0x77, 0x95,
-	0xea, 0xac, 0x08, 0x56, 0x6e, 0xec, 0x26, 0x3c, 0x04, 0x2b, 0x98, 0xa5, 0x29, 0xc1, 0xd2, 0x31,
-	0xa4, 0x91, 0xba, 0xab, 0xca, 0xbe, 0x39, 0xe8, 0xdb, 0x1b, 0xc3, 0xeb, 0x65, 0x34, 0xed, 0x04,
-	0xcb, 0xa3, 0x7e, 0x33, 0x82, 0xcf, 0xc0, 0xff, 0x12, 0x56, 0x0a, 0x8b, 0x4a, 0x08, 0x07, 0x7d,
-	0x7b, 0x35, 0x17, 0xea, 0x09, 0x27, 0x58, 0x94, 0xad, 0x66, 0x04, 0xf7, 0x00, 0xd0, 0x65, 0x92,
-	0xf1, 0x6a, 0xad, 0xfe, 0xe6, 0xa0, 0x6f, 0x3f, 0xd0, 0x89, 0x86, 0x73, 0x4e, 0x50, 0xd6, 0x9d,
-	0x66, 0x04, 0xdf, 0x81, 0x4d, 0xca, 0xc3, 0x0e, 0x8d, 0xa2, 0x84, 0x7c, 0x44, 0x19, 0x09, 0x49,
-	0x8a, 0x5a, 0x09, 0x89, 0xd4, 0xb6, 0xdc, 0xf3, 0xab, 0x83, 0xbe, 0xfd, 0x58, 0x6f, 0xf7, 0xb4,
-	0x30, 0x27, 0x58, 0xa7, 0xfc, 0x78, 0x38, 0xfc, 0x52, 0x8f, 0xfe, 0x30, 0xc0, 0xa3, 0x3f, 0x54,
-	0xf2, 0xaf, 0xee, 0x4b, 0x43, 0xfe, 0x2a, 0x2a, 0x6d, 0x88, 0xa2, 0x28, 0x23, 0x9c, 0xeb, 0xcd,
-	0xa9, 0x8c, 0x1f, 0xf3, 0x1b, 0x01, 0xea, 0x98, 0xab, 0x91, 0x7a, 0x3e, 0xe0, 0xc7, 0xe7, 0x97,
-	0x96, 0x71, 0x71, 0x69, 0x19, 0xbf, 0x2e, 0x2d, 0xe3, 0xd3, 0x95, 0x55, 0xb8, 0xb8, 0xb2, 0x0a,
-	0x3f, 0xaf, 0xac, 0xc2, 0x87, 0xe3, 0x98, 0x8a, 0xf6, 0x49, 0xcb, 0xc5, 0xac, 0xe3, 0x61, 0xc6,
-	0x3b, 0x8c, 0xcb, 0x27, 0x78, 0x3b, 0x66, 0x5e, 0x6f, 0xdf, 0xeb, 0xb0, 0xe8, 0x24, 0x21, 0x5c,
-	0x3e, 0x82, 0xdc, 0xdb, 0xdd, 0xdf, 0x1e, 0x1d, 0xa9, 0xed, 0x5b, 0x4f, 0xb9, 0x38, 0xed, 0x12,
-	0xde, 0x5a, 0x54, 0x2f, 0xe0, 0xf3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x33, 0x7f, 0xe2, 0xc0,
-	0x07, 0x08, 0x00, 0x00,
+	// 591 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x95, 0x4f, 0x8b, 0xd3, 0x4e,
+	0x18, 0xc7, 0x9b, 0xb4, 0xbf, 0xfe, 0xec, 0xec, 0x1f, 0x97, 0xd9, 0x75, 0x0d, 0x2b, 0xc6, 0x52,
+	0x0f, 0xf6, 0xd2, 0x84, 0x56, 0xa1, 0x20, 0x28, 0x74, 0x8b, 0xac, 0x05, 0x17, 0x24, 0x5e, 0xc4,
+	0x4b, 0x98, 0x4e, 0x86, 0x74, 0x20, 0xc9, 0x84, 0x3c, 0xd3, 0x8a, 0x67, 0x05, 0x8f, 0xfa, 0x12,
+	0x7c, 0x39, 0x7b, 0xdc, 0xa3, 0x27, 0x91, 0xf6, 0x05, 0xf8, 0x0a, 0x04, 0x99, 0x49, 0xb6, 0xad,
+	0xb5, 0x4a, 0x8b, 0x47, 0x4f, 0x99, 0x79, 0xbe, 0x79, 0xbe, 0xcf, 0x27, 0xcf, 0x93, 0x64, 0xd0,
+	0x23, 0x3e, 0xa4, 0x2e, 0x49, 0xd3, 0x88, 0x53, 0x22, 0xb9, 0x48, 0xc0, 0xe5, 0x89, 0x64, 0x19,
+	0x1d, 0x11, 0x9e, 0xf8, 0x84, 0x52, 0x31, 0x4e, 0x24, 0xb8, 0x21, 0x4b, 0x18, 0x70, 0x70, 0x27,
+	0xed, 0xab, 0xa5, 0x93, 0x66, 0x42, 0x0a, 0xec, 0xf2, 0x21, 0x75, 0x96, 0xd3, 0x9d, 0x35, 0xe9,
+	0xce, 0x55, 0xce, 0xa4, 0x7d, 0x72, 0x14, 0x8a, 0x50, 0xe8, 0x5c, 0x57, 0xad, 0x72, 0x9b, 0x93,
+	0xfe, 0x46, 0x14, 0x54, 0x24, 0x32, 0x13, 0x51, 0xc4, 0x32, 0x05, 0xb2, 0xd8, 0x15, 0x26, 0xdd,
+	0x8d, 0x4c, 0x46, 0x02, 0xa4, 0x4a, 0x57, 0xd7, 0x3c, 0xb1, 0xf1, 0xc1, 0x44, 0xbb, 0x67, 0x39,
+	0xe2, 0x0b, 0x49, 0x24, 0xc3, 0xef, 0x0d, 0x64, 0x2d, 0xec, 0xfd, 0x02, 0xdf, 0x07, 0x25, 0x5a,
+	0x46, 0xdd, 0x68, 0xee, 0x74, 0xce, 0x9c, 0x2d, 0x9f, 0xdc, 0xe9, 0xcf, 0x0d, 0x97, 0x6b, 0x9d,
+	0x56, 0x2e, 0xbe, 0xdc, 0x29, 0x79, 0xc7, 0x74, 0xad, 0x8a, 0xc7, 0x08, 0x2b, 0xd0, 0x15, 0x04,
+	0x53, 0x23, 0xf4, 0xb6, 0x46, 0x78, 0x2a, 0x40, 0xae, 0x29, 0x7e, 0x30, 0x5a, 0x89, 0x37, 0xbe,
+	0x9b, 0xe8, 0x78, 0x3d, 0x2f, 0x8e, 0xd1, 0x75, 0x42, 0x25, 0x9f, 0x30, 0x9f, 0x8e, 0x48, 0x92,
+	0xb0, 0x08, 0x2c, 0xa3, 0x5e, 0x6e, 0xee, 0x74, 0x1e, 0x6f, 0x8d, 0xd3, 0xd3, 0x3e, 0xfd, 0xdc,
+	0xa6, 0x60, 0xd9, 0x27, 0xcb, 0x41, 0xc0, 0x6f, 0x0d, 0x74, 0xb8, 0xc6, 0xc6, 0x32, 0x75, 0xcd,
+	0x67, 0x5b, 0xd7, 0xf4, 0x58, 0xc8, 0x41, 0xb2, 0x8c, 0x05, 0x83, 0xf9, 0x8d, 0xbd, 0xfc, 0xbe,
+	0x82, 0x00, 0xf3, 0x55, 0x01, 0xf0, 0x11, 0xfa, 0x2f, 0x15, 0x99, 0x04, 0xab, 0x5c, 0x2f, 0x37,
+	0x6b, 0x5e, 0xbe, 0xc1, 0x2f, 0x51, 0x35, 0x25, 0x19, 0x89, 0xc1, 0xaa, 0xe8, 0x81, 0x3c, 0xdc,
+	0x8c, 0x66, 0xe9, 0xc5, 0x9d, 0xb4, 0x9d, 0xe7, 0xda, 0xa1, 0xa8, 0x5d, 0xf8, 0x35, 0xbe, 0x99,
+	0xe8, 0x60, 0x75, 0x58, 0xff, 0x66, 0xe7, 0x31, 0xaa, 0xa8, 0x66, 0x5b, 0xe5, 0xba, 0xd1, 0xac,
+	0x79, 0x7a, 0x8d, 0xbd, 0x95, 0xbe, 0x3f, 0xd8, 0x8c, 0x45, 0x7f, 0xf1, 0xbf, 0xeb, 0xf8, 0x27,
+	0x03, 0xed, 0xfd, 0xd4, 0x15, 0x7c, 0x17, 0xed, 0x51, 0x91, 0x24, 0x8c, 0x2a, 0x47, 0x9f, 0x07,
+	0xfa, 0xc3, 0xaf, 0x79, 0xbb, 0x8b, 0xe0, 0x20, 0xc0, 0x37, 0xd1, 0xff, 0x0a, 0x49, 0xc9, 0xa6,
+	0x96, 0xab, 0x6a, 0x3b, 0x08, 0xf0, 0x6d, 0x84, 0x8a, 0x29, 0x29, 0x2d, 0xa7, 0xaf, 0x15, 0x91,
+	0x41, 0x80, 0x3b, 0xe8, 0x06, 0x07, 0x3f, 0xe6, 0x41, 0x10, 0xb1, 0xd7, 0x24, 0x63, 0x3e, 0x4b,
+	0xc8, 0x30, 0x62, 0x81, 0x7e, 0xa2, 0x6b, 0xde, 0x21, 0x87, 0xf3, 0xb9, 0xf6, 0x24, 0x97, 0x1a,
+	0xef, 0x0c, 0x74, 0xeb, 0x0f, 0x4d, 0xfc, 0x4b, 0xe0, 0x7b, 0xea, 0xed, 0xd2, 0x46, 0x3e, 0x09,
+	0x82, 0x8c, 0x01, 0x14, 0xd4, 0xfb, 0x45, 0xb8, 0x97, 0x47, 0x4f, 0xc3, 0x8b, 0xa9, 0x6d, 0x5c,
+	0x4e, 0x6d, 0xe3, 0xeb, 0xd4, 0x36, 0x3e, 0xce, 0xec, 0xd2, 0xe5, 0xcc, 0x2e, 0x7d, 0x9e, 0xd9,
+	0xa5, 0x57, 0xe7, 0x21, 0x97, 0xa3, 0xf1, 0xd0, 0xa1, 0x22, 0x76, 0xa9, 0x80, 0x58, 0x80, 0x3a,
+	0x1e, 0x5a, 0xa1, 0x70, 0x27, 0x5d, 0x37, 0x16, 0xc1, 0x38, 0x62, 0xa0, 0x7e, 0xd0, 0xe0, 0x76,
+	0xba, 0xad, 0xc5, 0x84, 0x5a, 0xbf, 0x1c, 0x33, 0xf2, 0x4d, 0xca, 0x60, 0x58, 0xd5, 0x7f, 0xe7,
+	0xfb, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x56, 0x6b, 0x4d, 0x28, 0xa3, 0x06, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/27-interchain-accounts/host/types/host.pb.go b/modules/apps/27-interchain-accounts/host/types/host.pb.go
index 4b2cc0c6218..7d233d3aa4c 100644
--- a/modules/apps/27-interchain-accounts/host/types/host.pb.go
+++ b/modules/apps/27-interchain-accounts/host/types/host.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -27,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // The following parameters may be used to disable the host submodule.
 type Params struct {
 	// host_enabled enables or disables the host submodule.
-	HostEnabled bool `protobuf:"varint,1,opt,name=host_enabled,json=hostEnabled,proto3" json:"host_enabled,omitempty" yaml:"host_enabled"`
+	HostEnabled bool `protobuf:"varint,1,opt,name=host_enabled,json=hostEnabled,proto3" json:"host_enabled,omitempty"`
 	// allow_messages defines a list of sdk message typeURLs allowed to be executed on a host chain.
-	AllowMessages []string `protobuf:"bytes,2,rep,name=allow_messages,json=allowMessages,proto3" json:"allow_messages,omitempty" yaml:"allow_messages"`
+	AllowMessages []string `protobuf:"bytes,2,rep,name=allow_messages,json=allowMessages,proto3" json:"allow_messages,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -88,26 +87,23 @@ func init() {
 }
 
 var fileDescriptor_48e202774f13d08e = []byte{
-	// 290 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xcf, 0x4c, 0x4a, 0xd6,
-	0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b,
-	0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29,
-	0xd6, 0xcf, 0xc8, 0x2f, 0x2e, 0xd1, 0x2f, 0x33, 0x04, 0xd3, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9,
-	0x42, 0x3a, 0x99, 0x49, 0xc9, 0x7a, 0xc8, 0x1a, 0xf5, 0xb0, 0x68, 0xd4, 0x03, 0x6b, 0x28, 0x33,
-	0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x6b, 0xd4, 0x07, 0xb1, 0x20, 0x66, 0x28, 0xb5, 0x31,
-	0x72, 0xb1, 0x05, 0x24, 0x16, 0x25, 0xe6, 0x16, 0x0b, 0x59, 0x71, 0xf1, 0x80, 0xd4, 0xc6, 0xa7,
-	0xe6, 0x25, 0x26, 0xe5, 0xa4, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x38, 0x89, 0x7f, 0xba,
-	0x27, 0x2f, 0x5c, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x2c, 0xab, 0x14, 0xc4, 0x0d, 0xe2, 0xba,
-	0x42, 0x78, 0x42, 0x0e, 0x5c, 0x7c, 0x89, 0x39, 0x39, 0xf9, 0xe5, 0xf1, 0xb9, 0xa9, 0xc5, 0xc5,
-	0x89, 0xe9, 0xa9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x9c, 0x4e, 0x92, 0x9f, 0xee, 0xc9, 0x8b,
-	0x42, 0x74, 0xa3, 0xca, 0x2b, 0x05, 0xf1, 0x82, 0x05, 0x7c, 0xa1, 0x7c, 0xa7, 0x94, 0x13, 0x8f,
-	0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b,
-	0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xf2, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2,
-	0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0xcf, 0x4c, 0x4a, 0xd6, 0x4d,
-	0xcf, 0xd7, 0x2f, 0x33, 0xd7, 0xcf, 0xcd, 0x4f, 0x29, 0xcd, 0x49, 0x2d, 0x06, 0x85, 0x5f, 0xb1,
-	0xbe, 0x91, 0xb9, 0x2e, 0x22, 0x04, 0x74, 0x51, 0x83, 0xae, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89,
-	0x0d, 0xec, 0x6b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0x86, 0x51, 0x17, 0x74, 0x01,
-	0x00, 0x00,
+	// 245 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0xcf, 0xbf, 0x4a, 0xc5, 0x30,
+	0x14, 0xc7, 0xf1, 0x46, 0xe1, 0xa2, 0xf5, 0xcf, 0xd0, 0xe9, 0x4e, 0xe1, 0x2a, 0x08, 0x77, 0xb0,
+	0x09, 0x57, 0x87, 0xee, 0x82, 0x8b, 0x20, 0x48, 0x47, 0x97, 0x92, 0xa4, 0xa1, 0x0d, 0x24, 0x39,
+	0xa5, 0x27, 0xad, 0xf8, 0x16, 0x3e, 0x96, 0x63, 0x47, 0x47, 0x69, 0x5f, 0x44, 0x5a, 0x05, 0x15,
+	0xee, 0x74, 0xe0, 0x03, 0x3f, 0x38, 0xdf, 0x38, 0x33, 0x52, 0x71, 0xd1, 0x34, 0xd6, 0x28, 0x11,
+	0x0c, 0x78, 0xe4, 0xc6, 0x07, 0xdd, 0xaa, 0x5a, 0x18, 0x5f, 0x08, 0xa5, 0xa0, 0xf3, 0x01, 0x79,
+	0x0d, 0x18, 0x78, 0xbf, 0x5b, 0x2e, 0x6b, 0x5a, 0x08, 0x90, 0x5c, 0x1b, 0xa9, 0xd8, 0xdf, 0x21,
+	0xdb, 0x33, 0x64, 0xcb, 0xa0, 0xdf, 0x5d, 0xe6, 0xf1, 0xea, 0x49, 0xb4, 0xc2, 0x61, 0x72, 0x11,
+	0x9f, 0xce, 0x58, 0x68, 0x2f, 0xa4, 0xd5, 0xe5, 0x9a, 0x6c, 0xc8, 0xf6, 0x28, 0x3f, 0x99, 0xed,
+	0xfe, 0x9b, 0x92, 0xab, 0xf8, 0x5c, 0x58, 0x0b, 0x2f, 0x85, 0xd3, 0x88, 0xa2, 0xd2, 0xb8, 0x3e,
+	0xd8, 0x1c, 0x6e, 0x8f, 0xf3, 0xb3, 0x45, 0x1f, 0x7f, 0xf0, 0xae, 0x7c, 0x1f, 0x29, 0x19, 0x46,
+	0x4a, 0x3e, 0x47, 0x4a, 0xde, 0x26, 0x1a, 0x0d, 0x13, 0x8d, 0x3e, 0x26, 0x1a, 0x3d, 0x3f, 0x54,
+	0x26, 0xd4, 0x9d, 0x64, 0x0a, 0x1c, 0x57, 0x80, 0x0e, 0x90, 0x1b, 0xa9, 0xd2, 0x0a, 0x78, 0x9f,
+	0x71, 0x07, 0x65, 0x67, 0x35, 0xce, 0xd1, 0xc8, 0x6f, 0xb2, 0xf4, 0xf7, 0xed, 0xf4, 0x7f, 0x6f,
+	0x78, 0x6d, 0x34, 0xca, 0xd5, 0x92, 0x7b, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xb5, 0x3b,
+	0x6b, 0x29, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/27-interchain-accounts/types/account.pb.go b/modules/apps/27-interchain-accounts/types/account.pb.go
index 67273dfd591..0e5745799e8 100644
--- a/modules/apps/27-interchain-accounts/types/account.pb.go
+++ b/modules/apps/27-interchain-accounts/types/account.pb.go
@@ -27,8 +27,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain
 type InterchainAccount struct {
-	*types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"`
-	AccountOwner       string `protobuf:"bytes,2,opt,name=account_owner,json=accountOwner,proto3" json:"account_owner,omitempty" yaml:"account_owner"`
+	*types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"`
+	AccountOwner       string `protobuf:"bytes,2,opt,name=account_owner,json=accountOwner,proto3" json:"account_owner,omitempty"`
 }
 
 func (m *InterchainAccount) Reset()      { *m = InterchainAccount{} }
@@ -72,7 +72,7 @@ func init() {
 }
 
 var fileDescriptor_5561bd92625bf7da = []byte{
-	// 344 bytes of a gzipped FileDescriptorProto
+	// 320 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xcd, 0x4c, 0x4a, 0xd6,
 	0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b,
 	0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29,
@@ -80,21 +80,19 @@ var fileDescriptor_5561bd92625bf7da = []byte{
 	0x92, 0xf5, 0x90, 0xb5, 0xe9, 0x61, 0xd1, 0xa6, 0x57, 0x66, 0x28, 0x25, 0x99, 0x9c, 0x5f, 0x9c,
 	0x9b, 0x5f, 0x1c, 0x0f, 0xd6, 0xa6, 0x0f, 0xe1, 0x40, 0xcc, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf,
 	0x87, 0x88, 0x83, 0x58, 0x50, 0x51, 0x39, 0x88, 0x1a, 0xfd, 0xc4, 0xd2, 0x92, 0x0c, 0xfd, 0x32,
-	0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x22, 0xaf, 0xf4, 0x87, 0x91, 0x4b, 0xd0, 0x13,
-	0x6e, 0x97, 0x23, 0xc4, 0x2a, 0xa1, 0x04, 0x2e, 0x9e, 0xa4, 0xc4, 0xe2, 0x54, 0x98, 0xd5, 0x12,
+	0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x22, 0xaf, 0x74, 0x9a, 0x91, 0x4b, 0xd0, 0x13,
+	0x6e, 0x97, 0x23, 0xc4, 0x2a, 0x21, 0x4f, 0x2e, 0x9e, 0xa4, 0xc4, 0xe2, 0x54, 0x98, 0xd5, 0x12,
 	0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x0a, 0x7a, 0x50, 0x0b, 0xc1, 0xfa, 0xa1, 0x86, 0xe9, 0x39,
-	0x25, 0x16, 0xa7, 0x42, 0xf5, 0x39, 0x49, 0x5f, 0xb8, 0x27, 0xcf, 0xf8, 0xe9, 0x9e, 0xbc, 0x70,
-	0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0xb2, 0x19, 0x4a, 0x41, 0xdc, 0x49, 0x08, 0x95, 0x42, 0xb6,
-	0x5c, 0xbc, 0x50, 0x89, 0xf8, 0xfc, 0xf2, 0xbc, 0xd4, 0x22, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e,
-	0x27, 0x89, 0x4f, 0xf7, 0xe4, 0x45, 0x20, 0x9a, 0x51, 0xa4, 0x95, 0x82, 0x78, 0xa0, 0x7c, 0x7f,
-	0x10, 0xd7, 0xca, 0xad, 0x63, 0x81, 0x3c, 0xc3, 0x8c, 0x05, 0xf2, 0x0c, 0xa7, 0xb6, 0xe8, 0x5a,
-	0x11, 0x19, 0x78, 0x7a, 0x18, 0xfe, 0xf4, 0x74, 0x8a, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23,
-	0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6,
-	0x63, 0x39, 0x86, 0x28, 0xd7, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x68,
-	0x38, 0xeb, 0x67, 0x26, 0x25, 0xeb, 0xa6, 0xe7, 0xeb, 0x97, 0x99, 0xeb, 0xe7, 0xe6, 0xa7, 0x94,
-	0xe6, 0xa4, 0x16, 0x83, 0x62, 0xba, 0x58, 0xdf, 0xc8, 0x5c, 0x17, 0x61, 0xa1, 0x2e, 0x3c, 0x92,
-	0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xc1, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
-	0xae, 0x11, 0x4f, 0x20, 0x19, 0x02, 0x00, 0x00,
+	0x25, 0x16, 0xa7, 0x42, 0xf5, 0x39, 0xb1, 0x5c, 0xb8, 0x27, 0xcf, 0x18, 0xc4, 0x9d, 0x84, 0x10,
+	0x12, 0x52, 0xe6, 0xe2, 0x85, 0x9a, 0x12, 0x9f, 0x5f, 0x9e, 0x97, 0x5a, 0x24, 0xc1, 0xa4, 0xc0,
+	0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x15, 0xf4, 0x07, 0x89, 0x59, 0xb9, 0x75, 0x2c, 0x90, 0x67, 0x98,
+	0xb1, 0x40, 0x9e, 0xe1, 0xd4, 0x16, 0x5d, 0x2b, 0x22, 0xc3, 0x42, 0x0f, 0xc3, 0xd9, 0x9e, 0x4e,
+	0xf1, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7,
+	0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xe5, 0x9a, 0x9e, 0x59, 0x92,
+	0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0d, 0x36, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c,
+	0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc, 0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x50, 0xc4, 0x15, 0xeb, 0x1b,
+	0x99, 0xeb, 0x22, 0x2c, 0xd4, 0x85, 0xc7, 0x59, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38,
+	0xd4, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xd6, 0xd0, 0x9d, 0xe8, 0x01, 0x00, 0x00,
 }
 
 func (m *InterchainAccount) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/27-interchain-accounts/types/metadata.pb.go b/modules/apps/27-interchain-accounts/types/metadata.pb.go
index 38294e2732f..6299045a6d0 100644
--- a/modules/apps/27-interchain-accounts/types/metadata.pb.go
+++ b/modules/apps/27-interchain-accounts/types/metadata.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -29,9 +28,9 @@ type Metadata struct {
 	// version defines the ICS27 protocol version
 	Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	// controller_connection_id is the connection identifier associated with the controller chain
-	ControllerConnectionId string `protobuf:"bytes,2,opt,name=controller_connection_id,json=controllerConnectionId,proto3" json:"controller_connection_id,omitempty" yaml:"controller_connection_id"`
+	ControllerConnectionId string `protobuf:"bytes,2,opt,name=controller_connection_id,json=controllerConnectionId,proto3" json:"controller_connection_id,omitempty"`
 	// host_connection_id is the connection identifier associated with the host chain
-	HostConnectionId string `protobuf:"bytes,3,opt,name=host_connection_id,json=hostConnectionId,proto3" json:"host_connection_id,omitempty" yaml:"host_connection_id"`
+	HostConnectionId string `protobuf:"bytes,3,opt,name=host_connection_id,json=hostConnectionId,proto3" json:"host_connection_id,omitempty"`
 	// address defines the interchain account address to be fulfilled upon the OnChanOpenTry handshake step
 	// NOTE: the address field is empty on the OnChanOpenInit handshake step
 	Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"`
@@ -125,29 +124,26 @@ func init() {
 }
 
 var fileDescriptor_c29c32e397d1f21e = []byte{
-	// 349 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40,
-	0x18, 0xc5, 0x9b, 0xde, 0x6b, 0x5b, 0x67, 0x25, 0x83, 0xe8, 0x58, 0x30, 0x95, 0xb8, 0xd0, 0x4d,
-	0x33, 0x54, 0xc1, 0x82, 0xcb, 0x8a, 0x0b, 0x11, 0x37, 0xc5, 0x95, 0x20, 0x61, 0x32, 0x33, 0xa4,
-	0x03, 0xc9, 0x7c, 0x21, 0x33, 0x0d, 0xed, 0x5b, 0xf8, 0x06, 0xbe, 0x8e, 0xcb, 0x2e, 0x5d, 0x15,
-	0x69, 0xdf, 0xa0, 0x4f, 0x20, 0x49, 0x6b, 0xeb, 0xdf, 0x5d, 0x4e, 0xce, 0x39, 0xbf, 0x8f, 0xe1,
-	0xa0, 0x0b, 0x15, 0x72, 0xca, 0xd2, 0x34, 0x56, 0x9c, 0x59, 0x05, 0xda, 0x50, 0xa5, 0xad, 0xcc,
-	0xf8, 0x80, 0x29, 0x1d, 0x30, 0xce, 0x61, 0xa8, 0xad, 0xa1, 0x79, 0x87, 0x26, 0xd2, 0x32, 0xc1,
-	0x2c, 0xf3, 0xd3, 0x0c, 0x2c, 0xe0, 0x13, 0x15, 0x72, 0xff, 0x73, 0xcf, 0xff, 0xa5, 0xe7, 0xe7,
-	0x9d, 0xe6, 0x6e, 0x04, 0x11, 0x94, 0x1d, 0x5a, 0x7c, 0x2d, 0xeb, 0xde, 0x73, 0x15, 0x35, 0xee,
-	0x56, 0x44, 0x4c, 0x50, 0x3d, 0x97, 0x99, 0x51, 0xa0, 0x89, 0x73, 0xe4, 0x9c, 0x6e, 0xf7, 0x3f,
-	0x24, 0x7e, 0x44, 0x84, 0x83, 0xb6, 0x19, 0xc4, 0xb1, 0xcc, 0x02, 0x0e, 0x5a, 0x4b, 0x5e, 0x5c,
-	0x0b, 0x94, 0x20, 0xd5, 0x22, 0xda, 0x3b, 0x5e, 0x4c, 0x5b, 0xad, 0x31, 0x4b, 0xe2, 0x4b, 0xef,
-	0xaf, 0xa4, 0xd7, 0xdf, 0xdb, 0x58, 0x57, 0x6b, 0xe7, 0x46, 0xe0, 0x5b, 0x84, 0x07, 0x60, 0xec,
-	0x37, 0xf0, 0xbf, 0x12, 0x7c, 0xb8, 0x98, 0xb6, 0x0e, 0x96, 0xe0, 0x9f, 0x19, 0xaf, 0xbf, 0x53,
-	0xfc, 0xfc, 0x02, 0x23, 0xa8, 0xce, 0x84, 0xc8, 0xa4, 0x31, 0xe4, 0xff, 0xf2, 0x15, 0x2b, 0x89,
-	0x9b, 0xa8, 0x21, 0x35, 0x07, 0xa1, 0x74, 0x44, 0xb6, 0x4a, 0x6b, 0xad, 0xf1, 0x3e, 0xaa, 0xdb,
-	0x51, 0x60, 0xc7, 0xa9, 0x24, 0xb5, 0xd2, 0xaa, 0xd9, 0xd1, 0xfd, 0x38, 0x95, 0xbd, 0xe0, 0x65,
-	0xe6, 0x3a, 0x93, 0x99, 0xeb, 0xbc, 0xcd, 0x5c, 0xe7, 0x69, 0xee, 0x56, 0x26, 0x73, 0xb7, 0xf2,
-	0x3a, 0x77, 0x2b, 0x0f, 0xd7, 0x91, 0xb2, 0x83, 0x61, 0xe8, 0x73, 0x48, 0x28, 0x07, 0x93, 0x80,
-	0xa1, 0x2a, 0xe4, 0xed, 0x08, 0x68, 0xde, 0xa5, 0x09, 0x88, 0x61, 0x2c, 0x4d, 0x31, 0xa9, 0xa1,
-	0x67, 0xdd, 0xf6, 0x66, 0x95, 0xf6, 0x7a, 0xcd, 0xe2, 0x9a, 0x09, 0x6b, 0xe5, 0x12, 0xe7, 0xef,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xb6, 0x31, 0x17, 0x02, 0x02, 0x00, 0x00,
+	// 303 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xbd, 0x4e, 0xc3, 0x30,
+	0x14, 0x85, 0x1b, 0x7e, 0xda, 0xe2, 0x09, 0x79, 0x00, 0x8b, 0x21, 0x42, 0x2c, 0x30, 0xd0, 0x58,
+	0x05, 0x89, 0x32, 0x83, 0x18, 0x18, 0x58, 0x10, 0x13, 0x4b, 0xe4, 0x5c, 0x5b, 0xad, 0xa5, 0xc4,
+	0x37, 0xb2, 0x6f, 0xa3, 0xf6, 0x2d, 0x78, 0x2c, 0xc6, 0x8e, 0x48, 0x2c, 0xa8, 0x7d, 0x11, 0x94,
+	0x50, 0x52, 0x40, 0x8c, 0x47, 0xdf, 0xf9, 0xec, 0xab, 0xc3, 0xae, 0x6c, 0x06, 0x52, 0x95, 0x65,
+	0x6e, 0x41, 0x91, 0x45, 0x17, 0xa4, 0x75, 0x64, 0x3c, 0x4c, 0x94, 0x75, 0xa9, 0x02, 0xc0, 0xa9,
+	0xa3, 0x20, 0xab, 0xa1, 0x2c, 0x0c, 0x29, 0xad, 0x48, 0x25, 0xa5, 0x47, 0x42, 0x7e, 0x6a, 0x33,
+	0x48, 0x7e, 0x7a, 0xc9, 0x3f, 0x5e, 0x52, 0x0d, 0x4f, 0xde, 0x23, 0xd6, 0x7f, 0x58, 0xbb, 0x5c,
+	0xb0, 0x5e, 0x65, 0x7c, 0xb0, 0xe8, 0x44, 0x74, 0x1c, 0x9d, 0xed, 0x3d, 0x7e, 0x47, 0x7e, 0xcd,
+	0x04, 0xa0, 0x23, 0x8f, 0x79, 0x6e, 0x7c, 0x0a, 0xe8, 0x9c, 0x81, 0xfa, 0xdd, 0xd4, 0x6a, 0xb1,
+	0xd5, 0x54, 0x0f, 0x36, 0xfc, 0xb6, 0xc5, 0xf7, 0x9a, 0x9f, 0x33, 0x3e, 0xc1, 0x40, 0x7f, 0x9c,
+	0xed, 0xc6, 0xd9, 0xaf, 0xc9, 0xaf, 0xb6, 0x60, 0x3d, 0xa5, 0xb5, 0x37, 0x21, 0x88, 0x9d, 0xaf,
+	0x0b, 0xd6, 0x91, 0x1f, 0xb1, 0xbe, 0x71, 0x80, 0xda, 0xba, 0xb1, 0xd8, 0x6d, 0x50, 0x9b, 0xf9,
+	0x21, 0xeb, 0xd1, 0x2c, 0xa5, 0x79, 0x69, 0x44, 0xb7, 0x41, 0x5d, 0x9a, 0x3d, 0xcd, 0x4b, 0x73,
+	0x93, 0xbe, 0x2e, 0xe3, 0x68, 0xb1, 0x8c, 0xa3, 0x8f, 0x65, 0x1c, 0xbd, 0xac, 0xe2, 0xce, 0x62,
+	0x15, 0x77, 0xde, 0x56, 0x71, 0xe7, 0xf9, 0x6e, 0x6c, 0x69, 0x32, 0xcd, 0x12, 0xc0, 0x42, 0x02,
+	0x86, 0x02, 0x83, 0xb4, 0x19, 0x0c, 0xc6, 0x28, 0xab, 0x91, 0x2c, 0x50, 0x4f, 0x73, 0x13, 0xea,
+	0xe1, 0x83, 0xbc, 0x18, 0x0d, 0x36, 0xdb, 0x0d, 0xda, 0xcd, 0xeb, 0xdf, 0x42, 0xd6, 0x6d, 0xe6,
+	0xbe, 0xfc, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xd1, 0xb2, 0xc5, 0xa8, 0x01, 0x00, 0x00,
 }
 
 func (m *Metadata) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/ack.pb.go b/modules/apps/29-fee/types/ack.pb.go
index eec38c21121..c078e868113 100644
--- a/modules/apps/29-fee/types/ack.pb.go
+++ b/modules/apps/29-fee/types/ack.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -26,11 +25,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware
 type IncentivizedAcknowledgement struct {
 	// the underlying app acknowledgement bytes
-	AppAcknowledgement []byte `protobuf:"bytes,1,opt,name=app_acknowledgement,json=appAcknowledgement,proto3" json:"app_acknowledgement,omitempty" yaml:"app_acknowledgement"`
+	AppAcknowledgement []byte `protobuf:"bytes,1,opt,name=app_acknowledgement,json=appAcknowledgement,proto3" json:"app_acknowledgement,omitempty"`
 	// the relayer address which submits the recv packet message
-	ForwardRelayerAddress string `protobuf:"bytes,2,opt,name=forward_relayer_address,json=forwardRelayerAddress,proto3" json:"forward_relayer_address,omitempty" yaml:"forward_relayer_address"`
+	ForwardRelayerAddress string `protobuf:"bytes,2,opt,name=forward_relayer_address,json=forwardRelayerAddress,proto3" json:"forward_relayer_address,omitempty"`
 	// success flag of the base application callback
-	UnderlyingAppSuccess bool `protobuf:"varint,3,opt,name=underlying_app_success,json=underlyingAppSuccess,proto3" json:"underlying_app_success,omitempty" yaml:"underlying_app_successl"`
+	UnderlyingAppSuccess bool `protobuf:"varint,3,opt,name=underlying_app_success,json=underlyingAppSuccess,proto3" json:"underlying_app_success,omitempty"`
 }
 
 func (m *IncentivizedAcknowledgement) Reset()         { *m = IncentivizedAcknowledgement{} }
@@ -94,28 +93,25 @@ func init() {
 func init() { proto.RegisterFile("ibc/applications/fee/v1/ack.proto", fileDescriptor_ab2834946fb65ea4) }
 
 var fileDescriptor_ab2834946fb65ea4 = []byte{
-	// 330 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x30,
-	0x1c, 0xc6, 0xd7, 0x09, 0xa2, 0xc5, 0x53, 0x9d, 0x6e, 0x4c, 0xc8, 0x66, 0x4f, 0xbb, 0xac, 0x61,
-	0x8a, 0x88, 0xde, 0xb6, 0x9b, 0xa7, 0x41, 0xbd, 0xc8, 0x2e, 0x25, 0x4d, 0xff, 0xab, 0x61, 0x69,
-	0x12, 0x92, 0xb6, 0xa3, 0x3e, 0x85, 0x0f, 0xe1, 0xc3, 0x78, 0xdc, 0xd1, 0xd3, 0x90, 0xed, 0x0d,
-	0xf6, 0x04, 0xd2, 0x55, 0x70, 0xca, 0xbc, 0x85, 0xef, 0xfb, 0xf1, 0x23, 0xfc, 0x3f, 0xfb, 0x92,
-	0x85, 0x14, 0x13, 0xa5, 0x38, 0xa3, 0x24, 0x65, 0x52, 0x18, 0x3c, 0x05, 0xc0, 0xf9, 0x00, 0x13,
-	0x3a, 0xf3, 0x94, 0x96, 0xa9, 0x74, 0x9a, 0x2c, 0xa4, 0xde, 0x2e, 0xe2, 0x4d, 0x01, 0xbc, 0x7c,
-	0xd0, 0x6e, 0xc4, 0x32, 0x96, 0x5b, 0x06, 0x97, 0xaf, 0x0a, 0x77, 0xdf, 0xea, 0xf6, 0xc5, 0x83,
-	0xa0, 0x20, 0x52, 0x96, 0xb3, 0x17, 0x88, 0x86, 0x74, 0x26, 0xe4, 0x9c, 0x43, 0x14, 0x43, 0x02,
-	0x22, 0x75, 0xc6, 0xf6, 0x29, 0x51, 0x2a, 0x20, 0xbf, 0xe3, 0x96, 0xd5, 0xb5, 0x7a, 0x27, 0x23,
-	0xb4, 0x59, 0x76, 0xda, 0x05, 0x49, 0xf8, 0xbd, 0xbb, 0x07, 0x72, 0x7d, 0x87, 0x28, 0xf5, 0x57,
-	0x38, 0xb1, 0x9b, 0x53, 0xa9, 0xe7, 0x44, 0x47, 0x81, 0x06, 0x4e, 0x0a, 0xd0, 0x01, 0x89, 0x22,
-	0x0d, 0xc6, 0xb4, 0xea, 0x5d, 0xab, 0x77, 0x3c, 0x72, 0x37, 0xcb, 0x0e, 0xaa, 0xa4, 0xff, 0x80,
-	0xae, 0x7f, 0xf6, 0xdd, 0xf8, 0x55, 0x31, 0xac, 0x72, 0xe7, 0xc9, 0x3e, 0xcf, 0x44, 0x04, 0x9a,
-	0x17, 0x4c, 0xc4, 0x41, 0xf9, 0x25, 0x93, 0x51, 0x5a, 0xaa, 0x0f, 0xba, 0x56, 0xef, 0x68, 0x57,
-	0xbd, 0x9f, 0xe3, 0xae, 0xdf, 0xf8, 0x69, 0x86, 0x4a, 0x3d, 0x56, 0xf9, 0x68, 0xfc, 0xbe, 0x42,
-	0xd6, 0x62, 0x85, 0xac, 0xcf, 0x15, 0xb2, 0x5e, 0xd7, 0xa8, 0xb6, 0x58, 0xa3, 0xda, 0xc7, 0x1a,
-	0xd5, 0x26, 0x37, 0x31, 0x4b, 0x9f, 0xb3, 0xd0, 0xa3, 0x32, 0xc1, 0x54, 0x9a, 0x44, 0x1a, 0xcc,
-	0x42, 0xda, 0x8f, 0x25, 0xce, 0x6f, 0x71, 0x22, 0xa3, 0x8c, 0x83, 0x29, 0x27, 0x33, 0xf8, 0xea,
-	0xae, 0x5f, 0xae, 0x95, 0x16, 0x0a, 0x4c, 0x78, 0xb8, 0x3d, 0xff, 0xf5, 0x57, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xaa, 0xbb, 0x40, 0x71, 0xd2, 0x01, 0x00, 0x00,
+	// 283 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0xd0, 0xcb, 0x4a, 0xf4, 0x30,
+	0x18, 0xc6, 0xf1, 0xe6, 0xfb, 0x40, 0xb4, 0xb8, 0xaa, 0x87, 0x19, 0x10, 0x42, 0x75, 0xd5, 0xcd,
+	0x34, 0x8c, 0x47, 0x5c, 0xd6, 0x9d, 0x2b, 0xa1, 0xee, 0xdc, 0x94, 0x34, 0x79, 0x5b, 0xc3, 0xb4,
+	0x49, 0x48, 0xd2, 0x0e, 0xf5, 0x2a, 0xbc, 0x20, 0x2f, 0xc0, 0xe5, 0x2c, 0x5d, 0x4a, 0x7b, 0x23,
+	0x52, 0x2b, 0x78, 0xd8, 0xe6, 0x97, 0x87, 0x17, 0xfe, 0xfe, 0xb1, 0xc8, 0x19, 0xa1, 0x5a, 0x57,
+	0x82, 0x51, 0x27, 0x94, 0xb4, 0xa4, 0x00, 0x20, 0xed, 0x92, 0x50, 0xb6, 0x8a, 0xb5, 0x51, 0x4e,
+	0x05, 0x33, 0x91, 0xb3, 0xf8, 0xe7, 0x97, 0xb8, 0x00, 0x88, 0xdb, 0xe5, 0xc9, 0x0b, 0xf2, 0x8f,
+	0x6e, 0x25, 0x03, 0xe9, 0x44, 0x2b, 0x9e, 0x80, 0x27, 0x6c, 0x25, 0xd5, 0xba, 0x02, 0x5e, 0x42,
+	0x0d, 0xd2, 0x05, 0xc4, 0xdf, 0xa3, 0x5a, 0x67, 0xf4, 0xf7, 0xf3, 0x1c, 0x85, 0x28, 0xda, 0x4d,
+	0x03, 0xaa, 0xf5, 0xdf, 0xc1, 0xa5, 0x3f, 0x2b, 0x94, 0x59, 0x53, 0xc3, 0x33, 0x03, 0x15, 0xed,
+	0xc0, 0x64, 0x94, 0x73, 0x03, 0xd6, 0xce, 0xff, 0x85, 0x28, 0xda, 0x49, 0x0f, 0xbe, 0x38, 0x9d,
+	0x34, 0x99, 0x30, 0x38, 0xf7, 0x0f, 0x1b, 0xc9, 0xc1, 0x54, 0x9d, 0x90, 0x65, 0x36, 0xde, 0xb4,
+	0x0d, 0x63, 0xe3, 0xec, 0x7f, 0x88, 0xa2, 0xed, 0x74, 0xff, 0x5b, 0x13, 0xad, 0xef, 0x27, 0xbb,
+	0xb9, 0x7b, 0xed, 0x31, 0xda, 0xf4, 0x18, 0xbd, 0xf7, 0x18, 0x3d, 0x0f, 0xd8, 0xdb, 0x0c, 0xd8,
+	0x7b, 0x1b, 0xb0, 0xf7, 0x70, 0x51, 0x0a, 0xf7, 0xd8, 0xe4, 0x31, 0x53, 0x35, 0x61, 0xca, 0xd6,
+	0xca, 0x12, 0x91, 0xb3, 0x45, 0xa9, 0x48, 0x7b, 0x45, 0x6a, 0xc5, 0x9b, 0x0a, 0xec, 0x18, 0xcd,
+	0x92, 0xd3, 0xeb, 0xc5, 0xd8, 0xcb, 0x75, 0x1a, 0x6c, 0xbe, 0xf5, 0xd9, 0xeb, 0xec, 0x23, 0x00,
+	0x00, 0xff, 0xff, 0xfc, 0x47, 0xb1, 0xa5, 0x54, 0x01, 0x00, 0x00,
 }
 
 func (m *IncentivizedAcknowledgement) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go
index 7268ecfb746..6568d3f9310 100644
--- a/modules/apps/29-fee/types/fee.pb.go
+++ b/modules/apps/29-fee/types/fee.pb.go
@@ -29,11 +29,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Fee defines the ICS29 receive, acknowledgement and timeout fees
 type Fee struct {
 	// the packet receive fee
-	RecvFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fee,json=recvFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fee" yaml:"recv_fee"`
+	RecvFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fee,json=recvFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fee"`
 	// the packet acknowledgement fee
-	AckFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=ack_fee,json=ackFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fee" yaml:"ack_fee"`
+	AckFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=ack_fee,json=ackFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fee"`
 	// the packet timeout fee
-	TimeoutFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=timeout_fee,json=timeoutFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fee" yaml:"timeout_fee"`
+	TimeoutFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=timeout_fee,json=timeoutFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fee"`
 }
 
 func (m *Fee) Reset()         { *m = Fee{} }
@@ -95,7 +95,7 @@ type PacketFee struct {
 	// fee encapsulates the recv, ack and timeout fees associated with an IBC packet
 	Fee Fee `protobuf:"bytes,1,opt,name=fee,proto3" json:"fee"`
 	// the refund address for unspent fees
-	RefundAddress string `protobuf:"bytes,2,opt,name=refund_address,json=refundAddress,proto3" json:"refund_address,omitempty" yaml:"refund_address"`
+	RefundAddress string `protobuf:"bytes,2,opt,name=refund_address,json=refundAddress,proto3" json:"refund_address,omitempty"`
 	// optional list of relayers permitted to receive fees
 	Relayers []string `protobuf:"bytes,3,rep,name=relayers,proto3" json:"relayers,omitempty"`
 }
@@ -157,7 +157,7 @@ func (m *PacketFee) GetRelayers() []string {
 // PacketFees contains a list of type PacketFee
 type PacketFees struct {
 	// list of packet fees
-	PacketFees []PacketFee `protobuf:"bytes,1,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees" yaml:"packet_fees"`
+	PacketFees []PacketFee `protobuf:"bytes,1,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees"`
 }
 
 func (m *PacketFees) Reset()         { *m = PacketFees{} }
@@ -203,9 +203,9 @@ func (m *PacketFees) GetPacketFees() []PacketFee {
 // IdentifiedPacketFees contains a list of type PacketFee and associated PacketId
 type IdentifiedPacketFees struct {
 	// unique packet identifier comprised of the channel ID, port ID and sequence
-	PacketId types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"`
+	PacketId types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id"`
 	// list of packet fees
-	PacketFees []PacketFee `protobuf:"bytes,2,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees" yaml:"packet_fees"`
+	PacketFees []PacketFee `protobuf:"bytes,2,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees"`
 }
 
 func (m *IdentifiedPacketFees) Reset()         { *m = IdentifiedPacketFees{} }
@@ -265,40 +265,37 @@ func init() {
 func init() { proto.RegisterFile("ibc/applications/fee/v1/fee.proto", fileDescriptor_cb3319f1af2a53e5) }
 
 var fileDescriptor_cb3319f1af2a53e5 = []byte{
-	// 525 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x8b, 0x13, 0x31,
-	0x14, 0xc7, 0x3b, 0xad, 0xec, 0x6e, 0x53, 0x5c, 0x65, 0x58, 0xb1, 0x5b, 0x74, 0xba, 0xe6, 0xd4,
-	0x4b, 0x13, 0x5a, 0x15, 0xd1, 0x93, 0xce, 0x42, 0x61, 0x4f, 0xca, 0xe0, 0xc9, 0x4b, 0xc9, 0x24,
-	0xaf, 0xdd, 0xd0, 0xce, 0x64, 0x98, 0x4c, 0x0b, 0xbd, 0xfa, 0x09, 0xfc, 0x06, 0xde, 0xfd, 0x24,
-	0x7b, 0x11, 0xf6, 0xe8, 0xa9, 0x4a, 0xfb, 0x0d, 0xf6, 0x2e, 0x48, 0x32, 0x69, 0xe9, 0x2a, 0xcb,
-	0xb2, 0xe0, 0x69, 0xf2, 0x92, 0xf7, 0xcf, 0xef, 0x25, 0xef, 0x3f, 0x41, 0xcf, 0x64, 0xcc, 0x29,
-	0xcb, 0xb2, 0xa9, 0xe4, 0xac, 0x90, 0x2a, 0xd5, 0x74, 0x04, 0x40, 0xe7, 0x3d, 0xf3, 0x21, 0x59,
-	0xae, 0x0a, 0xe5, 0x3f, 0x96, 0x31, 0x27, 0xbb, 0x29, 0xc4, 0xac, 0xcd, 0x7b, 0xad, 0x80, 0x2b,
-	0x9d, 0x28, 0x4d, 0x63, 0xa6, 0x8d, 0x24, 0x86, 0x82, 0xf5, 0x28, 0x57, 0x32, 0x2d, 0x85, 0xad,
-	0xa3, 0xb1, 0x1a, 0x2b, 0x3b, 0xa4, 0x66, 0xe4, 0x66, 0x2d, 0x91, 0xab, 0x1c, 0x28, 0x3f, 0x67,
-	0x69, 0x0a, 0x53, 0x43, 0x73, 0xc3, 0x32, 0x05, 0xff, 0xae, 0xa2, 0xda, 0x00, 0xc0, 0x5f, 0xa0,
-	0x83, 0x1c, 0xf8, 0x7c, 0x38, 0x02, 0x68, 0x7a, 0x27, 0xb5, 0x4e, 0xa3, 0x7f, 0x4c, 0x4a, 0x26,
-	0x31, 0x4c, 0xe2, 0x98, 0xe4, 0x54, 0xc9, 0x34, 0x3c, 0xbd, 0x58, 0xb6, 0x2b, 0x57, 0xcb, 0xf6,
-	0x83, 0x05, 0x4b, 0xa6, 0x6f, 0xf0, 0x46, 0x88, 0xbf, 0xfd, 0x6c, 0x77, 0xc6, 0xb2, 0x38, 0x9f,
-	0xc5, 0x84, 0xab, 0x84, 0xba, 0x9a, 0xcb, 0x4f, 0x57, 0x8b, 0x09, 0x2d, 0x16, 0x19, 0x68, 0xbb,
-	0x87, 0x8e, 0xf6, 0x8d, 0xcc, 0xa0, 0xe7, 0x68, 0x9f, 0xf1, 0x89, 0x25, 0x57, 0x6f, 0x23, 0x87,
-	0x8e, 0x7c, 0x58, 0x92, 0x9d, 0xee, 0x6e, 0xe0, 0x3d, 0xc6, 0x27, 0x86, 0xfb, 0xd9, 0x43, 0x8d,
-	0x42, 0x26, 0xa0, 0x66, 0x85, 0x85, 0xd7, 0x6e, 0x83, 0x0f, 0x1c, 0xdc, 0x2f, 0xe1, 0x3b, 0xda,
-	0xbb, 0x15, 0x80, 0x9c, 0x72, 0x00, 0x80, 0xbf, 0x7a, 0xa8, 0xfe, 0x81, 0xf1, 0x09, 0x98, 0xc8,
-	0x7f, 0x81, 0x6a, 0x65, 0x03, 0xbc, 0x4e, 0xa3, 0xff, 0x84, 0xdc, 0xe0, 0x06, 0x32, 0x00, 0x08,
-	0xef, 0x99, 0x62, 0x22, 0x93, 0xee, 0xbf, 0x45, 0x87, 0x39, 0x8c, 0x66, 0xa9, 0x18, 0x32, 0x21,
-	0x72, 0xd0, 0xba, 0x59, 0x3d, 0xf1, 0x3a, 0xf5, 0xf0, 0xf8, 0x6a, 0xd9, 0x7e, 0xb4, 0x69, 0xd1,
-	0xee, 0x3a, 0x8e, 0xee, 0x97, 0x13, 0xef, 0xca, 0xd8, 0x6f, 0x99, 0xee, 0x4f, 0xd9, 0x02, 0x72,
-	0x6d, 0xaf, 0xa1, 0x1e, 0x6d, 0x63, 0x9c, 0x20, 0xb4, 0x2d, 0x50, 0xfb, 0x43, 0xd4, 0xc8, 0x6c,
-	0x64, 0x8e, 0xad, 0x9d, 0x55, 0xf0, 0x8d, 0x95, 0x6e, 0x95, 0x61, 0xeb, 0xfa, 0xe5, 0xed, 0x6c,
-	0x82, 0x23, 0x94, 0x6d, 0x01, 0xf8, 0xbb, 0x87, 0x8e, 0xce, 0x04, 0xa4, 0x85, 0x1c, 0x49, 0x10,
-	0x3b, 0xe4, 0x8f, 0xa8, 0xee, 0x44, 0x52, 0xb8, 0x1b, 0x7a, 0x6a, 0xb9, 0xc6, 0xe0, 0x64, 0xe3,
-	0xea, 0x2d, 0xf3, 0x4c, 0x84, 0x4d, 0x87, 0x7c, 0x78, 0x0d, 0x29, 0x05, 0x8e, 0x0e, 0x32, 0x97,
-	0xf3, 0xf7, 0x79, 0xaa, 0xff, 0xfb, 0x3c, 0xe1, 0xfb, 0x8b, 0x55, 0xe0, 0x5d, 0xae, 0x02, 0xef,
-	0xd7, 0x2a, 0xf0, 0xbe, 0xac, 0x83, 0xca, 0xe5, 0x3a, 0xa8, 0xfc, 0x58, 0x07, 0x95, 0x4f, 0x2f,
-	0xff, 0x35, 0x8c, 0x8c, 0x79, 0x77, 0xac, 0xe8, 0xfc, 0x15, 0x4d, 0x94, 0x98, 0x4d, 0x41, 0x9b,
-	0xf7, 0x42, 0xd3, 0xfe, 0xeb, 0xae, 0x79, 0x2a, 0xac, 0x87, 0xe2, 0x3d, 0xfb, 0xe3, 0x3e, 0xff,
-	0x13, 0x00, 0x00, 0xff, 0xff, 0x63, 0x3f, 0x38, 0xc9, 0x4f, 0x04, 0x00, 0x00,
+	// 467 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0x13, 0x31,
+	0x14, 0xc7, 0x9b, 0x56, 0x76, 0xb7, 0x29, 0x7a, 0x18, 0x16, 0x5c, 0x8b, 0xce, 0xae, 0x03, 0x42,
+	0x2f, 0x4d, 0x6c, 0x55, 0xc4, 0x9b, 0x56, 0x28, 0xf4, 0xa4, 0xf4, 0x22, 0x78, 0x59, 0x32, 0xc9,
+	0x9b, 0x6e, 0xe8, 0x74, 0x32, 0x4c, 0xd2, 0xc2, 0xde, 0xfd, 0x00, 0x7e, 0x07, 0x6f, 0x7e, 0x0b,
+	0x6f, 0x7b, 0xdc, 0xa3, 0x27, 0x95, 0xf6, 0x8b, 0xc8, 0xcb, 0xc4, 0x61, 0x51, 0xf6, 0x22, 0x3d,
+	0xcd, 0x7b, 0x6f, 0xde, 0x7b, 0xbf, 0x7f, 0xf2, 0xf2, 0xe8, 0x63, 0x9d, 0x4a, 0x2e, 0xca, 0x32,
+	0xd7, 0x52, 0x38, 0x6d, 0x0a, 0xcb, 0x33, 0x00, 0xbe, 0x19, 0xe1, 0x87, 0x95, 0x95, 0x71, 0x26,
+	0xba, 0xaf, 0x53, 0xc9, 0x6e, 0xa6, 0x30, 0xfc, 0xb7, 0x19, 0xf5, 0x63, 0x69, 0xec, 0xca, 0x58,
+	0x9e, 0x0a, 0x8b, 0x25, 0x29, 0x38, 0x31, 0xe2, 0xd2, 0xe8, 0xa2, 0x2e, 0xec, 0x1f, 0x2f, 0xcc,
+	0xc2, 0x78, 0x93, 0xa3, 0x15, 0xa2, 0x9e, 0x28, 0x4d, 0x05, 0x5c, 0x5e, 0x88, 0xa2, 0x80, 0x1c,
+	0x69, 0xc1, 0xac, 0x53, 0x92, 0x6f, 0x6d, 0xda, 0x99, 0x02, 0x44, 0x19, 0x3d, 0xaa, 0x40, 0x6e,
+	0xce, 0x33, 0x80, 0x13, 0x72, 0xd6, 0x19, 0xf4, 0xc6, 0x0f, 0x58, 0xcd, 0x64, 0xc8, 0x64, 0x81,
+	0xc9, 0xde, 0x1a, 0x5d, 0x4c, 0x9e, 0x5e, 0xfd, 0x38, 0x6d, 0x7d, 0xfd, 0x79, 0x3a, 0x58, 0x68,
+	0x77, 0xb1, 0x4e, 0x99, 0x34, 0x2b, 0x1e, 0x04, 0xd6, 0x9f, 0xa1, 0x55, 0x4b, 0xee, 0x2e, 0x4b,
+	0xb0, 0xbe, 0xc0, 0xce, 0x0f, 0xb1, 0x39, 0x72, 0x14, 0x3d, 0x14, 0x72, 0xe9, 0x31, 0xed, 0xfd,
+	0x63, 0x0e, 0x84, 0x5c, 0x22, 0x25, 0xa7, 0x3d, 0xa7, 0x57, 0x60, 0xd6, 0xce, 0x93, 0x3a, 0xfb,
+	0x27, 0xd1, 0xd0, 0x7f, 0x0a, 0x90, 0x7c, 0x22, 0xb4, 0xfb, 0x5e, 0xc8, 0x25, 0xa0, 0x17, 0x3d,
+	0xa7, 0x9d, 0xfa, 0x12, 0xc9, 0xa0, 0x37, 0x7e, 0xc8, 0x6e, 0x99, 0x28, 0x9b, 0x02, 0x4c, 0xee,
+	0x20, 0x76, 0x8e, 0xe9, 0xd1, 0x13, 0x7a, 0xaf, 0x82, 0x6c, 0x5d, 0xa8, 0x73, 0xa1, 0x54, 0x05,
+	0xd6, 0x9e, 0xb4, 0xcf, 0xc8, 0xa0, 0x3b, 0xbf, 0x5b, 0x47, 0xdf, 0xd4, 0xc1, 0xa8, 0x8f, 0x63,
+	0xca, 0xc5, 0x25, 0x54, 0xd6, 0x9f, 0xaa, 0x3b, 0x6f, 0xfc, 0xe4, 0x03, 0xa5, 0x8d, 0x0a, 0x1b,
+	0xcd, 0x68, 0xaf, 0xf4, 0x1e, 0xde, 0x80, 0x0d, 0x33, 0x4d, 0x6e, 0x95, 0xd3, 0x54, 0x06, 0x51,
+	0xb4, 0x6c, 0x5a, 0x25, 0x5f, 0x08, 0x3d, 0x9e, 0x29, 0x28, 0x9c, 0xce, 0x34, 0xa8, 0x1b, 0x8c,
+	0xd7, 0xb4, 0x1b, 0x18, 0x5a, 0x85, 0x03, 0x3f, 0xf2, 0x04, 0x7c, 0x73, 0xec, 0xcf, 0x43, 0x6b,
+	0xba, 0xcf, 0x54, 0x68, 0x7e, 0x54, 0x06, 0xff, 0x6f, 0x95, 0xed, 0xff, 0x57, 0x39, 0x79, 0x77,
+	0xb5, 0x8d, 0xc9, 0xf5, 0x36, 0x26, 0xbf, 0xb6, 0x31, 0xf9, 0xbc, 0x8b, 0x5b, 0xd7, 0xbb, 0xb8,
+	0xf5, 0x7d, 0x17, 0xb7, 0x3e, 0xbe, 0xf8, 0x77, 0xaa, 0x3a, 0x95, 0xc3, 0x85, 0xe1, 0x9b, 0x97,
+	0x7c, 0x65, 0xd4, 0x3a, 0x07, 0x8b, 0x8b, 0x69, 0xf9, 0xf8, 0xd5, 0x10, 0x77, 0xd2, 0x0f, 0x3a,
+	0x3d, 0xf0, 0x1b, 0xf2, 0xec, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x39, 0xec, 0x7b, 0x52, 0xb8,
+	0x03, 0x00, 0x00,
 }
 
 func (m *Fee) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/genesis.pb.go b/modules/apps/29-fee/types/genesis.pb.go
index 8bca28ff748..caca0e2d681 100644
--- a/modules/apps/29-fee/types/genesis.pb.go
+++ b/modules/apps/29-fee/types/genesis.pb.go
@@ -27,15 +27,15 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // GenesisState defines the ICS29 fee middleware genesis state
 type GenesisState struct {
 	// list of identified packet fees
-	IdentifiedFees []IdentifiedPacketFees `protobuf:"bytes,1,rep,name=identified_fees,json=identifiedFees,proto3" json:"identified_fees" yaml:"identified_fees"`
+	IdentifiedFees []IdentifiedPacketFees `protobuf:"bytes,1,rep,name=identified_fees,json=identifiedFees,proto3" json:"identified_fees"`
 	// list of fee enabled channels
-	FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,2,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels" yaml:"fee_enabled_channels"`
+	FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,2,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels"`
 	// list of registered payees
-	RegisteredPayees []RegisteredPayee `protobuf:"bytes,3,rep,name=registered_payees,json=registeredPayees,proto3" json:"registered_payees" yaml:"registered_payees"`
+	RegisteredPayees []RegisteredPayee `protobuf:"bytes,3,rep,name=registered_payees,json=registeredPayees,proto3" json:"registered_payees"`
 	// list of registered counterparty payees
-	RegisteredCounterpartyPayees []RegisteredCounterpartyPayee `protobuf:"bytes,4,rep,name=registered_counterparty_payees,json=registeredCounterpartyPayees,proto3" json:"registered_counterparty_payees" yaml:"registered_counterparty_payees"`
+	RegisteredCounterpartyPayees []RegisteredCounterpartyPayee `protobuf:"bytes,4,rep,name=registered_counterparty_payees,json=registeredCounterpartyPayees,proto3" json:"registered_counterparty_payees"`
 	// list of forward relayer addresses
-	ForwardRelayers []ForwardRelayerAddress `protobuf:"bytes,5,rep,name=forward_relayers,json=forwardRelayers,proto3" json:"forward_relayers" yaml:"forward_relayers"`
+	ForwardRelayers []ForwardRelayerAddress `protobuf:"bytes,5,rep,name=forward_relayers,json=forwardRelayers,proto3" json:"forward_relayers"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -109,9 +109,9 @@ func (m *GenesisState) GetForwardRelayers() []ForwardRelayerAddress {
 // FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
 type FeeEnabledChannel struct {
 	// unique port identifier
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 }
 
 func (m *FeeEnabledChannel) Reset()         { *m = FeeEnabledChannel{} }
@@ -164,7 +164,7 @@ func (m *FeeEnabledChannel) GetChannelId() string {
 // RegisteredPayee contains the relayer address and payee address for a specific channel
 type RegisteredPayee struct {
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address
 	Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
 	// the payee address
@@ -229,11 +229,11 @@ func (m *RegisteredPayee) GetPayee() string {
 // for recv fee distribution)
 type RegisteredCounterpartyPayee struct {
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address
 	Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
 	// the counterparty payee address
-	CounterpartyPayee string `protobuf:"bytes,3,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"`
+	CounterpartyPayee string `protobuf:"bytes,3,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"`
 }
 
 func (m *RegisteredCounterpartyPayee) Reset()         { *m = RegisteredCounterpartyPayee{} }
@@ -295,7 +295,7 @@ type ForwardRelayerAddress struct {
 	// the forward relayer address
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	// unique packet identifer comprised of the channel ID, port ID and sequence
-	PacketId types.PacketId `protobuf:"bytes,2,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"`
+	PacketId types.PacketId `protobuf:"bytes,2,opt,name=packet_id,json=packetId,proto3" json:"packet_id"`
 }
 
 func (m *ForwardRelayerAddress) Reset()         { *m = ForwardRelayerAddress{} }
@@ -358,48 +358,42 @@ func init() {
 }
 
 var fileDescriptor_7191992e856dff95 = []byte{
-	// 648 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x4e, 0xd4, 0x40,
-	0x1c, 0xdf, 0x82, 0x80, 0x0c, 0x06, 0xd8, 0x09, 0x48, 0x05, 0xe9, 0xe2, 0x18, 0x12, 0xa2, 0xd9,
-	0x36, 0x20, 0xc6, 0xe8, 0xcd, 0x12, 0x31, 0x9b, 0x98, 0x48, 0x46, 0x4f, 0x5e, 0x36, 0xdd, 0xf6,
-	0xdf, 0xa5, 0x71, 0xb7, 0xd3, 0xcc, 0x0c, 0x4b, 0xd6, 0x9b, 0x27, 0xaf, 0xbe, 0x86, 0xf1, 0x11,
-	0x7c, 0x01, 0x8e, 0x1c, 0x3d, 0x6d, 0x0c, 0xbc, 0xc1, 0x3e, 0x81, 0x99, 0xce, 0x14, 0x96, 0xfd,
-	0x30, 0x1c, 0xbc, 0xcd, 0x74, 0x7e, 0x5f, 0xd3, 0xdf, 0xe4, 0x8f, 0xb6, 0x93, 0x46, 0xe8, 0x05,
-	0x59, 0xd6, 0x4a, 0xc2, 0x40, 0x26, 0x2c, 0x15, 0x5e, 0x0c, 0xe0, 0x75, 0x76, 0xbd, 0x26, 0xa4,
-	0x20, 0x12, 0xe1, 0x66, 0x9c, 0x49, 0x86, 0xd7, 0x92, 0x46, 0xe8, 0x0e, 0xc2, 0xdc, 0x18, 0xc0,
-	0xed, 0xec, 0xae, 0xaf, 0x34, 0x59, 0x93, 0xe5, 0x18, 0x4f, 0xad, 0x34, 0x7c, 0xfd, 0xd1, 0x24,
-	0x55, 0xc5, 0x1a, 0x80, 0x84, 0x8c, 0x83, 0x17, 0x1e, 0x07, 0x69, 0x0a, 0x2d, 0x75, 0x6c, 0x96,
-	0x1a, 0x42, 0x7e, 0xce, 0xa0, 0x7b, 0x6f, 0x75, 0x8c, 0x0f, 0x32, 0x90, 0x80, 0x3b, 0x68, 0x29,
-	0x89, 0x20, 0x95, 0x49, 0x9c, 0x40, 0x54, 0x8f, 0x01, 0x84, 0x6d, 0x6d, 0x4d, 0xef, 0x2c, 0xec,
-	0x55, 0xdd, 0x09, 0xf9, 0xdc, 0xda, 0x15, 0xfe, 0x28, 0x08, 0x3f, 0x83, 0x3c, 0x04, 0x10, 0xbe,
-	0x73, 0xd6, 0xab, 0x94, 0xfa, 0xbd, 0xca, 0xfd, 0x6e, 0xd0, 0x6e, 0xbd, 0x22, 0x43, 0x9a, 0x84,
-	0x2e, 0x5e, 0x7f, 0x51, 0x78, 0xfc, 0xd5, 0x42, 0x2b, 0x31, 0x40, 0x1d, 0xd2, 0xa0, 0xd1, 0x82,
-	0xa8, 0x6e, 0x62, 0x0a, 0x7b, 0x2a, 0x77, 0x7f, 0x32, 0xd1, 0xfd, 0x10, 0xe0, 0x8d, 0xe6, 0x1c,
-	0x68, 0x8a, 0xff, 0xd8, 0x58, 0x6f, 0x68, 0xeb, 0x71, 0xaa, 0x84, 0xe2, 0x78, 0x98, 0x27, 0xf0,
-	0x29, 0x2a, 0x73, 0x68, 0x26, 0x42, 0x02, 0x87, 0xa8, 0x9e, 0x05, 0x5d, 0x75, 0xfb, 0xe9, 0xdc,
-	0x7f, 0x67, 0xa2, 0x3f, 0xbd, 0x62, 0x1c, 0x29, 0x82, 0xbf, 0x65, 0xdc, 0x6d, 0xed, 0x3e, 0x22,
-	0x48, 0xe8, 0x32, 0xbf, 0x49, 0x11, 0xf8, 0x87, 0x85, 0x9c, 0x01, 0x60, 0xc8, 0x4e, 0x52, 0x09,
-	0x3c, 0x0b, 0xb8, 0xec, 0x16, 0x31, 0xee, 0xe4, 0x31, 0xf6, 0x6f, 0x11, 0xe3, 0x60, 0x80, 0xad,
-	0x23, 0x55, 0x4d, 0xa4, 0xed, 0x91, 0x48, 0x63, 0x9c, 0x08, 0x7d, 0xc8, 0x27, 0x6b, 0x09, 0xfc,
-	0x05, 0x2d, 0xc7, 0x8c, 0x9f, 0x06, 0x3c, 0xaa, 0x73, 0x68, 0x05, 0x5d, 0xe0, 0xc2, 0x9e, 0xc9,
-	0xc3, 0xb9, 0x93, 0x3b, 0xd2, 0x04, 0xaa, 0xf1, 0xaf, 0xa3, 0x88, 0x83, 0x10, 0x7e, 0xc5, 0xc4,
-	0x5a, 0x33, 0x3d, 0x0d, 0xa9, 0x12, 0xba, 0x14, 0xdf, 0xe0, 0x09, 0xd2, 0x41, 0xe5, 0x91, 0xba,
-	0xf1, 0x53, 0x34, 0x97, 0x31, 0x2e, 0xeb, 0x49, 0x64, 0x5b, 0x5b, 0xd6, 0xce, 0xbc, 0x8f, 0xfb,
-	0xbd, 0xca, 0xa2, 0xd6, 0x34, 0x07, 0x84, 0xce, 0xaa, 0x55, 0x2d, 0xc2, 0xfb, 0x08, 0x99, 0x37,
-	0xa0, 0xf0, 0x53, 0x39, 0x7e, 0xb5, 0xdf, 0xab, 0x94, 0x35, 0xfe, 0xfa, 0x8c, 0xd0, 0x79, 0xb3,
-	0xa9, 0x45, 0xe4, 0x14, 0x2d, 0x0d, 0xd5, 0x3c, 0x24, 0x64, 0xdd, 0x4e, 0x08, 0xdb, 0x68, 0xce,
-	0x5c, 0x4f, 0x7b, 0xd3, 0x62, 0x8b, 0x57, 0xd0, 0x4c, 0xfe, 0xff, 0xed, 0xe9, 0xfc, 0xbb, 0xde,
-	0x90, 0x5f, 0x16, 0xda, 0xf8, 0x47, 0xb3, 0xff, 0x3d, 0xc5, 0x3b, 0x84, 0x47, 0x9f, 0x84, 0x8e,
-	0xe4, 0x6f, 0xf6, 0x7b, 0x95, 0x07, 0x46, 0x77, 0x04, 0x43, 0x68, 0x39, 0x1c, 0x4e, 0x47, 0xbe,
-	0x59, 0x68, 0x75, 0x6c, 0xf5, 0x2a, 0x41, 0xa0, 0x97, 0x3a, 0x34, 0x2d, 0xb6, 0xf8, 0x23, 0x9a,
-	0xcf, 0xf2, 0x29, 0x52, 0xf4, 0xb3, 0xb0, 0xb7, 0x99, 0xbf, 0x2b, 0x35, 0xc7, 0xdc, 0x62, 0x78,
-	0x75, 0x76, 0x5d, 0x3d, 0x6b, 0x6a, 0x91, 0x6f, 0x9b, 0x67, 0xb4, 0x6c, 0x2a, 0x2f, 0xd8, 0x84,
-	0xde, 0xcd, 0x0a, 0xcc, 0xfb, 0xb3, 0x0b, 0xc7, 0x3a, 0xbf, 0x70, 0xac, 0x3f, 0x17, 0x8e, 0xf5,
-	0xfd, 0xd2, 0x29, 0x9d, 0x5f, 0x3a, 0xa5, 0xdf, 0x97, 0x4e, 0xe9, 0xd3, 0xf3, 0x66, 0x22, 0x8f,
-	0x4f, 0x1a, 0x6e, 0xc8, 0xda, 0x5e, 0xc8, 0x44, 0x9b, 0x09, 0x2f, 0x69, 0x84, 0xd5, 0x26, 0xf3,
-	0x3a, 0x2f, 0xbc, 0x36, 0x8b, 0x4e, 0x5a, 0x20, 0xd4, 0x98, 0x15, 0xde, 0xde, 0xcb, 0xaa, 0x9a,
-	0xb0, 0xb2, 0x9b, 0x81, 0x68, 0xcc, 0xe6, 0xe3, 0xf3, 0xd9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x25, 0x26, 0x40, 0x90, 0xdc, 0x05, 0x00, 0x00,
+	// 550 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xd3, 0x30,
+	0x14, 0x6e, 0xf6, 0x93, 0x7a, 0x88, 0xae, 0x56, 0xd1, 0xa2, 0xc1, 0xc2, 0xa8, 0x84, 0x54, 0x21,
+	0x35, 0x51, 0x0b, 0x08, 0x71, 0x03, 0x26, 0x86, 0x2a, 0x0e, 0x4c, 0xe5, 0x06, 0x48, 0x21, 0xb1,
+	0x5f, 0x32, 0x8b, 0x36, 0x8e, 0x6c, 0xb7, 0xa8, 0x37, 0x2e, 0xdc, 0xe1, 0xbf, 0xda, 0x71, 0x47,
+	0x4e, 0x08, 0xb5, 0xff, 0x08, 0xb2, 0xe3, 0x8c, 0xae, 0x23, 0x08, 0x71, 0xf3, 0x7b, 0xef, 0xfb,
+	0xde, 0x67, 0x7f, 0x4f, 0xcf, 0xe8, 0x1e, 0x8b, 0x49, 0x10, 0xe5, 0xf9, 0x88, 0x91, 0x48, 0x31,
+	0x9e, 0xc9, 0x20, 0x01, 0x08, 0xa6, 0xbd, 0x20, 0x85, 0x0c, 0x24, 0x93, 0x7e, 0x2e, 0xb8, 0xe2,
+	0x78, 0x8f, 0xc5, 0xc4, 0x5f, 0x86, 0xf9, 0x09, 0x80, 0x3f, 0xed, 0xed, 0xb7, 0x52, 0x9e, 0x72,
+	0x83, 0x09, 0xf4, 0xa9, 0x80, 0xef, 0xdf, 0xad, 0xea, 0xaa, 0x59, 0x4b, 0x10, 0xc2, 0x05, 0x04,
+	0xe4, 0x34, 0xca, 0x32, 0x18, 0xe9, 0xb2, 0x3d, 0x16, 0x90, 0xf6, 0xb7, 0x0d, 0x74, 0xfd, 0x65,
+	0x71, 0x8d, 0x37, 0x2a, 0x52, 0x80, 0xdf, 0xa3, 0x06, 0xa3, 0x90, 0x29, 0x96, 0x30, 0xa0, 0x61,
+	0x02, 0x20, 0x5d, 0xe7, 0x70, 0xbd, 0xb3, 0xd3, 0xef, 0xfa, 0x15, 0xf7, 0xf3, 0x07, 0x17, 0xf8,
+	0x93, 0x88, 0x7c, 0x04, 0x75, 0x0c, 0x20, 0x9f, 0x6f, 0x9c, 0xfd, 0xb8, 0x53, 0x1b, 0xde, 0xf8,
+	0xdd, 0x4b, 0x67, 0x71, 0x8c, 0x5a, 0x09, 0x40, 0x08, 0x59, 0x14, 0x8f, 0x80, 0x86, 0xf6, 0x2e,
+	0xd2, 0x5d, 0x33, 0x12, 0xf7, 0x2b, 0x25, 0x8e, 0x01, 0x5e, 0x14, 0x9c, 0xa3, 0x82, 0x62, 0xfb,
+	0xe3, 0x64, 0xb5, 0x20, 0xf1, 0x3b, 0xd4, 0x14, 0x90, 0x32, 0xa9, 0x40, 0x00, 0x0d, 0xf3, 0x68,
+	0xa6, 0xdf, 0xb0, 0x6e, 0x04, 0x3a, 0x95, 0x02, 0xc3, 0x0b, 0xc6, 0x89, 0x26, 0xd8, 0xf6, 0xbb,
+	0xe2, 0x72, 0x5a, 0xe2, 0xcf, 0x0e, 0xf2, 0x96, 0xba, 0x13, 0x3e, 0xc9, 0x14, 0x88, 0x3c, 0x12,
+	0x6a, 0x56, 0x4a, 0x6d, 0x18, 0xa9, 0x87, 0xff, 0x20, 0x75, 0xb4, 0xc4, 0x5e, 0x96, 0xbd, 0x2d,
+	0xaa, 0x21, 0x12, 0x87, 0x68, 0x37, 0xe1, 0xe2, 0x53, 0x24, 0x68, 0x28, 0x60, 0x14, 0xcd, 0x40,
+	0x48, 0x77, 0xd3, 0x68, 0xfa, 0xd5, 0xfe, 0x15, 0x84, 0x61, 0x81, 0x7f, 0x46, 0xa9, 0x00, 0x59,
+	0xce, 0xa8, 0x91, 0x5c, 0x2a, 0xca, 0xf6, 0x2b, 0xd4, 0xbc, 0xe2, 0x37, 0xde, 0x43, 0xdb, 0x39,
+	0x17, 0x2a, 0x64, 0xd4, 0x75, 0x0e, 0x9d, 0x4e, 0x7d, 0xb8, 0xa5, 0xc3, 0x01, 0xc5, 0x07, 0x08,
+	0xd9, 0x31, 0xea, 0xda, 0x9a, 0xa9, 0xd5, 0x6d, 0x66, 0x40, 0xdb, 0x1f, 0x50, 0x63, 0xc5, 0xdb,
+	0x15, 0x86, 0xb3, 0xc2, 0xc0, 0x2e, 0xda, 0xb6, 0xef, 0xb2, 0xdd, 0xca, 0x10, 0xb7, 0xd0, 0xa6,
+	0xf1, 0xd8, 0x5d, 0x37, 0xf9, 0x22, 0x68, 0x7f, 0x71, 0xd0, 0xad, 0xbf, 0x78, 0xfa, 0xff, 0x72,
+	0x5d, 0x84, 0xaf, 0xce, 0xd7, 0x6a, 0x37, 0xc9, 0xaa, 0x4e, 0x5b, 0xa2, 0x9b, 0x7f, 0xb4, 0x59,
+	0x2b, 0x44, 0xc5, 0xd1, 0xaa, 0x97, 0x21, 0x7e, 0x8a, 0xea, 0xb9, 0x59, 0x99, 0xd2, 0xba, 0x9d,
+	0xfe, 0x81, 0x99, 0xa1, 0x5e, 0x5a, 0xbf, 0xdc, 0xd4, 0x69, 0xcf, 0x2f, 0x16, 0x6b, 0x40, 0xed,
+	0xc8, 0xae, 0xe5, 0x65, 0xfc, 0xfa, 0x6c, 0xee, 0x39, 0xe7, 0x73, 0xcf, 0xf9, 0x39, 0xf7, 0x9c,
+	0xaf, 0x0b, 0xaf, 0x76, 0xbe, 0xf0, 0x6a, 0xdf, 0x17, 0x5e, 0xed, 0xed, 0xa3, 0x94, 0xa9, 0xd3,
+	0x49, 0xec, 0x13, 0x3e, 0x0e, 0x08, 0x97, 0x63, 0x2e, 0x03, 0x16, 0x93, 0x6e, 0xca, 0x83, 0xe9,
+	0xe3, 0x60, 0xcc, 0xe9, 0x64, 0x04, 0x52, 0xff, 0x1f, 0x32, 0xe8, 0x3f, 0xe9, 0xea, 0xaf, 0x43,
+	0xcd, 0x72, 0x90, 0xf1, 0x96, 0xf9, 0x17, 0x1e, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x34, 0xa0,
+	0xbc, 0xd7, 0xb5, 0x04, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/metadata.pb.go b/modules/apps/29-fee/types/metadata.pb.go
index 5d89eaa8719..8e7e4eda257 100644
--- a/modules/apps/29-fee/types/metadata.pb.go
+++ b/modules/apps/29-fee/types/metadata.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -27,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning
 type Metadata struct {
 	// fee_version defines the ICS29 fee version
-	FeeVersion string `protobuf:"bytes,1,opt,name=fee_version,json=feeVersion,proto3" json:"fee_version,omitempty" yaml:"fee_version"`
+	FeeVersion string `protobuf:"bytes,1,opt,name=fee_version,json=feeVersion,proto3" json:"fee_version,omitempty"`
 	// app_version defines the underlying application version, which may or may not be a JSON encoded bytestring
-	AppVersion string `protobuf:"bytes,2,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty" yaml:"app_version"`
+	AppVersion string `protobuf:"bytes,2,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"`
 }
 
 func (m *Metadata) Reset()         { *m = Metadata{} }
@@ -88,23 +87,21 @@ func init() {
 }
 
 var fileDescriptor_03d0f000eda681ce = []byte{
-	// 248 bytes of a gzipped FileDescriptorProto
+	// 214 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4c, 0x4a, 0xd6,
 	0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x4f, 0x4b, 0x4d,
 	0xd5, 0x2f, 0x33, 0xd4, 0xcf, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca,
 	0x2f, 0xc9, 0x17, 0x12, 0xcf, 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xa7, 0x97, 0x96, 0x9a, 0xaa, 0x57,
-	0x66, 0x28, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa3, 0x0f, 0x62, 0x41, 0x94, 0x2b, 0xd5,
-	0x70, 0x71, 0xf8, 0x42, 0x0d, 0x10, 0x32, 0xe7, 0xe2, 0x4e, 0x4b, 0x4d, 0x8d, 0x2f, 0x4b, 0x2d,
-	0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x12, 0xfb, 0x74, 0x4f, 0x5e,
-	0xa8, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, 0x49, 0x52, 0x29, 0x88, 0x2b, 0x2d, 0x35, 0x35, 0x0c,
-	0xc2, 0x01, 0x69, 0x4c, 0x2c, 0x28, 0x80, 0x6b, 0x64, 0x42, 0xd7, 0x88, 0x24, 0xa9, 0x14, 0xc4,
-	0x95, 0x58, 0x50, 0x00, 0xd5, 0xe8, 0xe4, 0x7f, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c,
-	0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72,
-	0x0c, 0x51, 0xa6, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9,
-	0xc5, 0xb9, 0xf9, 0xc5, 0xfa, 0x99, 0x49, 0xc9, 0xba, 0xe9, 0xf9, 0xfa, 0x65, 0xe6, 0xfa, 0xb9,
-	0xf9, 0x29, 0xa5, 0x39, 0xa9, 0xc5, 0xa0, 0xe0, 0x28, 0xd6, 0x37, 0xb2, 0xd4, 0x05, 0x85, 0x44,
-	0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x57, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0xa6, 0xd7, 0xc2, 0x68, 0x2e, 0x01, 0x00, 0x00,
+	0x66, 0xa8, 0xe4, 0xc3, 0xc5, 0xe1, 0x0b, 0x55, 0x2a, 0x24, 0xcf, 0xc5, 0x9d, 0x96, 0x9a, 0x1a,
+	0x5f, 0x96, 0x5a, 0x54, 0x9c, 0x99, 0x9f, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x95,
+	0x96, 0x9a, 0x1a, 0x06, 0x11, 0x01, 0x29, 0x48, 0x2c, 0x28, 0x80, 0x2b, 0x60, 0x82, 0x28, 0x48,
+	0x2c, 0x28, 0x80, 0x2a, 0x70, 0xf2, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07,
+	0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86,
+	0x28, 0xd3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2,
+	0xdc, 0xfc, 0x62, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c, 0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc,
+	0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x90, 0x47, 0x8a, 0xf5, 0x8d, 0x2c, 0x75, 0x41, 0x7e, 0x28, 0xa9,
+	0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x3b, 0xdf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa6,
+	0x80, 0x8c, 0xe8, 0x00, 0x00, 0x00,
 }
 
 func (m *Metadata) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go
index 379d32bca12..ee4d344a336 100644
--- a/modules/apps/29-fee/types/query.pb.go
+++ b/modules/apps/29-fee/types/query.pb.go
@@ -428,7 +428,7 @@ func (m *QueryTotalRecvFeesRequest) GetPacketId() types.PacketId {
 // QueryTotalRecvFeesResponse defines the response type for the TotalRecvFees rpc
 type QueryTotalRecvFeesResponse struct {
 	// the total packet receive fees
-	RecvFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fees,json=recvFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fees" yaml:"recv_fees"`
+	RecvFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fees,json=recvFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fees"`
 }
 
 func (m *QueryTotalRecvFeesResponse) Reset()         { *m = QueryTotalRecvFeesResponse{} }
@@ -520,7 +520,7 @@ func (m *QueryTotalAckFeesRequest) GetPacketId() types.PacketId {
 // QueryTotalAckFeesResponse defines the response type for the TotalAckFees rpc
 type QueryTotalAckFeesResponse struct {
 	// the total packet acknowledgement fees
-	AckFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=ack_fees,json=ackFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fees" yaml:"ack_fees"`
+	AckFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=ack_fees,json=ackFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fees"`
 }
 
 func (m *QueryTotalAckFeesResponse) Reset()         { *m = QueryTotalAckFeesResponse{} }
@@ -612,7 +612,7 @@ func (m *QueryTotalTimeoutFeesRequest) GetPacketId() types.PacketId {
 // QueryTotalTimeoutFeesResponse defines the response type for the TotalTimeoutFees rpc
 type QueryTotalTimeoutFeesResponse struct {
 	// the total packet timeout fees
-	TimeoutFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=timeout_fees,json=timeoutFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fees" yaml:"timeout_fees"`
+	TimeoutFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=timeout_fees,json=timeoutFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fees"`
 }
 
 func (m *QueryTotalTimeoutFeesResponse) Reset()         { *m = QueryTotalTimeoutFeesResponse{} }
@@ -658,7 +658,7 @@ func (m *QueryTotalTimeoutFeesResponse) GetTimeoutFees() github_com_cosmos_cosmo
 // QueryPayeeRequest defines the request type for the Payee rpc
 type QueryPayeeRequest struct {
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address to which the distribution address is registered
 	Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
 }
@@ -713,7 +713,7 @@ func (m *QueryPayeeRequest) GetRelayer() string {
 // QueryPayeeResponse defines the response type for the Payee rpc
 type QueryPayeeResponse struct {
 	// the payee address to which packet fees are paid out
-	PayeeAddress string `protobuf:"bytes,1,opt,name=payee_address,json=payeeAddress,proto3" json:"payee_address,omitempty" yaml:"payee_address"`
+	PayeeAddress string `protobuf:"bytes,1,opt,name=payee_address,json=payeeAddress,proto3" json:"payee_address,omitempty"`
 }
 
 func (m *QueryPayeeResponse) Reset()         { *m = QueryPayeeResponse{} }
@@ -759,7 +759,7 @@ func (m *QueryPayeeResponse) GetPayeeAddress() string {
 // QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
 type QueryCounterpartyPayeeRequest struct {
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address to which the counterparty is registered
 	Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
 }
@@ -814,7 +814,7 @@ func (m *QueryCounterpartyPayeeRequest) GetRelayer() string {
 // QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
 type QueryCounterpartyPayeeResponse struct {
 	// the counterparty payee address used to compensate forward relaying
-	CounterpartyPayee string `protobuf:"bytes,1,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"`
+	CounterpartyPayee string `protobuf:"bytes,1,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"`
 }
 
 func (m *QueryCounterpartyPayeeResponse) Reset()         { *m = QueryCounterpartyPayeeResponse{} }
@@ -915,7 +915,7 @@ func (m *QueryFeeEnabledChannelsRequest) GetQueryHeight() uint64 {
 // QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc
 type QueryFeeEnabledChannelsResponse struct {
 	// list of fee enabled channels
-	FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,1,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels" yaml:"fee_enabled_channels"`
+	FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,1,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels"`
 	// pagination defines the pagination in the response.
 	Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"`
 }
@@ -970,9 +970,9 @@ func (m *QueryFeeEnabledChannelsResponse) GetPagination() *query.PageResponse {
 // QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc
 type QueryFeeEnabledChannelRequest struct {
 	// unique port identifier
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 }
 
 func (m *QueryFeeEnabledChannelRequest) Reset()         { *m = QueryFeeEnabledChannelRequest{} }
@@ -1025,7 +1025,7 @@ func (m *QueryFeeEnabledChannelRequest) GetChannelId() string {
 // QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc
 type QueryFeeEnabledChannelResponse struct {
 	// boolean flag representing the fee enabled channel status
-	FeeEnabled bool `protobuf:"varint,1,opt,name=fee_enabled,json=feeEnabled,proto3" json:"fee_enabled,omitempty" yaml:"fee_enabled"`
+	FeeEnabled bool `protobuf:"varint,1,opt,name=fee_enabled,json=feeEnabled,proto3" json:"fee_enabled,omitempty"`
 }
 
 func (m *QueryFeeEnabledChannelResponse) Reset()         { *m = QueryFeeEnabledChannelResponse{} }
@@ -1096,92 +1096,86 @@ func init() {
 }
 
 var fileDescriptor_0638a8a78ca2503c = []byte{
-	// 1358 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x51, 0x6f, 0xdb, 0x54,
-	0x14, 0xee, 0xcd, 0xba, 0xb5, 0xbd, 0xed, 0x60, 0xb9, 0x2d, 0x2c, 0x0d, 0x6d, 0xd2, 0x79, 0x8c,
-	0x95, 0x4e, 0xb5, 0xd5, 0x8c, 0xd1, 0x0d, 0x09, 0x41, 0xd3, 0xd1, 0x52, 0x18, 0x50, 0xb2, 0xbe,
-	0x80, 0x40, 0x99, 0xe3, 0xdc, 0xa4, 0x56, 0x53, 0xdb, 0xb3, 0x9d, 0x88, 0xac, 0x2b, 0xb0, 0x89,
-	0x0a, 0x24, 0x90, 0x40, 0x42, 0xe2, 0x81, 0x3f, 0x80, 0x40, 0xe2, 0x07, 0xf0, 0x0f, 0xf6, 0x84,
-	0x2a, 0xed, 0x01, 0xc4, 0x43, 0x40, 0x2d, 0xe2, 0x91, 0x87, 0x3c, 0xf1, 0x00, 0x12, 0xf2, 0xbd,
-	0xc7, 0x89, 0x33, 0xdb, 0x4d, 0x52, 0xb2, 0xf2, 0xd4, 0xd8, 0xe7, 0x9e, 0x73, 0xbe, 0xef, 0xbb,
-	0x27, 0xf7, 0x7e, 0x29, 0x3e, 0xab, 0xe6, 0x14, 0x49, 0x36, 0x8c, 0x92, 0xaa, 0xc8, 0xb6, 0xaa,
-	0x6b, 0x96, 0x54, 0xa0, 0x54, 0xaa, 0xcc, 0x49, 0x37, 0xcb, 0xd4, 0xac, 0x8a, 0x86, 0xa9, 0xdb,
-	0x3a, 0x39, 0xad, 0xe6, 0x14, 0xd1, 0xbb, 0x48, 0x2c, 0x50, 0x2a, 0x56, 0xe6, 0xe2, 0x63, 0x45,
-	0xbd, 0xa8, 0xb3, 0x35, 0x92, 0xf3, 0x89, 0x2f, 0x8f, 0x4f, 0x14, 0x75, 0xbd, 0x58, 0xa2, 0x92,
-	0x6c, 0xa8, 0x92, 0xac, 0x69, 0xba, 0x0d, 0x49, 0x3c, 0x9a, 0x50, 0x74, 0x6b, 0x53, 0xb7, 0xa4,
-	0x9c, 0x6c, 0x39, 0x8d, 0x72, 0xd4, 0x96, 0xe7, 0x24, 0x45, 0x57, 0x35, 0x88, 0xcf, 0x78, 0xe3,
-	0x0c, 0x45, 0x63, 0x95, 0x21, 0x17, 0x55, 0x8d, 0x15, 0x83, 0xb5, 0x67, 0xc2, 0xd0, 0x3b, 0xf8,
-	0xf8, 0x92, 0x73, 0x61, 0x4b, 0x8a, 0x54, 0xa3, 0x96, 0x6a, 0x79, 0x2b, 0x29, 0xba, 0x49, 0x25,
-	0x65, 0x5d, 0xd6, 0x34, 0x5a, 0x72, 0x96, 0xc0, 0x47, 0xbe, 0x44, 0xf8, 0x0c, 0xe1, 0xe4, 0x9b,
-	0x0e, 0x9e, 0x15, 0x4d, 0xa1, 0x9a, 0xad, 0x56, 0xd4, 0x5b, 0x34, 0xbf, 0x2a, 0x2b, 0x1b, 0xd4,
-	0xb6, 0x32, 0xf4, 0x66, 0x99, 0x5a, 0x36, 0x59, 0xc2, 0xb8, 0x09, 0x32, 0x86, 0xa6, 0xd0, 0xf4,
-	0x70, 0xea, 0x29, 0x91, 0x33, 0x12, 0x1d, 0x46, 0x22, 0xd7, 0x15, 0x18, 0x89, 0xab, 0x72, 0x91,
-	0x42, 0x6e, 0xc6, 0x93, 0x49, 0xce, 0xe0, 0x11, 0xb6, 0x30, 0xbb, 0x4e, 0xd5, 0xe2, 0xba, 0x1d,
-	0x8b, 0x4c, 0xa1, 0xe9, 0xfe, 0xcc, 0x30, 0x7b, 0xf7, 0x32, 0x7b, 0x25, 0xdc, 0x47, 0x78, 0x2a,
-	0x1c, 0x8e, 0x65, 0xe8, 0x9a, 0x45, 0x49, 0x01, 0x8f, 0xa9, 0x9e, 0x70, 0xd6, 0xe0, 0xf1, 0x18,
-	0x9a, 0x3a, 0x36, 0x3d, 0x9c, 0x9a, 0x15, 0x43, 0x36, 0x56, 0x5c, 0xc9, 0x3b, 0x39, 0x05, 0xd5,
-	0xad, 0xb8, 0x44, 0xa9, 0x95, 0xee, 0xbf, 0x57, 0x4b, 0xf6, 0x65, 0x46, 0x55, 0x7f, 0x3f, 0xb2,
-	0xdc, 0xc2, 0x3b, 0xc2, 0x78, 0x9f, 0x6f, 0xcb, 0x9b, 0x83, 0xf4, 0x12, 0x17, 0x76, 0x10, 0x4e,
-	0x84, 0xb0, 0x72, 0x35, 0x7e, 0x11, 0x0f, 0x71, 0x1a, 0x59, 0x35, 0x0f, 0x12, 0x4f, 0x32, 0x22,
-	0xce, 0xf6, 0x89, 0xee, 0x9e, 0x55, 0x9c, 0x26, 0xce, 0xaa, 0x95, 0x3c, 0x00, 0x1f, 0x34, 0xe0,
-	0xb9, 0x13, 0x75, 0x3f, 0x0e, 0xdf, 0xec, 0x86, 0xb8, 0x79, 0x3c, 0x1a, 0x20, 0x2e, 0x40, 0x3a,
-	0x94, 0xb6, 0xc4, 0xaf, 0xad, 0xf0, 0x23, 0xc2, 0x4f, 0x87, 0xed, 0xf3, 0x92, 0x6e, 0x2e, 0x72,
-	0xbe, 0xbd, 0x1e, 0xc0, 0xd3, 0x78, 0xc0, 0xd0, 0x4d, 0x26, 0xb1, 0xa3, 0xce, 0x50, 0xe6, 0x84,
-	0xf3, 0xb8, 0x92, 0x27, 0x93, 0x18, 0x83, 0xc4, 0x4e, 0xec, 0x18, 0x8b, 0x0d, 0xc1, 0x9b, 0x00,
-	0x69, 0xfb, 0xfd, 0xd2, 0xfe, 0x84, 0xf0, 0x4c, 0x27, 0x84, 0x40, 0xe5, 0x1b, 0x3d, 0x1c, 0xe1,
-	0x87, 0x3c, 0xbc, 0xef, 0xe2, 0x71, 0x46, 0x6c, 0x4d, 0xb7, 0xe5, 0x52, 0x86, 0x2a, 0x15, 0xd6,
-	0xb3, 0x57, 0x63, 0x2b, 0x7c, 0x8d, 0x70, 0x3c, 0xa8, 0x3e, 0x08, 0x75, 0x1b, 0x0f, 0x99, 0x54,
-	0xa9, 0x64, 0x0b, 0x94, 0xba, 0xea, 0x8c, 0xb7, 0xb0, 0x70, 0xf1, 0x2f, 0xea, 0xaa, 0x96, 0xbe,
-	0xea, 0x14, 0xaf, 0xd7, 0x92, 0xa7, 0xaa, 0xf2, 0x66, 0xe9, 0x39, 0xa1, 0x91, 0x29, 0x7c, 0xf7,
-	0x6b, 0x72, 0xba, 0xa8, 0xda, 0xeb, 0xe5, 0x9c, 0xa8, 0xe8, 0x9b, 0x12, 0x9c, 0xc6, 0xfc, 0xcf,
-	0xac, 0x95, 0xdf, 0x90, 0xec, 0xaa, 0x41, 0x2d, 0x56, 0xc4, 0xca, 0x0c, 0x9a, 0x80, 0x42, 0x78,
-	0x07, 0xc7, 0x9a, 0xd8, 0x16, 0x94, 0x8d, 0xde, 0x52, 0xff, 0x0a, 0x79, 0xa5, 0x6d, 0x94, 0x07,
-	0xe6, 0x55, 0x3c, 0x28, 0x2b, 0x1b, 0x1d, 0x12, 0x5f, 0x04, 0xe2, 0x8f, 0x72, 0xe2, 0x6e, 0x62,
-	0x77, 0xbc, 0x07, 0x64, 0x0e, 0x41, 0xb8, 0x81, 0x27, 0x9a, 0xb8, 0xd6, 0xd4, 0x4d, 0xaa, 0x97,
-	0xed, 0xde, 0x52, 0xff, 0x06, 0xe1, 0xc9, 0x90, 0x16, 0x40, 0x7f, 0x07, 0xe1, 0x11, 0x9b, 0xbf,
-	0xef, 0x50, 0x83, 0x65, 0xd0, 0x60, 0x94, 0x6b, 0xe0, 0x4d, 0xee, 0x4e, 0x87, 0x61, 0xbb, 0x89,
-	0x47, 0x50, 0x70, 0x94, 0x01, 0x5d, 0x95, 0xab, 0xd4, 0x3d, 0x54, 0xc8, 0x33, 0x2d, 0xe7, 0x85,
-	0xa3, 0xc0, 0x50, 0xfa, 0xb1, 0x7a, 0x2d, 0x19, 0xe5, 0xad, 0x9b, 0x31, 0xc1, 0x7b, 0x8c, 0xc4,
-	0xf0, 0x80, 0x49, 0x4b, 0x72, 0x95, 0x9a, 0x70, 0xfc, 0xb8, 0x8f, 0xc2, 0x75, 0x4c, 0xbc, 0x4d,
-	0x40, 0x82, 0xe7, 0xf1, 0x49, 0xc3, 0x79, 0x91, 0x95, 0xf3, 0x79, 0x93, 0x5a, 0x16, 0x34, 0x8a,
-	0xd5, 0x6b, 0xc9, 0x31, 0xde, 0xa8, 0x25, 0x2c, 0x64, 0x46, 0xd8, 0xf3, 0x02, 0x3c, 0xea, 0x20,
-	0xf1, 0xa2, 0x5e, 0xd6, 0x6c, 0x6a, 0x1a, 0xb2, 0x69, 0x3f, 0x5c, 0x16, 0x1a, 0xdc, 0x72, 0x01,
-	0x0d, 0x81, 0xd1, 0x35, 0x4c, 0x14, 0x4f, 0x30, 0xcb, 0xf0, 0x42, 0xe7, 0xc9, 0x7a, 0x2d, 0x39,
-	0x0e, 0x9d, 0x7d, 0x6b, 0x84, 0x4c, 0x54, 0x79, 0xb0, 0xaa, 0xf0, 0xa9, 0x7b, 0xad, 0x2e, 0x51,
-	0xfa, 0x92, 0x26, 0xe7, 0x4a, 0x34, 0x0f, 0xe7, 0xec, 0xff, 0x61, 0x5d, 0xfe, 0x74, 0x2f, 0xd7,
-	0x20, 0x34, 0xc0, 0xff, 0x0e, 0xc2, 0x63, 0x05, 0x4a, 0xb3, 0x94, 0xc7, 0xb3, 0xa0, 0xaa, 0x3b,
-	0xdc, 0x33, 0xa1, 0xe7, 0xbe, 0xaf, 0x66, 0xfa, 0x2c, 0x4c, 0xfb, 0x13, 0x5c, 0xb2, 0xa0, 0xaa,
-	0x42, 0x86, 0x14, 0x7c, 0x58, 0x7a, 0x77, 0x31, 0xdc, 0x75, 0xbf, 0xc3, 0x3e, 0x70, 0xae, 0xfa,
-	0x17, 0x9a, 0xf7, 0x2d, 0xdf, 0x63, 0x52, 0xaf, 0x25, 0x1f, 0x81, 0xd1, 0xe5, 0x01, 0xa1, 0x71,
-	0x07, 0xb7, 0x4e, 0x63, 0xa4, 0xb3, 0x69, 0x14, 0xde, 0x0a, 0x1b, 0x81, 0x86, 0xe6, 0xf3, 0x78,
-	0xd8, 0x23, 0x0e, 0x03, 0x32, 0x98, 0x7e, 0xbc, 0x5e, 0x4b, 0x12, 0x9f, 0x72, 0x42, 0x06, 0x37,
-	0x05, 0x4b, 0xfd, 0x11, 0xc5, 0xc7, 0x59, 0x6d, 0xf2, 0x03, 0xc2, 0xa3, 0x01, 0xf7, 0x3a, 0xb9,
-	0x1c, 0xba, 0x5f, 0x6d, 0x2c, 0x75, 0xfc, 0xca, 0x21, 0x32, 0x39, 0x1f, 0x61, 0xf6, 0xee, 0xfd,
-	0xdf, 0xbf, 0x8c, 0x9c, 0x27, 0xe7, 0x24, 0xf8, 0x11, 0xd0, 0x30, 0xff, 0x41, 0x8e, 0x82, 0x7c,
-	0x1e, 0xc1, 0xc4, 0x5f, 0x8e, 0xcc, 0x77, 0x0b, 0xc0, 0x45, 0x7e, 0xb9, 0xfb, 0x44, 0x00, 0xbe,
-	0x83, 0x18, 0xf2, 0x0f, 0xc8, 0xb6, 0x0f, 0xb9, 0x3b, 0xb1, 0xd2, 0x56, 0xe3, 0x5e, 0x11, 0x9b,
-	0x1b, 0xbe, 0x2d, 0x39, 0x23, 0xd2, 0x12, 0x84, 0xe9, 0xd9, 0x96, 0x2c, 0x07, 0x96, 0xa6, 0xd0,
-	0x96, 0xa8, 0xfb, 0x72, 0x3b, 0x48, 0x12, 0xf2, 0x0f, 0xc2, 0x93, 0x07, 0xba, 0x34, 0x92, 0xee,
-	0x7a, 0x77, 0x7c, 0x9e, 0x35, 0xbe, 0xf8, 0x9f, 0x6a, 0x80, 0x64, 0xd7, 0x99, 0x62, 0xaf, 0x91,
-	0x57, 0x0f, 0x50, 0x2c, 0x48, 0x27, 0x57, 0x9d, 0xc0, 0x89, 0xf8, 0x1b, 0xe1, 0x93, 0x2d, 0x66,
-	0x8b, 0xa4, 0x0e, 0xc6, 0x1a, 0xe4, 0xfc, 0xe2, 0x17, 0xbb, 0xca, 0x01, 0x3e, 0x77, 0xf8, 0x08,
-	0x6c, 0x91, 0xea, 0xd1, 0x8d, 0x80, 0xed, 0x20, 0xc9, 0x36, 0xac, 0x20, 0xf9, 0x0b, 0xe1, 0x11,
-	0xaf, 0xe1, 0x22, 0x73, 0x1d, 0x30, 0x69, 0xf5, 0x7e, 0xf1, 0x54, 0x37, 0x29, 0xc0, 0xfd, 0x43,
-	0xce, 0xfd, 0x16, 0x79, 0xef, 0xa8, 0xb9, 0xbb, 0x6e, 0x90, 0x7c, 0x12, 0xc1, 0xa7, 0x1e, 0x34,
-	0x5c, 0xe4, 0x52, 0x07, 0x5c, 0xfc, 0x1e, 0x30, 0xfe, 0x6c, 0xb7, 0x69, 0x20, 0xc3, 0x47, 0x5c,
-	0x86, 0xf7, 0xc9, 0xed, 0xa3, 0x96, 0xc1, 0x6b, 0x08, 0xc9, 0xb7, 0x08, 0x1f, 0x67, 0x2e, 0x82,
-	0xcc, 0x1c, 0x4c, 0xc4, 0xeb, 0x98, 0xe2, 0x17, 0x3a, 0x5a, 0x0b, 0x4c, 0x97, 0x19, 0xd1, 0x05,
-	0xf2, 0x42, 0x87, 0x5f, 0x5e, 0xb0, 0x51, 0x96, 0xb4, 0x05, 0x9f, 0xb6, 0x25, 0xe6, 0x7d, 0xc8,
-	0x2f, 0x08, 0x47, 0x7d, 0x9e, 0x8a, 0xb4, 0xd9, 0x80, 0x30, 0xd7, 0x17, 0x9f, 0xef, 0x3a, 0x0f,
-	0xf8, 0xac, 0x31, 0x3e, 0xaf, 0x93, 0x6b, 0x87, 0xe7, 0xe3, 0x37, 0x76, 0xe4, 0x7b, 0x84, 0x89,
-	0xdf, 0x31, 0xb5, 0xbb, 0x9f, 0x42, 0x1d, 0x5f, 0xbb, 0xfb, 0x29, 0xdc, 0x9c, 0x09, 0x4f, 0x32,
-	0x7e, 0x09, 0x32, 0xe1, 0xe3, 0xe7, 0xb1, 0x08, 0x64, 0x17, 0xe1, 0xa8, 0xaf, 0x48, 0xbb, 0xcd,
-	0x08, 0x73, 0x48, 0xf1, 0xf9, 0xae, 0xf3, 0x00, 0xec, 0x2b, 0x0c, 0xec, 0x55, 0x92, 0x3e, 0xe4,
-	0xcd, 0xe0, 0xa1, 0x94, 0x7e, 0xe3, 0xde, 0x5e, 0x02, 0xed, 0xee, 0x25, 0xd0, 0x6f, 0x7b, 0x09,
-	0xf4, 0xc5, 0x7e, 0xa2, 0x6f, 0x77, 0x3f, 0xd1, 0xf7, 0xf3, 0x7e, 0xa2, 0xef, 0xed, 0x4b, 0xfe,
-	0xdf, 0x4c, 0x6a, 0x4e, 0x99, 0x2d, 0xea, 0x52, 0x65, 0x5e, 0xda, 0xd4, 0xf3, 0xe5, 0x12, 0xb5,
-	0x78, 0xf3, 0xd4, 0x95, 0x59, 0xa7, 0x3f, 0xfb, 0x19, 0x95, 0x3b, 0xc1, 0xfe, 0xb7, 0x78, 0xf1,
-	0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x67, 0x6b, 0x48, 0x88, 0x15, 0x00, 0x00,
+	// 1251 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdf, 0x6e, 0xdc, 0xc4,
+	0x17, 0xce, 0x6c, 0xd3, 0x26, 0x39, 0x49, 0xa5, 0x5f, 0x26, 0x91, 0x9a, 0x5a, 0xc9, 0x26, 0x75,
+	0x7f, 0xa5, 0x21, 0x68, 0x6d, 0xb2, 0x55, 0x49, 0x73, 0x05, 0x49, 0x20, 0x25, 0x50, 0x68, 0x58,
+	0x22, 0x81, 0x10, 0x68, 0xeb, 0xb5, 0x67, 0x1d, 0x2b, 0x1b, 0x8f, 0x6b, 0x7b, 0x57, 0xa4, 0x21,
+	0xfc, 0x2f, 0x20, 0x81, 0x54, 0x24, 0x9e, 0x02, 0x24, 0x1e, 0x80, 0x37, 0xe8, 0x55, 0x15, 0xa9,
+	0x17, 0x20, 0x2e, 0x00, 0x25, 0x88, 0x67, 0xe0, 0x02, 0x24, 0xe4, 0x99, 0xf1, 0xae, 0x37, 0xb6,
+	0xf7, 0x4f, 0xd8, 0x84, 0xab, 0xd8, 0x33, 0x73, 0xce, 0xf9, 0xbe, 0x6f, 0xc6, 0x73, 0xbe, 0x0d,
+	0x5c, 0xb6, 0x4a, 0xba, 0xaa, 0x39, 0x4e, 0xc5, 0xd2, 0x35, 0xdf, 0xa2, 0xb6, 0xa7, 0x96, 0x09,
+	0x51, 0x6b, 0xf3, 0xea, 0xdd, 0x2a, 0x71, 0x77, 0x14, 0xc7, 0xa5, 0x3e, 0xc5, 0x17, 0xac, 0x92,
+	0xae, 0x44, 0x17, 0x29, 0x65, 0x42, 0x94, 0xda, 0xbc, 0x34, 0x6e, 0x52, 0x93, 0xb2, 0x35, 0x6a,
+	0xf0, 0xc4, 0x97, 0x4b, 0x93, 0x26, 0xa5, 0x66, 0x85, 0xa8, 0x9a, 0x63, 0xa9, 0x9a, 0x6d, 0x53,
+	0x5f, 0x04, 0xf1, 0xd9, 0xac, 0x4e, 0xbd, 0x6d, 0xea, 0xa9, 0x25, 0xcd, 0x0b, 0x0a, 0x95, 0x88,
+	0xaf, 0xcd, 0xab, 0x3a, 0xb5, 0x6c, 0x31, 0x3f, 0x17, 0x9d, 0x67, 0x28, 0xea, 0xab, 0x1c, 0xcd,
+	0xb4, 0x6c, 0x96, 0x4c, 0xac, 0xbd, 0x94, 0x86, 0x3e, 0xc0, 0xc7, 0x97, 0x5c, 0x49, 0x5b, 0x62,
+	0x12, 0x9b, 0x78, 0x96, 0x17, 0xcd, 0xa4, 0x53, 0x97, 0xa8, 0xfa, 0xa6, 0x66, 0xdb, 0xa4, 0x12,
+	0x2c, 0x11, 0x8f, 0x7c, 0x89, 0xfc, 0x15, 0x82, 0xe9, 0xd7, 0x02, 0x3c, 0x6b, 0xb6, 0x4e, 0x6c,
+	0xdf, 0xaa, 0x59, 0xf7, 0x88, 0xb1, 0xae, 0xe9, 0x5b, 0xc4, 0xf7, 0x0a, 0xe4, 0x6e, 0x95, 0x78,
+	0x3e, 0x5e, 0x05, 0x68, 0x80, 0x9c, 0x40, 0x33, 0x68, 0x76, 0x38, 0xff, 0x84, 0xc2, 0x19, 0x29,
+	0x01, 0x23, 0x85, 0xeb, 0x2a, 0x18, 0x29, 0xeb, 0x9a, 0x49, 0x44, 0x6c, 0x21, 0x12, 0x89, 0x2f,
+	0xc1, 0x08, 0x5b, 0x58, 0xdc, 0x24, 0x96, 0xb9, 0xe9, 0x4f, 0x64, 0x66, 0xd0, 0x6c, 0x7f, 0x61,
+	0x98, 0x8d, 0xbd, 0xc8, 0x86, 0xe4, 0xc7, 0x08, 0x66, 0xd2, 0xe1, 0x78, 0x0e, 0xb5, 0x3d, 0x82,
+	0xcb, 0x30, 0x6e, 0x45, 0xa6, 0x8b, 0x0e, 0x9f, 0x9f, 0x40, 0x33, 0x67, 0x66, 0x87, 0xf3, 0x39,
+	0x25, 0x65, 0x63, 0x95, 0x35, 0x23, 0x88, 0x29, 0x5b, 0x61, 0xc6, 0x55, 0x42, 0xbc, 0xe5, 0xfe,
+	0x87, 0xbf, 0x4c, 0xf7, 0x15, 0xc6, 0xac, 0x78, 0x3d, 0x7c, 0xb3, 0x89, 0x77, 0x86, 0xf1, 0xbe,
+	0xda, 0x96, 0x37, 0x07, 0x19, 0x25, 0x2e, 0xdf, 0x47, 0x90, 0x4d, 0x61, 0x15, 0x6a, 0xfc, 0x1c,
+	0x0c, 0x71, 0x1a, 0x45, 0xcb, 0x10, 0x12, 0x4f, 0x31, 0x22, 0xc1, 0xf6, 0x29, 0xe1, 0x9e, 0xd5,
+	0x82, 0x22, 0xc1, 0xaa, 0x35, 0x43, 0x00, 0x1f, 0x74, 0xc4, 0x7b, 0x27, 0xea, 0x7e, 0x9e, 0xbe,
+	0xd9, 0x75, 0x71, 0x0d, 0x18, 0x4b, 0x10, 0x57, 0x40, 0x3a, 0x96, 0xb6, 0x38, 0xae, 0xad, 0xfc,
+	0x08, 0xc1, 0x93, 0x69, 0xfb, 0xbc, 0x4a, 0xdd, 0x15, 0xce, 0xb7, 0xd7, 0x07, 0xf0, 0x02, 0x0c,
+	0x38, 0xd4, 0x65, 0x12, 0x07, 0xea, 0x0c, 0x15, 0xce, 0x05, 0xaf, 0x6b, 0x06, 0x9e, 0x02, 0x10,
+	0x12, 0x07, 0x73, 0x67, 0xd8, 0xdc, 0x90, 0x18, 0x49, 0x90, 0xb6, 0x3f, 0x2e, 0xed, 0x8f, 0x08,
+	0xe6, 0x3a, 0x21, 0x24, 0x54, 0xbe, 0xd3, 0xc3, 0x23, 0x7c, 0xc2, 0x87, 0xf7, 0x1d, 0xb8, 0xc8,
+	0x88, 0x6d, 0x50, 0x5f, 0xab, 0x14, 0x88, 0x5e, 0x63, 0x35, 0x7b, 0x75, 0x6c, 0xe5, 0xcf, 0x10,
+	0x48, 0x49, 0xf9, 0x85, 0x50, 0x9b, 0x30, 0xe4, 0x12, 0xbd, 0x56, 0x2c, 0x13, 0x12, 0xaa, 0x73,
+	0xb1, 0x89, 0x45, 0x88, 0x7f, 0x85, 0x5a, 0xf6, 0xf2, 0xd3, 0x41, 0xf2, 0xef, 0x7e, 0x9d, 0x9e,
+	0x35, 0x2d, 0x7f, 0xb3, 0x5a, 0x52, 0x74, 0xba, 0xad, 0x8a, 0x9b, 0x97, 0xff, 0xc9, 0x79, 0xc6,
+	0x96, 0xea, 0xef, 0x38, 0xc4, 0x63, 0x01, 0x5e, 0x61, 0xd0, 0x15, 0x15, 0xe5, 0xb7, 0x61, 0xa2,
+	0x81, 0x63, 0x49, 0xdf, 0xea, 0x2d, 0xcd, 0x4f, 0x50, 0x54, 0xc6, 0x7a, 0xfa, 0xfa, 0x8d, 0x36,
+	0xa8, 0xe9, 0x5b, 0x27, 0x46, 0x72, 0x40, 0xe3, 0xf5, 0xe4, 0x3b, 0x30, 0xd9, 0x00, 0xb1, 0x61,
+	0x6d, 0x13, 0x5a, 0xf5, 0x7b, 0xcb, 0xf3, 0x01, 0x82, 0xa9, 0x94, 0x12, 0x82, 0xab, 0x0d, 0x23,
+	0x3e, 0x1f, 0x3e, 0x31, 0xbe, 0xc3, 0x7e, 0xa3, 0xae, 0x7c, 0x0b, 0x46, 0x19, 0xa0, 0x75, 0x6d,
+	0x87, 0x84, 0xb7, 0xc2, 0x91, 0x0f, 0x1e, 0x1d, 0xfd, 0xe0, 0x27, 0x60, 0xc0, 0x25, 0x15, 0x6d,
+	0x87, 0xb8, 0xe2, 0xa2, 0x08, 0x5f, 0xe5, 0x45, 0xc0, 0xd1, 0x6c, 0x82, 0xd3, 0x65, 0x38, 0xef,
+	0x04, 0x03, 0x45, 0xcd, 0x30, 0x5c, 0xe2, 0x79, 0x22, 0xe3, 0x08, 0x1b, 0x5c, 0xe2, 0x63, 0xf2,
+	0x9b, 0x42, 0x99, 0x15, 0x5a, 0xb5, 0x7d, 0xe2, 0x3a, 0x9a, 0xeb, 0xf7, 0x08, 0xd4, 0x6d, 0xd1,
+	0x5e, 0x12, 0x32, 0x0b, 0x80, 0x39, 0xc0, 0x7a, 0x64, 0xb2, 0xc8, 0x80, 0x89, 0x12, 0xa3, 0xfa,
+	0xd1, 0x30, 0xf9, 0xcb, 0xb0, 0x61, 0xad, 0x12, 0xf2, 0x82, 0xad, 0x95, 0x2a, 0xc4, 0x10, 0x37,
+	0xd8, 0x7f, 0x61, 0x0a, 0x1e, 0x85, 0x6d, 0x2b, 0x09, 0x8d, 0x20, 0x58, 0x82, 0xf1, 0x32, 0x21,
+	0x45, 0xc2, 0xa7, 0x8b, 0x42, 0xb5, 0xf0, 0x74, 0xcd, 0xa5, 0x5e, 0xa8, 0xb1, 0x94, 0x61, 0xd3,
+	0x2a, 0xc7, 0x6a, 0xf5, 0xee, 0x4a, 0x7d, 0x43, 0x9c, 0x84, 0x58, 0xf1, 0x50, 0xdc, 0x48, 0xa3,
+	0x42, 0x2d, 0x1a, 0x55, 0xe6, 0xc8, 0x11, 0x91, 0x97, 0xd2, 0xb6, 0xad, 0xae, 0xd3, 0x34, 0x0c,
+	0x47, 0x74, 0x62, 0xd9, 0x07, 0x0b, 0xd0, 0x20, 0x9b, 0xff, 0x63, 0x14, 0xce, 0xb2, 0x1c, 0xf8,
+	0x07, 0x04, 0x63, 0x09, 0xdd, 0x0c, 0xdf, 0x48, 0x15, 0xb3, 0x8d, 0x91, 0x94, 0x16, 0x8f, 0x11,
+	0xc9, 0x71, 0xcb, 0xb9, 0x8f, 0x1f, 0xff, 0xfe, 0x4d, 0xe6, 0x2a, 0xbe, 0xa2, 0x0a, 0xeb, 0x5b,
+	0xb7, 0xbc, 0x49, 0x7d, 0x14, 0x3f, 0xc8, 0x00, 0x8e, 0xa7, 0xc3, 0x0b, 0xdd, 0x02, 0x08, 0x91,
+	0xdf, 0xe8, 0x3e, 0x50, 0x00, 0xbf, 0x8f, 0x18, 0xf2, 0x0f, 0xf0, 0x5e, 0x0c, 0x79, 0x78, 0x48,
+	0xd5, 0xdd, 0xfa, 0xa5, 0xab, 0x34, 0x76, 0x77, 0x4f, 0x0d, 0xf6, 0xbc, 0x69, 0x52, 0x9c, 0x89,
+	0x3d, 0xd5, 0x0b, 0x60, 0xd9, 0x3a, 0x69, 0x9a, 0x0d, 0x07, 0xf7, 0x92, 0x24, 0xc1, 0x7f, 0x23,
+	0x98, 0x6a, 0xe9, 0x4d, 0xf0, 0x72, 0xd7, 0xbb, 0x13, 0x73, 0x6a, 0xd2, 0xca, 0xbf, 0xca, 0x21,
+	0x24, 0x7b, 0x9d, 0x29, 0xf6, 0x0a, 0x7e, 0xb9, 0x85, 0x62, 0x49, 0x3a, 0x85, 0xea, 0x24, 0x9e,
+	0x88, 0xbf, 0x10, 0x9c, 0x6f, 0xb2, 0x18, 0x38, 0xdf, 0x1a, 0x6b, 0x92, 0xdf, 0x91, 0xae, 0x75,
+	0x15, 0x23, 0xf8, 0x7c, 0xc4, 0x8f, 0xc0, 0x2e, 0xde, 0x39, 0xbd, 0x23, 0xe0, 0x07, 0x48, 0x8a,
+	0x75, 0xeb, 0x84, 0xff, 0x44, 0x30, 0x12, 0xb5, 0x1e, 0x78, 0xbe, 0x03, 0x26, 0xcd, 0x2e, 0x48,
+	0xca, 0x77, 0x13, 0x22, 0xb8, 0x7f, 0xc8, 0xb9, 0xdf, 0xc3, 0xef, 0x9e, 0x36, 0xf7, 0xd0, 0x50,
+	0xe1, 0x2f, 0x32, 0xf0, 0xbf, 0xa3, 0x6e, 0x04, 0x5f, 0xef, 0x80, 0x4b, 0xdc, 0x20, 0x49, 0xcf,
+	0x74, 0x1b, 0x26, 0x64, 0xf8, 0x94, 0xcb, 0xf0, 0x3e, 0x7e, 0xef, 0xb4, 0x65, 0x88, 0x7a, 0x2d,
+	0xfc, 0x2d, 0x82, 0xb3, 0xac, 0xc3, 0xe3, 0xb9, 0xd6, 0x44, 0xa2, 0xbe, 0x44, 0x7a, 0xaa, 0xa3,
+	0xb5, 0x82, 0xe9, 0x4d, 0x46, 0x74, 0x09, 0x3f, 0xdb, 0xe1, 0xc7, 0x2b, 0x3c, 0x8c, 0xa7, 0xee,
+	0x8a, 0xa7, 0x3d, 0x95, 0x99, 0x13, 0xfc, 0x33, 0x82, 0xd1, 0x98, 0xa1, 0xc1, 0x6d, 0x36, 0x20,
+	0xcd, 0x5b, 0x49, 0x0b, 0x5d, 0xc7, 0x09, 0x3e, 0x1b, 0x8c, 0xcf, 0xab, 0xf8, 0xd6, 0xf1, 0xf9,
+	0xc4, 0x9d, 0x17, 0xfe, 0x1e, 0x01, 0x8e, 0xbb, 0x99, 0x76, 0xfd, 0x29, 0xd5, 0x8d, 0xb5, 0xeb,
+	0x4f, 0xe9, 0xc6, 0x49, 0xfe, 0x3f, 0xe3, 0x97, 0xc5, 0x93, 0x31, 0x7e, 0x11, 0x9f, 0x80, 0xf7,
+	0x11, 0x8c, 0xc6, 0x92, 0xb4, 0xdb, 0x8c, 0x34, 0x7b, 0x23, 0x2d, 0x74, 0x1d, 0x27, 0xc0, 0xbe,
+	0xc4, 0xc0, 0x3e, 0x8f, 0x97, 0x8f, 0xd9, 0x19, 0x22, 0x94, 0x96, 0x6f, 0x3f, 0x3c, 0xc8, 0xa2,
+	0xfd, 0x83, 0x2c, 0xfa, 0xed, 0x20, 0x8b, 0xbe, 0x3e, 0xcc, 0xf6, 0xed, 0x1f, 0x66, 0xfb, 0x7e,
+	0x3a, 0xcc, 0xf6, 0xbd, 0x75, 0x3d, 0xfe, 0x43, 0xc3, 0x2a, 0xe9, 0x39, 0x93, 0xaa, 0xb5, 0x05,
+	0x75, 0x9b, 0x1a, 0xd5, 0x0a, 0xf1, 0x78, 0xf1, 0xfc, 0x62, 0x2e, 0xa8, 0xcf, 0x7e, 0x7b, 0x94,
+	0xce, 0xb1, 0xff, 0xa8, 0x5d, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x61, 0x2e, 0xac, 0x94, 0x7e,
+	0x14, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go
index 721250beacc..0c88efc0409 100644
--- a/modules/apps/29-fee/types/tx.pb.go
+++ b/modules/apps/29-fee/types/tx.pb.go
@@ -32,9 +32,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // MsgRegisterPayee defines the request type for the RegisterPayee rpc
 type MsgRegisterPayee struct {
 	// unique port identifier
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address
 	Relayer string `protobuf:"bytes,3,opt,name=relayer,proto3" json:"relayer,omitempty"`
 	// the payee address
@@ -114,13 +114,13 @@ var xxx_messageInfo_MsgRegisterPayeeResponse proto.InternalMessageInfo
 // MsgRegisterCounterpartyPayee defines the request type for the RegisterCounterpartyPayee rpc
 type MsgRegisterCounterpartyPayee struct {
 	// unique port identifier
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// unique channel identifier
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// the relayer address
 	Relayer string `protobuf:"bytes,3,opt,name=relayer,proto3" json:"relayer,omitempty"`
 	// the counterparty payee address
-	CounterpartyPayee string `protobuf:"bytes,4,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"`
+	CounterpartyPayee string `protobuf:"bytes,4,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"`
 }
 
 func (m *MsgRegisterCounterpartyPayee) Reset()         { *m = MsgRegisterCounterpartyPayee{} }
@@ -200,9 +200,9 @@ type MsgPayPacketFee struct {
 	// fee encapsulates the recv, ack and timeout fees associated with an IBC packet
 	Fee Fee `protobuf:"bytes,1,opt,name=fee,proto3" json:"fee"`
 	// the source port unique identifier
-	SourcePortId string `protobuf:"bytes,2,opt,name=source_port_id,json=sourcePortId,proto3" json:"source_port_id,omitempty" yaml:"source_port_id"`
+	SourcePortId string `protobuf:"bytes,2,opt,name=source_port_id,json=sourcePortId,proto3" json:"source_port_id,omitempty"`
 	// the source channel unique identifer
-	SourceChannelId string `protobuf:"bytes,3,opt,name=source_channel_id,json=sourceChannelId,proto3" json:"source_channel_id,omitempty" yaml:"source_channel_id"`
+	SourceChannelId string `protobuf:"bytes,3,opt,name=source_channel_id,json=sourceChannelId,proto3" json:"source_channel_id,omitempty"`
 	// account address to refund fee if necessary
 	Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"`
 	// optional list of relayers permitted to the receive packet fees
@@ -283,9 +283,9 @@ var xxx_messageInfo_MsgPayPacketFeeResponse proto.InternalMessageInfo
 // This Msg can be used to pay for a packet at a specified sequence (instead of the next sequence send)
 type MsgPayPacketFeeAsync struct {
 	// unique packet identifier comprised of the channel ID, port ID and sequence
-	PacketId types.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"`
+	PacketId types.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id"`
 	// the packet fee associated with a particular IBC packet
-	PacketFee PacketFee `protobuf:"bytes,2,opt,name=packet_fee,json=packetFee,proto3" json:"packet_fee" yaml:"packet_fee"`
+	PacketFee PacketFee `protobuf:"bytes,2,opt,name=packet_fee,json=packetFee,proto3" json:"packet_fee"`
 }
 
 func (m *MsgPayPacketFeeAsync) Reset()         { *m = MsgPayPacketFeeAsync{} }
@@ -372,51 +372,46 @@ func init() {
 func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) }
 
 var fileDescriptor_05c93128649f1b96 = []byte{
-	// 699 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4f, 0x6b, 0xdb, 0x4a,
-	0x10, 0xb7, 0xe2, 0xfc, 0xf3, 0x24, 0x2f, 0x89, 0x97, 0xe4, 0x45, 0x16, 0x89, 0x95, 0x27, 0x1e,
-	0x8f, 0x3c, 0x4a, 0xa4, 0xda, 0x4d, 0x28, 0x0d, 0x94, 0x52, 0x05, 0x42, 0x03, 0x0d, 0x35, 0xa2,
-	0xa7, 0x52, 0x08, 0xb2, 0xbc, 0x56, 0xd4, 0xda, 0x5a, 0xa1, 0x95, 0x4d, 0xf5, 0x0d, 0x7a, 0x4c,
-	0xbf, 0x41, 0xbe, 0x41, 0xbf, 0x46, 0x8e, 0x39, 0xf4, 0xd0, 0x93, 0x28, 0xc9, 0xa5, 0xb7, 0x82,
-	0xfb, 0x05, 0xca, 0x4a, 0x2b, 0x55, 0xb6, 0x71, 0x70, 0x7b, 0xea, 0x6d, 0x67, 0xe6, 0x37, 0xbf,
-	0x9d, 0xf9, 0x69, 0x46, 0x0b, 0x3b, 0x4e, 0xd3, 0xd2, 0x4c, 0xcf, 0xeb, 0x38, 0x96, 0x19, 0x38,
-	0xc4, 0xa5, 0x5a, 0x1b, 0x63, 0xad, 0x5f, 0xd3, 0x82, 0x77, 0xaa, 0xe7, 0x93, 0x80, 0xa0, 0x4d,
-	0xa7, 0x69, 0xa9, 0x79, 0x84, 0xda, 0xc6, 0x58, 0xed, 0xd7, 0xa4, 0x75, 0x9b, 0xd8, 0x24, 0xc6,
-	0x68, 0xec, 0x94, 0xc0, 0xa5, 0x7f, 0x26, 0x11, 0xb2, 0xac, 0x1c, 0xc4, 0x22, 0x3e, 0xd6, 0xac,
-	0x73, 0xd3, 0x75, 0x71, 0x87, 0x85, 0xf9, 0x31, 0x81, 0x28, 0x1f, 0x05, 0x58, 0x3b, 0xa5, 0xb6,
-	0x81, 0x6d, 0x87, 0x06, 0xd8, 0x6f, 0x98, 0x21, 0xc6, 0xe8, 0x1e, 0x2c, 0x78, 0xc4, 0x0f, 0xce,
-	0x9c, 0x96, 0x28, 0xec, 0x08, 0xbb, 0x25, 0x1d, 0x0d, 0x22, 0x79, 0x25, 0x34, 0xbb, 0x9d, 0x43,
-	0x85, 0x07, 0x14, 0x63, 0x9e, 0x9d, 0x4e, 0x5a, 0x68, 0x1f, 0x80, 0x53, 0x32, 0xfc, 0x4c, 0x8c,
-	0xdf, 0x18, 0x44, 0x72, 0x39, 0xc1, 0xff, 0x8c, 0x29, 0x46, 0x89, 0x1b, 0x27, 0x2d, 0x24, 0xc2,
-	0x82, 0x8f, 0x3b, 0x66, 0x88, 0x7d, 0xb1, 0xc8, 0x52, 0x8c, 0xd4, 0x44, 0xeb, 0x30, 0xe7, 0xb1,
-	0x2a, 0xc4, 0xd9, 0xd8, 0x9f, 0x18, 0x87, 0x8b, 0xef, 0x2f, 0xe5, 0xc2, 0xd7, 0x4b, 0xb9, 0xa0,
-	0x48, 0x20, 0x8e, 0x16, 0x6c, 0x60, 0xea, 0x11, 0x97, 0x62, 0xe5, 0xbb, 0x00, 0x5b, 0xb9, 0xe0,
-	0x11, 0xe9, 0xb9, 0x01, 0xf6, 0x3d, 0xd3, 0x0f, 0xc2, 0x3f, 0xa0, 0xb3, 0xe7, 0x80, 0xac, 0x5c,
-	0x45, 0x67, 0xb9, 0x36, 0xf5, 0xed, 0x41, 0x24, 0x57, 0x38, 0xef, 0x18, 0x46, 0x31, 0xca, 0xd6,
-	0x68, 0x2b, 0x39, 0x45, 0xfe, 0x83, 0x7f, 0xef, 0x6a, 0x3a, 0x53, 0xe7, 0x62, 0x06, 0x56, 0x4f,
-	0xa9, 0xdd, 0x30, 0xc3, 0x86, 0x69, 0xbd, 0xc5, 0xc1, 0x31, 0xc6, 0x68, 0x1f, 0x8a, 0x6d, 0x8c,
-	0x63, 0x31, 0x96, 0xea, 0x5b, 0xea, 0x84, 0x11, 0x54, 0x8f, 0x31, 0xd6, 0x67, 0xaf, 0x22, 0xb9,
-	0x60, 0x30, 0x38, 0x7a, 0x02, 0x2b, 0x94, 0xf4, 0x7c, 0x0b, 0x9f, 0xa5, 0x6a, 0x26, 0xea, 0x54,
-	0x06, 0x91, 0xbc, 0x91, 0x74, 0x31, 0x1c, 0x57, 0x8c, 0xe5, 0xc4, 0xd1, 0x48, 0xa4, 0x7d, 0x06,
-	0x65, 0x0e, 0xc8, 0x29, 0x1c, 0xcb, 0xa5, 0x6f, 0x0d, 0x22, 0x59, 0x1c, 0xe2, 0xc8, 0x0b, 0xbd,
-	0x9a, 0xf8, 0x8e, 0x32, 0xb9, 0xff, 0x86, 0x79, 0xea, 0xd8, 0x2e, 0xf6, 0xf9, 0xbc, 0x70, 0x0b,
-	0x49, 0xb0, 0xc8, 0x75, 0xa7, 0xe2, 0xdc, 0x4e, 0x71, 0xb7, 0x64, 0x64, 0x76, 0x4e, 0xba, 0x0a,
-	0x6c, 0x8e, 0x28, 0x92, 0xa9, 0xf5, 0x49, 0x80, 0xf5, 0x91, 0xd8, 0x53, 0x1a, 0xba, 0x16, 0x7a,
-	0x09, 0x25, 0x2f, 0xf6, 0xa4, 0x53, 0xb4, 0x54, 0xdf, 0x8e, 0x85, 0x63, 0x9b, 0xa6, 0xa6, 0xeb,
-	0xd5, 0xaf, 0xa9, 0x49, 0xde, 0x49, 0x4b, 0x17, 0x99, 0x72, 0x83, 0x48, 0x5e, 0xe3, 0x83, 0x96,
-	0x66, 0x2b, 0xc6, 0xa2, 0xc7, 0x31, 0xe8, 0x35, 0x00, 0xf7, 0xb3, 0xef, 0x31, 0x13, 0xd3, 0x2a,
-	0x13, 0xbf, 0x47, 0x56, 0x92, 0x5e, 0xe1, 0xdc, 0xe5, 0x21, 0xee, 0x36, 0x1b, 0x1a, 0x5e, 0xe6,
-	0xf1, 0xd0, 0xb0, 0x54, 0xe3, 0x0d, 0x19, 0xeb, 0x2a, 0x6d, 0xbb, 0xfe, 0xad, 0x08, 0xc5, 0x53,
-	0x6a, 0xa3, 0x2e, 0xfc, 0x35, 0xfc, 0x53, 0xf8, 0x7f, 0x62, 0x31, 0xa3, 0xeb, 0x28, 0xd5, 0xa6,
-	0x86, 0xa6, 0xd7, 0xa2, 0x0f, 0x02, 0x54, 0x26, 0xaf, 0xed, 0xc1, 0x34, 0x84, 0x63, 0x69, 0xd2,
-	0xe3, 0xdf, 0x4a, 0xcb, 0x6a, 0x7a, 0x03, 0xcb, 0x43, 0xbb, 0xb2, 0x7b, 0x17, 0x5d, 0x1e, 0x29,
-	0xdd, 0x9f, 0x16, 0x99, 0xdd, 0x15, 0x42, 0x79, 0x7c, 0xd2, 0xf6, 0xa6, 0xa5, 0x89, 0xe1, 0xd2,
-	0xc1, 0x2f, 0xc1, 0xd3, 0xab, 0xf5, 0x17, 0x57, 0x37, 0x55, 0xe1, 0xfa, 0xa6, 0x2a, 0x7c, 0xb9,
-	0xa9, 0x0a, 0x17, 0xb7, 0xd5, 0xc2, 0xf5, 0x6d, 0xb5, 0xf0, 0xf9, 0xb6, 0x5a, 0x78, 0x75, 0x60,
-	0x3b, 0xc1, 0x79, 0xaf, 0xa9, 0x5a, 0xa4, 0xab, 0x59, 0x84, 0x76, 0x09, 0xd5, 0x9c, 0xa6, 0xb5,
-	0x67, 0x13, 0xad, 0xff, 0x50, 0xeb, 0x92, 0x56, 0xaf, 0x83, 0x29, 0x7b, 0x82, 0xa8, 0x56, 0x7f,
-	0xb4, 0xc7, 0x5e, 0x9f, 0x20, 0xf4, 0x30, 0x6d, 0xce, 0xc7, 0x4f, 0xcb, 0x83, 0x1f, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0xfb, 0xaa, 0xe9, 0x34, 0xf3, 0x06, 0x00, 0x00,
+	// 616 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
+	0x10, 0xb5, 0x9b, 0xfe, 0xcb, 0xb4, 0xbf, 0x5f, 0xe9, 0xaa, 0xa2, 0xae, 0xd5, 0xba, 0x25, 0xaa,
+	0x50, 0x40, 0x8a, 0x4d, 0x02, 0x11, 0x02, 0x09, 0x09, 0x5a, 0x29, 0x28, 0x87, 0x88, 0x28, 0x47,
+	0x2e, 0x91, 0xb3, 0x99, 0xb8, 0x86, 0xc4, 0x6b, 0x79, 0x9d, 0x08, 0xdf, 0x39, 0x70, 0x84, 0x6f,
+	0xd0, 0x2b, 0xe2, 0x8b, 0xf4, 0xd8, 0x1b, 0x9c, 0x10, 0x4a, 0x2e, 0xdc, 0xf8, 0x0a, 0xc8, 0xf6,
+	0xda, 0x72, 0x12, 0xa5, 0x0a, 0x48, 0xdc, 0x3c, 0x3b, 0x6f, 0xde, 0xcc, 0x7b, 0x9e, 0x5d, 0x38,
+	0xb1, 0x3b, 0xd4, 0x30, 0x5d, 0xb7, 0x6f, 0x53, 0xd3, 0xb7, 0x99, 0xc3, 0x8d, 0x1e, 0xa2, 0x31,
+	0x2a, 0x1b, 0xfe, 0x3b, 0xdd, 0xf5, 0x98, 0xcf, 0xc8, 0xbe, 0xdd, 0xa1, 0x7a, 0x16, 0xa1, 0xf7,
+	0x10, 0xf5, 0x51, 0x59, 0xdd, 0xb3, 0x98, 0xc5, 0x22, 0x8c, 0x11, 0x7e, 0xc5, 0x70, 0xf5, 0xce,
+	0x22, 0xc2, 0xb0, 0x2a, 0x03, 0xa1, 0xcc, 0x43, 0x83, 0x5e, 0x98, 0x8e, 0x83, 0xfd, 0x30, 0x2d,
+	0x3e, 0x63, 0x48, 0xe1, 0xbd, 0x0c, 0xb7, 0x1a, 0xdc, 0x6a, 0xa1, 0x65, 0x73, 0x1f, 0xbd, 0xa6,
+	0x19, 0x20, 0x92, 0x7d, 0xd8, 0x70, 0x99, 0xe7, 0xb7, 0xed, 0xae, 0x22, 0x9f, 0xc8, 0xc5, 0x7c,
+	0x6b, 0x3d, 0x0c, 0xeb, 0x5d, 0x72, 0x04, 0x20, 0xca, 0xc3, 0xdc, 0x4a, 0x94, 0xcb, 0x8b, 0x93,
+	0x7a, 0x97, 0x28, 0xb0, 0xe1, 0x61, 0xdf, 0x0c, 0xd0, 0x53, 0x72, 0x51, 0x2e, 0x09, 0xc9, 0x1e,
+	0xac, 0xb9, 0x21, 0xb5, 0xb2, 0x1a, 0x9d, 0xc7, 0xc1, 0xd3, 0xcd, 0x0f, 0x97, 0xc7, 0xd2, 0xcf,
+	0xcb, 0x63, 0xa9, 0xa0, 0x82, 0x32, 0x3b, 0x45, 0x0b, 0xb9, 0xcb, 0x1c, 0x8e, 0x85, 0xcf, 0x32,
+	0x1c, 0x66, 0x92, 0xe7, 0x6c, 0xe8, 0xf8, 0xe8, 0xb9, 0xa6, 0xe7, 0x07, 0xff, 0x6a, 0xdc, 0x12,
+	0x10, 0x9a, 0x69, 0xd3, 0xce, 0xce, 0xbe, 0x4b, 0x67, 0x07, 0xc8, 0xe8, 0xb8, 0x0b, 0xa7, 0x37,
+	0x8d, 0x9a, 0x6a, 0xfa, 0x2a, 0xc3, 0x4e, 0x83, 0x5b, 0x4d, 0x33, 0x68, 0x9a, 0xf4, 0x2d, 0xfa,
+	0x35, 0x44, 0xf2, 0x08, 0x72, 0x3d, 0xc4, 0x48, 0xc2, 0x56, 0xe5, 0x50, 0x5f, 0xb0, 0x0d, 0x7a,
+	0x0d, 0xf1, 0x6c, 0xf5, 0xea, 0xfb, 0xb1, 0xd4, 0x0a, 0xe1, 0xe4, 0x14, 0xfe, 0xe7, 0x6c, 0xe8,
+	0x51, 0x6c, 0x27, 0x1e, 0xc4, 0x3a, 0xb7, 0xe3, 0xd3, 0x66, 0xec, 0xc4, 0x7d, 0xd8, 0x15, 0xa8,
+	0x8c, 0x21, 0xb1, 0xe8, 0x9d, 0x38, 0x71, 0x9e, 0xda, 0x72, 0x1b, 0xd6, 0xb9, 0x6d, 0x39, 0xe8,
+	0x09, 0xc1, 0x22, 0x22, 0x2a, 0x6c, 0x0a, 0x7f, 0xb8, 0xb2, 0x76, 0x92, 0x2b, 0xe6, 0x5b, 0x69,
+	0x9c, 0x71, 0xe0, 0x00, 0xf6, 0x67, 0x84, 0xa5, 0xa2, 0xbf, 0xc8, 0xb0, 0x37, 0x93, 0x7b, 0xc1,
+	0x03, 0x87, 0x92, 0xe7, 0x90, 0x77, 0xa3, 0x93, 0xe4, 0x17, 0x6e, 0x55, 0x8e, 0x22, 0xfd, 0xe1,
+	0xee, 0xea, 0xc9, 0xc2, 0x8e, 0xca, 0x7a, 0x5c, 0x57, 0xef, 0x0a, 0x03, 0x36, 0x5d, 0x11, 0x93,
+	0x97, 0x00, 0x82, 0x21, 0xb4, 0x70, 0x25, 0xa2, 0x28, 0x2c, 0xb4, 0x30, 0x6d, 0x2f, 0x78, 0x44,
+	0xf7, 0xda, 0xd4, 0xaf, 0xd4, 0xa2, 0xad, 0x9b, 0x1b, 0x36, 0x51, 0x53, 0xf9, 0x95, 0x83, 0x5c,
+	0x83, 0x5b, 0x64, 0x00, 0xff, 0x4d, 0xdf, 0x9e, 0x7b, 0x0b, 0xfb, 0xce, 0xae, 0xb8, 0x5a, 0x5e,
+	0x1a, 0x9a, 0xb4, 0x25, 0x9f, 0x64, 0x38, 0x58, 0x7c, 0x15, 0xaa, 0xcb, 0x10, 0xce, 0x95, 0xa9,
+	0xcf, 0xfe, 0xaa, 0x2c, 0x9d, 0xe9, 0x0d, 0x6c, 0x4f, 0x6d, 0x72, 0xf1, 0x26, 0xba, 0x2c, 0x52,
+	0x7d, 0xb0, 0x2c, 0x32, 0xed, 0x15, 0xc0, 0xee, 0xfc, 0x02, 0x95, 0x96, 0xa5, 0x89, 0xe0, 0x6a,
+	0xf5, 0x8f, 0xe0, 0x49, 0xeb, 0xb3, 0x57, 0x57, 0x63, 0x4d, 0xbe, 0x1e, 0x6b, 0xf2, 0x8f, 0xb1,
+	0x26, 0x7f, 0x9c, 0x68, 0xd2, 0xf5, 0x44, 0x93, 0xbe, 0x4d, 0x34, 0xe9, 0x75, 0xd5, 0xb2, 0xfd,
+	0x8b, 0x61, 0x47, 0xa7, 0x6c, 0x60, 0x50, 0xc6, 0x07, 0x8c, 0x1b, 0x76, 0x87, 0x96, 0x2c, 0x66,
+	0x8c, 0x1e, 0x1b, 0x03, 0xd6, 0x1d, 0xf6, 0x91, 0x87, 0x6f, 0x35, 0x37, 0x2a, 0x4f, 0x4a, 0xe1,
+	0x33, 0xed, 0x07, 0x2e, 0xf2, 0xce, 0x7a, 0xf4, 0x06, 0x3f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff,
+	0xaa, 0x24, 0x00, 0xb6, 0x1c, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/transfer/types/authz.pb.go b/modules/apps/transfer/types/authz.pb.go
index 95f24eca332..f5bee61bd43 100644
--- a/modules/apps/transfer/types/authz.pb.go
+++ b/modules/apps/transfer/types/authz.pb.go
@@ -29,9 +29,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Allocation defines the spend limit for a particular port and channel
 type Allocation struct {
 	// the port on which the packet will be sent
-	SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"`
+	SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"`
 	// the channel by which the packet will be sent
-	SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"`
+	SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"`
 	// spend limitation on the channel
 	SpendLimit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=spend_limit,json=spendLimit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"spend_limit"`
 	// allow list of receivers, an empty allow list permits any receiver address
@@ -156,35 +156,33 @@ func init() {
 }
 
 var fileDescriptor_b1a28b55d17325aa = []byte{
-	// 435 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4d, 0x6e, 0xd3, 0x40,
-	0x14, 0x8e, 0x9b, 0x0a, 0x29, 0x13, 0xc1, 0xc2, 0xa2, 0xc8, 0xa9, 0xc0, 0x89, 0xbc, 0x40, 0xde,
-	0x64, 0x86, 0xc0, 0x22, 0x52, 0x57, 0x34, 0xdd, 0x76, 0x51, 0x2c, 0x56, 0x6c, 0xa2, 0xf1, 0x64,
-	0xb0, 0x47, 0x8c, 0xfd, 0x2c, 0xcf, 0xd8, 0xa8, 0x3d, 0x05, 0x48, 0x9c, 0x82, 0x35, 0x87, 0xa8,
-	0x58, 0x75, 0xc9, 0x2a, 0xa0, 0xe4, 0x06, 0x3d, 0x01, 0xf2, 0xcc, 0x14, 0x5c, 0x21, 0xb1, 0xb2,
-	0xdf, 0xcf, 0xf7, 0xde, 0xf7, 0xbe, 0xf9, 0x50, 0x2c, 0x52, 0x46, 0x68, 0x55, 0x49, 0xc1, 0xa8,
-	0x16, 0x50, 0x2a, 0xa2, 0x6b, 0x5a, 0xaa, 0xf7, 0xbc, 0x26, 0xed, 0x82, 0xd0, 0x46, 0xe7, 0x57,
-	0xb8, 0xaa, 0x41, 0x83, 0xff, 0x54, 0xa4, 0x0c, 0xf7, 0x3b, 0xf1, 0x5d, 0x27, 0x6e, 0x17, 0xc7,
-	0x13, 0x06, 0xaa, 0x00, 0xb5, 0x36, 0xbd, 0xc4, 0x06, 0x16, 0x78, 0xfc, 0x38, 0x83, 0x0c, 0x6c,
-	0xbe, 0xfb, 0x73, 0xd9, 0xd0, 0xf6, 0x90, 0x94, 0x2a, 0x4e, 0xda, 0x45, 0xca, 0x35, 0x5d, 0x10,
-	0x06, 0xa2, 0xb4, 0xf5, 0xe8, 0xcb, 0x01, 0x42, 0xa7, 0x52, 0x82, 0x5d, 0xe6, 0x2f, 0xd1, 0x58,
-	0x41, 0x53, 0x33, 0xbe, 0xae, 0xa0, 0xd6, 0x81, 0x37, 0xf3, 0xe2, 0xd1, 0xea, 0xc9, 0xed, 0x76,
-	0xea, 0x5f, 0xd2, 0x42, 0x9e, 0x44, 0xbd, 0x62, 0x94, 0x20, 0x1b, 0x5d, 0x40, 0xad, 0xfd, 0xd7,
-	0xe8, 0x91, 0xab, 0xb1, 0x9c, 0x96, 0x25, 0x97, 0xc1, 0x81, 0xc1, 0x4e, 0x6e, 0xb7, 0xd3, 0xa3,
-	0x7b, 0x58, 0x57, 0x8f, 0x92, 0x87, 0x36, 0x71, 0x66, 0x63, 0x5f, 0xa2, 0xb1, 0xaa, 0x78, 0xb9,
-	0x59, 0x4b, 0x51, 0x08, 0x1d, 0x0c, 0x67, 0xc3, 0x78, 0xfc, 0x72, 0x82, 0xdd, 0x8d, 0x1d, 0x7f,
-	0xec, 0xf8, 0xe3, 0x33, 0x10, 0xe5, 0xea, 0xc5, 0xf5, 0x76, 0x3a, 0xf8, 0xfa, 0x73, 0x1a, 0x67,
-	0x42, 0xe7, 0x4d, 0x8a, 0x19, 0x14, 0x4e, 0x10, 0xf7, 0x99, 0xab, 0xcd, 0x07, 0xa2, 0x2f, 0x2b,
-	0xae, 0x0c, 0x40, 0x25, 0xc8, 0xcc, 0x3f, 0xef, 0xc6, 0xfb, 0xcf, 0x10, 0xa2, 0x52, 0xc2, 0xc7,
-	0xb5, 0x14, 0x4a, 0x07, 0x87, 0xb3, 0x61, 0x3c, 0x4a, 0x46, 0x26, 0x73, 0x2e, 0x94, 0x8e, 0x3e,
-	0x7b, 0xe8, 0xe8, 0xad, 0xd3, 0xfd, 0xb4, 0xd1, 0x39, 0xd4, 0xe2, 0xca, 0x2a, 0x74, 0x81, 0xc6,
-	0xf4, 0x8f, 0x5e, 0x2a, 0xf0, 0x0c, 0xcd, 0x18, 0xff, 0xef, 0xd5, 0xf0, 0x5f, 0x81, 0x57, 0x87,
-	0x1d, 0xeb, 0xa4, 0x3f, 0xe2, 0xe4, 0xf9, 0xf7, 0x6f, 0xf3, 0xc8, 0x9d, 0x69, 0x9d, 0x70, 0x77,
-	0xe7, 0xbd, 0xcd, 0xab, 0x37, 0xd7, 0xbb, 0xd0, 0xbb, 0xd9, 0x85, 0xde, 0xaf, 0x5d, 0xe8, 0x7d,
-	0xda, 0x87, 0x83, 0x9b, 0x7d, 0x38, 0xf8, 0xb1, 0x0f, 0x07, 0xef, 0x96, 0xff, 0x4a, 0x20, 0x52,
-	0x36, 0xcf, 0x80, 0xb4, 0x4b, 0x52, 0xc0, 0xa6, 0x91, 0x5c, 0x75, 0xee, 0xeb, 0xb9, 0xce, 0xe8,
-	0x92, 0x3e, 0x30, 0x26, 0x78, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x61, 0xe8, 0x65, 0x9c, 0x9f,
-	0x02, 0x00, 0x00,
+	// 408 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x3d, 0x8f, 0xd4, 0x30,
+	0x10, 0x5d, 0xb3, 0x27, 0xa4, 0x75, 0x04, 0x45, 0x04, 0x52, 0xee, 0x04, 0xd9, 0xd5, 0x4a, 0xa0,
+	0x34, 0x6b, 0x13, 0x28, 0x4e, 0xa2, 0xbb, 0xbd, 0xf6, 0x8a, 0x23, 0xa2, 0xa2, 0x89, 0x1c, 0xaf,
+	0x49, 0x2c, 0x9c, 0x4c, 0x14, 0x3b, 0x41, 0xdc, 0xaf, 0x80, 0xbf, 0x41, 0xcd, 0x8f, 0x38, 0x51,
+	0x5d, 0x49, 0xc5, 0xc7, 0xee, 0x1f, 0x41, 0xb1, 0xbd, 0xb0, 0x08, 0xe9, 0xaa, 0x24, 0x2f, 0x6f,
+	0x66, 0xde, 0x7b, 0x33, 0x38, 0x91, 0x05, 0xa7, 0xac, 0x6d, 0x95, 0xe4, 0xcc, 0x48, 0x68, 0x34,
+	0x35, 0x1d, 0x6b, 0xf4, 0x5b, 0xd1, 0xd1, 0x21, 0xa5, 0xac, 0x37, 0xd5, 0x15, 0x69, 0x3b, 0x30,
+	0x10, 0x3e, 0x92, 0x05, 0x27, 0x87, 0x4c, 0xb2, 0x67, 0x92, 0x21, 0x3d, 0x39, 0xe6, 0xa0, 0x6b,
+	0xd0, 0xb9, 0xe5, 0x52, 0xf7, 0xe1, 0x0a, 0x4f, 0x1e, 0x94, 0x50, 0x82, 0xc3, 0xc7, 0x37, 0x8f,
+	0xc6, 0x8e, 0x43, 0x0b, 0xa6, 0x05, 0x1d, 0xd2, 0x42, 0x18, 0x96, 0x52, 0x0e, 0xb2, 0x71, 0xff,
+	0x97, 0xbf, 0x10, 0xc6, 0x67, 0x4a, 0x81, 0x1b, 0x16, 0xce, 0x71, 0xa0, 0xa1, 0xef, 0xb8, 0xc8,
+	0x5b, 0xe8, 0x4c, 0x84, 0x16, 0x28, 0x99, 0x65, 0xd8, 0x41, 0x97, 0xd0, 0x99, 0xf0, 0x09, 0xbe,
+	0xef, 0x09, 0xbc, 0x62, 0x4d, 0x23, 0x54, 0x74, 0xc7, 0x72, 0xee, 0x39, 0xf4, 0xdc, 0x81, 0xa1,
+	0xc2, 0x81, 0x6e, 0x45, 0xb3, 0xc9, 0x95, 0xac, 0xa5, 0x89, 0xa6, 0x8b, 0x69, 0x12, 0x3c, 0x3f,
+	0x26, 0x5e, 0xf0, 0x28, 0x86, 0x78, 0x31, 0xe4, 0x1c, 0x64, 0xb3, 0x7e, 0x76, 0xfd, 0x7d, 0x3e,
+	0xf9, 0xfc, 0x63, 0x9e, 0x94, 0xd2, 0x54, 0x7d, 0x41, 0x38, 0xd4, 0xde, 0x9d, 0x7f, 0xac, 0xf4,
+	0xe6, 0x1d, 0x35, 0x1f, 0x5a, 0xa1, 0x6d, 0x81, 0xce, 0xb0, 0xed, 0x7f, 0x31, 0xb6, 0x0f, 0x1f,
+	0x63, 0xcc, 0x94, 0x82, 0xf7, 0xb9, 0x92, 0xda, 0x44, 0x47, 0x8b, 0x69, 0x32, 0xcb, 0x66, 0x16,
+	0xb9, 0x90, 0xda, 0x2c, 0x3f, 0x21, 0xfc, 0xf0, 0xb5, 0x0f, 0xf1, 0xac, 0x37, 0x15, 0x74, 0xf2,
+	0xca, 0xd9, 0xbd, 0xc4, 0x01, 0xfb, 0x63, 0x5e, 0x47, 0xc8, 0xca, 0x4c, 0xc8, 0x6d, 0x2b, 0x20,
+	0x7f, 0xd3, 0x5a, 0x1f, 0x8d, 0xaa, 0xb3, 0xc3, 0x16, 0x2f, 0x9f, 0x7e, 0xfd, 0xb2, 0x5a, 0x7a,
+	0x9b, 0x6e, 0xad, 0x7b, 0x9f, 0xff, 0x4c, 0x5e, 0xbf, 0xba, 0xde, 0xc6, 0xe8, 0x66, 0x1b, 0xa3,
+	0x9f, 0xdb, 0x18, 0x7d, 0xdc, 0xc5, 0x93, 0x9b, 0x5d, 0x3c, 0xf9, 0xb6, 0x8b, 0x27, 0x6f, 0x4e,
+	0xff, 0x8f, 0x40, 0x16, 0x7c, 0x55, 0x02, 0x1d, 0x4e, 0x69, 0x0d, 0x9b, 0x5e, 0x09, 0x3d, 0x9e,
+	0xd2, 0xc1, 0x09, 0xd9, 0x5c, 0x8a, 0xbb, 0x76, 0xa3, 0x2f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff,
+	0x1b, 0xbb, 0x65, 0x15, 0x6c, 0x02, 0x00, 0x00,
 }
 
 func (m *Allocation) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/transfer/types/genesis.pb.go b/modules/apps/transfer/types/genesis.pb.go
index d7cd38dd7a9..f1b7fe6555b 100644
--- a/modules/apps/transfer/types/genesis.pb.go
+++ b/modules/apps/transfer/types/genesis.pb.go
@@ -25,8 +25,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // GenesisState defines the ibc-transfer genesis state
 type GenesisState struct {
-	PortId      string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	DenomTraces Traces `protobuf:"bytes,2,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces" yaml:"denom_traces"`
+	PortId      string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	DenomTraces Traces `protobuf:"bytes,2,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces"`
 	Params      Params `protobuf:"bytes,3,opt,name=params,proto3" json:"params"`
 }
 
@@ -93,28 +93,26 @@ func init() {
 }
 
 var fileDescriptor_a4f788affd5bea89 = []byte{
-	// 324 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30,
-	0x1c, 0xc6, 0x1b, 0x27, 0x15, 0xbb, 0xe1, 0xa1, 0x7a, 0x18, 0x43, 0xda, 0x51, 0x14, 0x8a, 0xc3,
-	0x84, 0xcd, 0xc3, 0xc0, 0x63, 0x11, 0xc4, 0x9b, 0x4e, 0x4f, 0x5e, 0x46, 0x9a, 0xc6, 0x1a, 0x58,
-	0x9b, 0x92, 0x7f, 0x36, 0xd8, 0x5b, 0xf8, 0x1c, 0x3e, 0xc9, 0x8e, 0x3b, 0x7a, 0x9a, 0xb2, 0xbd,
-	0xc1, 0x7c, 0x01, 0x49, 0x37, 0xc7, 0x4e, 0xbd, 0x7d, 0x24, 0xbf, 0xef, 0xfb, 0xfe, 0x7c, 0xce,
-	0x95, 0x88, 0x19, 0xa1, 0x45, 0x31, 0x12, 0x8c, 0x6a, 0x21, 0x73, 0x20, 0x5a, 0xd1, 0x1c, 0xde,
-	0xb8, 0x22, 0x93, 0x2e, 0x49, 0x79, 0xce, 0x41, 0x00, 0x2e, 0x94, 0xd4, 0xd2, 0x3d, 0x17, 0x31,
-	0xc3, 0xfb, 0x2c, 0xfe, 0x67, 0xf1, 0xa4, 0xdb, 0xea, 0x54, 0x26, 0xed, 0xc8, 0x32, 0xaa, 0x75,
-	0x96, 0xca, 0x54, 0x96, 0x92, 0x18, 0xb5, 0x79, 0x0d, 0x7e, 0x91, 0xd3, 0xb8, 0xdf, 0x54, 0x3e,
-	0x6b, 0xaa, 0xb9, 0xdb, 0x71, 0x8e, 0x0a, 0xa9, 0xf4, 0x50, 0x24, 0x4d, 0xd4, 0x46, 0xe1, 0x71,
-	0xe4, 0xae, 0x17, 0xfe, 0xc9, 0x94, 0x66, 0xa3, 0xdb, 0x60, 0xfb, 0x11, 0x0c, 0x6c, 0xa3, 0x1e,
-	0x12, 0x57, 0x39, 0x8d, 0x84, 0xe7, 0x32, 0x1b, 0x6a, 0x45, 0x19, 0x87, 0xe6, 0x41, 0xbb, 0x16,
-	0xd6, 0x7b, 0x21, 0xae, 0xba, 0x1a, 0xdf, 0x19, 0xc7, 0x8b, 0x31, 0x44, 0x97, 0xb3, 0x85, 0x6f,
-	0xad, 0x17, 0xfe, 0xe9, 0x26, 0x7f, 0x3f, 0x2b, 0xf8, 0xfc, 0xf6, 0xed, 0x92, 0x82, 0x41, 0x3d,
-	0xd9, 0x59, 0xc0, 0x8d, 0x1c, 0xbb, 0xa0, 0x8a, 0x66, 0xd0, 0xac, 0xb5, 0x51, 0x58, 0xef, 0x5d,
-	0x54, 0xb7, 0x3d, 0x96, 0x6c, 0x74, 0x68, 0x9a, 0x06, 0x5b, 0x67, 0xf4, 0x34, 0x5b, 0x7a, 0x68,
-	0xbe, 0xf4, 0xd0, 0xcf, 0xd2, 0x43, 0x1f, 0x2b, 0xcf, 0x9a, 0xaf, 0x3c, 0xeb, 0x6b, 0xe5, 0x59,
-	0xaf, 0xfd, 0x54, 0xe8, 0xf7, 0x71, 0x8c, 0x99, 0xcc, 0x08, 0x93, 0x90, 0x49, 0x20, 0x22, 0x66,
-	0xd7, 0xa9, 0x24, 0x93, 0x3e, 0xc9, 0x64, 0x32, 0x1e, 0x71, 0x30, 0x93, 0xef, 0x4d, 0xad, 0xa7,
-	0x05, 0x87, 0xd8, 0x2e, 0xf7, 0xbc, 0xf9, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x4d, 0x22, 0xc9,
-	0xde, 0x01, 0x00, 0x00,
+	// 301 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x2b, 0x31,
+	0x14, 0x86, 0x27, 0xb7, 0x97, 0x11, 0xa7, 0xc5, 0xc5, 0x20, 0x58, 0x8a, 0xa4, 0x45, 0x5c, 0x0c,
+	0x8a, 0x09, 0xad, 0x8b, 0xee, 0x07, 0x41, 0xdc, 0x69, 0x75, 0xa5, 0x8b, 0x92, 0xc9, 0xc4, 0x31,
+	0xd0, 0x99, 0x13, 0x72, 0xd2, 0x82, 0x6f, 0xe1, 0x73, 0xf8, 0x24, 0x5d, 0x76, 0xe9, 0x4a, 0xa5,
+	0x7d, 0x11, 0xc9, 0x54, 0x4b, 0x57, 0xdd, 0x9d, 0x93, 0x7c, 0xff, 0x97, 0xf0, 0x47, 0x67, 0x3a,
+	0x93, 0x5c, 0x18, 0x33, 0xd1, 0x52, 0x38, 0x0d, 0x15, 0x72, 0x67, 0x45, 0x85, 0xcf, 0xca, 0xf2,
+	0x59, 0x9f, 0x17, 0xaa, 0x52, 0xa8, 0x91, 0x19, 0x0b, 0x0e, 0xe2, 0x63, 0x9d, 0x49, 0xb6, 0xcd,
+	0xb2, 0x3f, 0x96, 0xcd, 0xfa, 0x9d, 0xf3, 0x9d, 0xa6, 0x0d, 0x59, 0xab, 0x3a, 0x87, 0x05, 0x14,
+	0x50, 0x8f, 0xdc, 0x4f, 0xeb, 0xd3, 0x93, 0x39, 0x89, 0x5a, 0xd7, 0xeb, 0x27, 0xef, 0x9d, 0x70,
+	0x2a, 0x3e, 0x8a, 0xf6, 0x0c, 0x58, 0x37, 0xd6, 0x79, 0x9b, 0xf4, 0x48, 0xb2, 0x3f, 0x0a, 0xfd,
+	0x7a, 0x93, 0xc7, 0x4f, 0x51, 0x2b, 0x57, 0x15, 0x94, 0x63, 0x67, 0x85, 0x54, 0xd8, 0xfe, 0xd7,
+	0x6b, 0x24, 0xcd, 0x41, 0xc2, 0x76, 0xfd, 0x90, 0x5d, 0xf9, 0xc4, 0x83, 0x0f, 0xa4, 0x07, 0xf3,
+	0xcf, 0x6e, 0xf0, 0xfe, 0xd5, 0x0d, 0xeb, 0x15, 0x47, 0xcd, 0x7c, 0x73, 0x87, 0x71, 0x1a, 0x85,
+	0x46, 0x58, 0x51, 0x62, 0xbb, 0xd1, 0x23, 0x49, 0x73, 0x70, 0xba, 0x5b, 0x7b, 0x5b, 0xb3, 0xe9,
+	0x7f, 0xaf, 0x1c, 0xfd, 0x26, 0xd3, 0xbb, 0xf9, 0x92, 0x92, 0xc5, 0x92, 0x92, 0xef, 0x25, 0x25,
+	0x6f, 0x2b, 0x1a, 0x2c, 0x56, 0x34, 0xf8, 0x58, 0xd1, 0xe0, 0x71, 0x58, 0x68, 0xf7, 0x32, 0xcd,
+	0x98, 0x84, 0x92, 0x4b, 0xc0, 0x12, 0x90, 0xeb, 0x4c, 0x5e, 0x14, 0xc0, 0x67, 0x43, 0x5e, 0x42,
+	0x3e, 0x9d, 0x28, 0xf4, 0x3d, 0x6e, 0xf5, 0xe7, 0x5e, 0x8d, 0xc2, 0x2c, 0xac, 0x4b, 0xba, 0xfc,
+	0x09, 0x00, 0x00, 0xff, 0xff, 0x16, 0x48, 0xb9, 0x00, 0xb3, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/transfer/types/transfer.pb.go b/modules/apps/transfer/types/transfer.pb.go
index 6669bda8872..56811dbc867 100644
--- a/modules/apps/transfer/types/transfer.pb.go
+++ b/modules/apps/transfer/types/transfer.pb.go
@@ -5,7 +5,6 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -87,10 +86,10 @@ func (m *DenomTrace) GetBaseDenom() string {
 type Params struct {
 	// send_enabled enables or disables all cross-chain token transfers from this
 	// chain.
-	SendEnabled bool `protobuf:"varint,1,opt,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty" yaml:"send_enabled"`
+	SendEnabled bool `protobuf:"varint,1,opt,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty"`
 	// receive_enabled enables or disables all cross-chain token transfers to this
 	// chain.
-	ReceiveEnabled bool `protobuf:"varint,2,opt,name=receive_enabled,json=receiveEnabled,proto3" json:"receive_enabled,omitempty" yaml:"receive_enabled"`
+	ReceiveEnabled bool `protobuf:"varint,2,opt,name=receive_enabled,json=receiveEnabled,proto3" json:"receive_enabled,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -150,26 +149,23 @@ func init() {
 }
 
 var fileDescriptor_5041673e96e97901 = []byte{
-	// 300 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xc1, 0x4a, 0x2b, 0x31,
-	0x14, 0x86, 0x9b, 0x72, 0x29, 0xb7, 0x51, 0x14, 0xa2, 0x68, 0x29, 0x9a, 0xca, 0xac, 0x04, 0x71,
-	0x42, 0x71, 0x51, 0xe8, 0x46, 0xa8, 0xba, 0xd7, 0xe2, 0xca, 0x4d, 0x49, 0x32, 0xc7, 0x69, 0x60,
-	0x32, 0x19, 0x92, 0x74, 0xa0, 0x8f, 0xe0, 0xce, 0xc7, 0x72, 0xd9, 0xa5, 0xab, 0x22, 0xed, 0x1b,
-	0xf4, 0x09, 0x64, 0xd2, 0x52, 0x06, 0x77, 0xff, 0x39, 0xe7, 0xfb, 0xce, 0xe2, 0xc7, 0x37, 0x4a,
-	0x48, 0xc6, 0x8b, 0x22, 0x53, 0x92, 0x7b, 0x65, 0x72, 0xc7, 0xbc, 0xe5, 0xb9, 0x7b, 0x07, 0xcb,
-	0xca, 0xfe, 0x3e, 0xc7, 0x85, 0x35, 0xde, 0x90, 0x0b, 0x25, 0x64, 0x5c, 0x87, 0xe3, 0x3d, 0x50,
-	0xf6, 0xbb, 0xa7, 0xa9, 0x49, 0x4d, 0x00, 0x59, 0x95, 0xb6, 0x4e, 0x74, 0x8f, 0xf1, 0x23, 0xe4,
-	0x46, 0xbf, 0x5a, 0x2e, 0x81, 0x10, 0xfc, 0xaf, 0xe0, 0x7e, 0xda, 0x41, 0x57, 0xe8, 0xba, 0x3d,
-	0x0e, 0x99, 0x5c, 0x62, 0x2c, 0xb8, 0x83, 0x49, 0x52, 0x61, 0x9d, 0x66, 0xb8, 0xb4, 0xab, 0x4d,
-	0xf0, 0xa2, 0x0f, 0x84, 0x5b, 0xcf, 0xdc, 0x72, 0xed, 0xc8, 0x10, 0x1f, 0x3a, 0xc8, 0x93, 0x09,
-	0xe4, 0x5c, 0x64, 0x90, 0x84, 0x2f, 0xff, 0x47, 0xe7, 0x9b, 0x65, 0xef, 0x64, 0xce, 0x75, 0x36,
-	0x8c, 0xea, 0xd7, 0x68, 0x7c, 0x50, 0x8d, 0x4f, 0xdb, 0x89, 0x3c, 0xe0, 0x63, 0x0b, 0x12, 0x54,
-	0x09, 0x7b, 0xbd, 0x19, 0xf4, 0xee, 0x66, 0xd9, 0x3b, 0xdb, 0xea, 0x7f, 0x80, 0x68, 0x7c, 0xb4,
-	0xdb, 0xec, 0x9e, 0x8c, 0x5e, 0xbe, 0x56, 0x14, 0x2d, 0x56, 0x14, 0xfd, 0xac, 0x28, 0xfa, 0x5c,
-	0xd3, 0xc6, 0x62, 0x4d, 0x1b, 0xdf, 0x6b, 0xda, 0x78, 0x1b, 0xa4, 0xca, 0x4f, 0x67, 0x22, 0x96,
-	0x46, 0x33, 0x69, 0x9c, 0x36, 0x8e, 0x29, 0x21, 0x6f, 0x53, 0xc3, 0xca, 0x01, 0xd3, 0x26, 0x99,
-	0x65, 0xe0, 0xaa, 0x9e, 0x6b, 0xfd, 0xfa, 0x79, 0x01, 0x4e, 0xb4, 0x42, 0x4d, 0x77, 0xbf, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x11, 0x89, 0xc0, 0xe0, 0x89, 0x01, 0x00, 0x00,
+	// 256 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x3f, 0x4b, 0x03, 0x31,
+	0x18, 0x87, 0x9b, 0x22, 0xc5, 0x46, 0x51, 0xc8, 0xd4, 0x41, 0x83, 0x76, 0x51, 0x10, 0x2f, 0x14,
+	0x87, 0x8e, 0x82, 0xe8, 0xae, 0xa5, 0x93, 0x4b, 0x49, 0x72, 0xaf, 0x6d, 0xe0, 0xf2, 0x87, 0xbc,
+	0xe9, 0x81, 0xdf, 0xc2, 0x8f, 0xe5, 0xd8, 0xd1, 0x51, 0xee, 0xbe, 0x88, 0x5c, 0x2c, 0x47, 0xb7,
+	0x1f, 0x4f, 0x9e, 0xbc, 0xc3, 0x43, 0xef, 0x8c, 0xd2, 0x42, 0x86, 0x50, 0x19, 0x2d, 0x93, 0xf1,
+	0x0e, 0x45, 0x8a, 0xd2, 0xe1, 0x07, 0x44, 0x51, 0xcf, 0xfa, 0x5d, 0x84, 0xe8, 0x93, 0x67, 0x17,
+	0x46, 0xe9, 0xe2, 0x50, 0x2e, 0x7a, 0xa1, 0x9e, 0x4d, 0x1f, 0x29, 0x7d, 0x06, 0xe7, 0xed, 0x32,
+	0x4a, 0x0d, 0x8c, 0xd1, 0xa3, 0x20, 0xd3, 0x66, 0x42, 0xae, 0xc8, 0xed, 0x78, 0x91, 0x37, 0xbb,
+	0xa4, 0x54, 0x49, 0x84, 0x55, 0xd9, 0x69, 0x93, 0x61, 0x7e, 0x19, 0x77, 0x24, 0xff, 0x9b, 0x2e,
+	0xe9, 0xe8, 0x55, 0x46, 0x69, 0x91, 0x5d, 0xd3, 0x53, 0x04, 0x57, 0xae, 0xc0, 0x49, 0x55, 0x41,
+	0x99, 0x8f, 0x1c, 0x2f, 0x4e, 0x3a, 0xf6, 0xf2, 0x8f, 0xd8, 0x0d, 0x3d, 0x8f, 0xa0, 0xc1, 0xd4,
+	0xd0, 0x5b, 0xc3, 0x6c, 0x9d, 0xed, 0xf1, 0x5e, 0x7c, 0x7a, 0xfb, 0x6e, 0x38, 0xd9, 0x35, 0x9c,
+	0xfc, 0x36, 0x9c, 0x7c, 0xb5, 0x7c, 0xb0, 0x6b, 0xf9, 0xe0, 0xa7, 0xe5, 0x83, 0xf7, 0xf9, 0xda,
+	0xa4, 0xcd, 0x56, 0x15, 0xda, 0x5b, 0xa1, 0x3d, 0x5a, 0x8f, 0xc2, 0x28, 0x7d, 0xbf, 0xf6, 0xa2,
+	0x9e, 0x0b, 0xeb, 0xcb, 0x6d, 0x05, 0xd8, 0xb5, 0x39, 0x68, 0x92, 0x3e, 0x03, 0xa0, 0x1a, 0xe5,
+	0x1c, 0x0f, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xfd, 0x75, 0xb7, 0x3d, 0x01, 0x00, 0x00,
 }
 
 func (m *DenomTrace) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go
index 077de524251..73a6a19e1e5 100644
--- a/modules/apps/transfer/types/tx.pb.go
+++ b/modules/apps/transfer/types/tx.pb.go
@@ -35,9 +35,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
 type MsgTransfer struct {
 	// the port on which the packet will be sent
-	SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"`
+	SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"`
 	// the channel by which the packet will be sent
-	SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"`
+	SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"`
 	// the tokens to be transferred
 	Token types.Coin `protobuf:"bytes,3,opt,name=token,proto3" json:"token"`
 	// the sender address
@@ -46,10 +46,10 @@ type MsgTransfer struct {
 	Receiver string `protobuf:"bytes,5,opt,name=receiver,proto3" json:"receiver,omitempty"`
 	// Timeout height relative to the current block height.
 	// The timeout is disabled when set to 0.
-	TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"`
+	TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height"`
 	// Timeout timestamp in absolute nanoseconds since unix epoch.
 	// The timeout is disabled when set to 0.
-	TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"`
+	TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"`
 	// optional memo
 	Memo string `protobuf:"bytes,8,opt,name=memo,proto3" json:"memo,omitempty"`
 }
@@ -143,40 +143,37 @@ func init() {
 }
 
 var fileDescriptor_7401ed9bed2f8e09 = []byte{
-	// 517 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xb6, 0xff, 0xa4, 0xf9, 0xc3, 0x46, 0xad, 0x60, 0x81, 0xca, 0x8d, 0x8a, 0x1d, 0x59, 0x42,
-	0x0a, 0x07, 0x76, 0xe5, 0x22, 0x14, 0xa9, 0x27, 0x94, 0x5e, 0xe0, 0x50, 0x09, 0xac, 0x9e, 0xb8,
-	0x14, 0x7b, 0x3b, 0x38, 0x2b, 0x62, 0x8f, 0xf1, 0x6e, 0x2c, 0xfa, 0x06, 0x1c, 0x79, 0x84, 0x3e,
-	0x09, 0xe7, 0x1e, 0x7b, 0xe4, 0x14, 0xa1, 0xe4, 0xc2, 0x39, 0x4f, 0x80, 0xd6, 0x76, 0x42, 0x72,
-	0x41, 0x9c, 0x3c, 0x33, 0xdf, 0x37, 0xfe, 0xf6, 0xdb, 0x99, 0x25, 0x4f, 0x65, 0x2c, 0x78, 0x94,
-	0xe7, 0x53, 0x29, 0x22, 0x2d, 0x31, 0x53, 0x5c, 0x17, 0x51, 0xa6, 0x3e, 0x42, 0xc1, 0xcb, 0x80,
-	0xeb, 0x2f, 0x2c, 0x2f, 0x50, 0x23, 0x3d, 0x96, 0xb1, 0x60, 0xdb, 0x34, 0xb6, 0xa6, 0xb1, 0x32,
-	0xe8, 0x3f, 0x4a, 0x30, 0xc1, 0x8a, 0xc8, 0x4d, 0x54, 0xf7, 0xf4, 0x5d, 0x81, 0x2a, 0x45, 0xc5,
-	0xe3, 0x48, 0x01, 0x2f, 0x83, 0x18, 0x74, 0x14, 0x70, 0x81, 0x32, 0x6b, 0x70, 0xcf, 0x48, 0x0b,
-	0x2c, 0x80, 0x8b, 0xa9, 0x84, 0x4c, 0x1b, 0xc1, 0x3a, 0xaa, 0x09, 0xfe, 0xf7, 0x16, 0xe9, 0x9d,
-	0xab, 0xe4, 0xa2, 0x51, 0xa2, 0x23, 0xd2, 0x53, 0x38, 0x2b, 0x04, 0x5c, 0xe6, 0x58, 0x68, 0xc7,
-	0x1e, 0xd8, 0xc3, 0x7b, 0xe3, 0xc3, 0xd5, 0xdc, 0xa3, 0xd7, 0x51, 0x3a, 0x3d, 0xf5, 0xb7, 0x40,
-	0x3f, 0x24, 0x75, 0xf6, 0x16, 0x0b, 0x4d, 0x5f, 0x91, 0x83, 0x06, 0x13, 0x93, 0x28, 0xcb, 0x60,
-	0xea, 0xfc, 0x57, 0xf5, 0x1e, 0xad, 0xe6, 0xde, 0xe3, 0x9d, 0xde, 0x06, 0xf7, 0xc3, 0xfd, 0xba,
-	0x70, 0x56, 0xe7, 0xf4, 0x25, 0xd9, 0xd3, 0xf8, 0x09, 0x32, 0xa7, 0x35, 0xb0, 0x87, 0xbd, 0x93,
-	0x23, 0x56, 0x7b, 0x63, 0xc6, 0x1b, 0x6b, 0xbc, 0xb1, 0x33, 0x94, 0xd9, 0xb8, 0x7d, 0x3b, 0xf7,
-	0xac, 0xb0, 0x66, 0xd3, 0x43, 0xd2, 0x51, 0x90, 0x5d, 0x41, 0xe1, 0xb4, 0x8d, 0x60, 0xd8, 0x64,
-	0xb4, 0x4f, 0xba, 0x05, 0x08, 0x90, 0x25, 0x14, 0xce, 0x5e, 0x85, 0x6c, 0x72, 0xfa, 0x81, 0x1c,
-	0x68, 0x99, 0x02, 0xce, 0xf4, 0xe5, 0x04, 0x64, 0x32, 0xd1, 0x4e, 0xa7, 0xd2, 0xec, 0x33, 0x33,
-	0x03, 0x73, 0x5f, 0xac, 0xb9, 0xa5, 0x32, 0x60, 0xaf, 0x2b, 0xc6, 0xf8, 0x89, 0x11, 0xfd, 0x63,
-	0x66, 0xb7, 0xdf, 0x0f, 0xf7, 0x9b, 0x42, 0xcd, 0xa6, 0x6f, 0xc8, 0x83, 0x35, 0xc3, 0x7c, 0x95,
-	0x8e, 0xd2, 0xdc, 0xf9, 0x7f, 0x60, 0x0f, 0xdb, 0xe3, 0xe3, 0xd5, 0xdc, 0x73, 0x76, 0x7f, 0xb2,
-	0xa1, 0xf8, 0xe1, 0xfd, 0xa6, 0x76, 0xb1, 0x2e, 0x51, 0x4a, 0xda, 0x29, 0xa4, 0xe8, 0x74, 0x2b,
-	0x13, 0x55, 0x7c, 0xda, 0xfd, 0x7a, 0xe3, 0x59, 0xbf, 0x6e, 0x3c, 0xcb, 0x0f, 0xc8, 0xc3, 0xad,
-	0xf9, 0x85, 0xa0, 0x72, 0xcc, 0x14, 0x18, 0xf7, 0x0a, 0x3e, 0xcf, 0x20, 0x13, 0x50, 0x0d, 0xb1,
-	0x1d, 0x6e, 0xf2, 0x13, 0x24, 0xad, 0x73, 0x95, 0xd0, 0x09, 0xe9, 0x6e, 0xc6, 0xfe, 0x8c, 0xfd,
-	0x6d, 0xf9, 0xd8, 0x96, 0x42, 0x3f, 0xf8, 0x67, 0xea, 0xfa, 0x30, 0xe3, 0x77, 0xb7, 0x0b, 0xd7,
-	0xbe, 0x5b, 0xb8, 0xf6, 0xcf, 0x85, 0x6b, 0x7f, 0x5b, 0xba, 0xd6, 0xdd, 0xd2, 0xb5, 0x7e, 0x2c,
-	0x5d, 0xeb, 0xfd, 0x28, 0x91, 0x7a, 0x32, 0x8b, 0x99, 0xc0, 0x94, 0x37, 0xab, 0x2c, 0x63, 0xf1,
-	0x3c, 0x41, 0x5e, 0x8e, 0x78, 0x8a, 0x57, 0xb3, 0x29, 0x28, 0xf3, 0x74, 0xb6, 0x9e, 0x8c, 0xbe,
-	0xce, 0x41, 0xc5, 0x9d, 0x6a, 0x7d, 0x5f, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xde, 0x3d, 0xc2,
-	0x16, 0x5c, 0x03, 0x00, 0x00,
+	// 470 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd4, 0x30,
+	0x10, 0x4d, 0xda, 0xed, 0xb2, 0x78, 0xd5, 0x0a, 0x0c, 0x42, 0x61, 0x85, 0xb2, 0xab, 0x4a, 0x95,
+	0x16, 0x21, 0x6c, 0xa5, 0x08, 0x55, 0xe2, 0xd8, 0x1e, 0xe0, 0x52, 0x09, 0xa2, 0x9e, 0xb8, 0x54,
+	0x89, 0x3b, 0x24, 0x16, 0x1b, 0x4f, 0xb0, 0x9d, 0x08, 0xfe, 0x80, 0x23, 0x9f, 0xd0, 0xcf, 0xe9,
+	0xb1, 0x07, 0x0e, 0x9c, 0x10, 0xda, 0xbd, 0xf0, 0x19, 0x28, 0x8e, 0x77, 0xb5, 0x27, 0xd4, 0x53,
+	0x3c, 0x6f, 0x9e, 0xfd, 0xde, 0x4c, 0x1e, 0x39, 0x92, 0xb9, 0xe0, 0x59, 0x5d, 0x2f, 0xa4, 0xc8,
+	0xac, 0x44, 0x65, 0xb8, 0xd5, 0x99, 0x32, 0x9f, 0x40, 0xf3, 0x36, 0xe1, 0xf6, 0x2b, 0xab, 0x35,
+	0x5a, 0xa4, 0xcf, 0x64, 0x2e, 0xd8, 0x36, 0x8d, 0xad, 0x69, 0xac, 0x4d, 0x26, 0x8f, 0x0b, 0x2c,
+	0xd0, 0x11, 0x79, 0x77, 0xea, 0xef, 0x4c, 0x62, 0x81, 0xa6, 0x42, 0xc3, 0xf3, 0xcc, 0x00, 0x6f,
+	0x93, 0x1c, 0x6c, 0x96, 0x70, 0x81, 0x52, 0xf9, 0xfe, 0xb4, 0x93, 0x16, 0xa8, 0x81, 0x8b, 0x85,
+	0x04, 0x65, 0x3b, 0xc1, 0xfe, 0xd4, 0x13, 0x0e, 0x7f, 0xee, 0x90, 0xf1, 0xb9, 0x29, 0x2e, 0xbc,
+	0x12, 0x9d, 0x92, 0xb1, 0xc1, 0x46, 0x0b, 0xb8, 0xac, 0x51, 0xdb, 0x28, 0x9c, 0x85, 0xf3, 0xfb,
+	0x29, 0xe9, 0xa1, 0xf7, 0xa8, 0x2d, 0x3d, 0x22, 0x07, 0x9e, 0x20, 0xca, 0x4c, 0x29, 0x58, 0x44,
+	0x3b, 0x8e, 0xb3, 0xdf, 0xa3, 0x67, 0x3d, 0x48, 0x5f, 0x93, 0x3d, 0x8b, 0x9f, 0x41, 0x45, 0xbb,
+	0xb3, 0x70, 0x3e, 0x3e, 0x7e, 0xca, 0x7a, 0xa3, 0xac, 0x33, 0xca, 0xbc, 0x51, 0x76, 0x86, 0x52,
+	0x9d, 0x0e, 0x6e, 0x7e, 0x4f, 0x83, 0xb4, 0x67, 0xd3, 0x27, 0x64, 0x68, 0x40, 0x5d, 0x81, 0x8e,
+	0x06, 0xee, 0x55, 0x5f, 0xd1, 0x09, 0x19, 0x69, 0x10, 0x20, 0x5b, 0xd0, 0xd1, 0x9e, 0xeb, 0x6c,
+	0x6a, 0xfa, 0x96, 0x1c, 0x58, 0x59, 0x01, 0x36, 0xf6, 0xb2, 0x04, 0x59, 0x94, 0x36, 0x1a, 0x3a,
+	0xcd, 0x09, 0xeb, 0x16, 0xda, 0x0d, 0xcf, 0xfc, 0xc8, 0x6d, 0xc2, 0xde, 0x39, 0x86, 0x17, 0xdd,
+	0xf7, 0xf7, 0x7a, 0x90, 0xbe, 0x20, 0x0f, 0xd7, 0x0f, 0x75, 0x5f, 0x63, 0xb3, 0xaa, 0x8e, 0xee,
+	0xcd, 0xc2, 0xf9, 0x20, 0x7d, 0xe0, 0x1b, 0x17, 0x6b, 0x9c, 0x52, 0x32, 0xa8, 0xa0, 0xc2, 0x68,
+	0xe4, 0xdc, 0xb8, 0xf3, 0x9b, 0xd1, 0xf7, 0xeb, 0x69, 0xf0, 0xf7, 0x7a, 0x1a, 0x1c, 0x26, 0xe4,
+	0xd1, 0xd6, 0x56, 0x53, 0x30, 0x35, 0x2a, 0x03, 0xdd, 0x18, 0x06, 0xbe, 0x34, 0xa0, 0x04, 0xb8,
+	0xd5, 0x0e, 0xd2, 0x4d, 0x7d, 0x8c, 0x64, 0xf7, 0xdc, 0x14, 0xb4, 0x24, 0xa3, 0xcd, 0xcf, 0x78,
+	0xce, 0xfe, 0x17, 0x09, 0xb6, 0xa5, 0x30, 0x49, 0xee, 0x4c, 0x5d, 0x9b, 0x39, 0xfd, 0x70, 0xb3,
+	0x8c, 0xc3, 0xdb, 0x65, 0x1c, 0xfe, 0x59, 0xc6, 0xe1, 0x8f, 0x55, 0x1c, 0xdc, 0xae, 0xe2, 0xe0,
+	0xd7, 0x2a, 0x0e, 0x3e, 0x9e, 0x14, 0xd2, 0x96, 0x4d, 0xce, 0x04, 0x56, 0xdc, 0x07, 0x4c, 0xe6,
+	0xe2, 0x65, 0x81, 0xbc, 0x3d, 0xe1, 0x15, 0x5e, 0x35, 0x0b, 0x30, 0x5d, 0xa0, 0xb7, 0x82, 0x6c,
+	0xbf, 0xd5, 0x60, 0xf2, 0xa1, 0x0b, 0xd5, 0xab, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x30,
+	0xb8, 0x6b, 0xf2, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/core/02-client/migrations/v7/solomachine.pb.go b/modules/core/02-client/migrations/v7/solomachine.pb.go
index c51210cf69d..e579505f3e6 100644
--- a/modules/core/02-client/migrations/v7/solomachine.pb.go
+++ b/modules/core/02-client/migrations/v7/solomachine.pb.go
@@ -93,11 +93,11 @@ type ClientState struct {
 	// latest sequence of the client state
 	Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	// frozen sequence of the solo machine
-	IsFrozen       bool            `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty" yaml:"is_frozen"`
-	ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	IsFrozen       bool            `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty"`
+	ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 	// when set to true, will allow governance to update a solo machine client.
 	// The client will be unfrozen if it is frozen.
-	AllowUpdateAfterProposal bool `protobuf:"varint,4,opt,name=allow_update_after_proposal,json=allowUpdateAfterProposal,proto3" json:"allow_update_after_proposal,omitempty" yaml:"allow_update_after_proposal"`
+	AllowUpdateAfterProposal bool `protobuf:"varint,4,opt,name=allow_update_after_proposal,json=allowUpdateAfterProposal,proto3" json:"allow_update_after_proposal,omitempty"`
 }
 
 func (m *ClientState) Reset()         { *m = ClientState{} }
@@ -138,7 +138,7 @@ var xxx_messageInfo_ClientState proto.InternalMessageInfo
 // consensus state.
 type ConsensusState struct {
 	// public key of the solo machine
-	PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" yaml:"public_key"`
+	PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
 	// diversifier allows the same public key to be re-used across different solo
 	// machine clients (potentially on different chains) without being considered
 	// misbehaviour.
@@ -185,8 +185,8 @@ type Header struct {
 	Sequence       uint64     `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	Timestamp      uint64     `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	Signature      []byte     `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
-	NewPublicKey   *types.Any `protobuf:"bytes,4,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty" yaml:"new_public_key"`
-	NewDiversifier string     `protobuf:"bytes,5,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"`
+	NewPublicKey   *types.Any `protobuf:"bytes,4,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"`
+	NewDiversifier string     `protobuf:"bytes,5,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"`
 }
 
 func (m *Header) Reset()         { *m = Header{} }
@@ -225,10 +225,10 @@ var xxx_messageInfo_Header proto.InternalMessageInfo
 // Misbehaviour defines misbehaviour for a solo machine which consists
 // of a sequence and two signatures over different messages at that sequence.
 type Misbehaviour struct {
-	ClientId     string            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId     string            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	Sequence     uint64            `protobuf:"varint,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
-	SignatureOne *SignatureAndData `protobuf:"bytes,3,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"`
-	SignatureTwo *SignatureAndData `protobuf:"bytes,4,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"`
+	SignatureOne *SignatureAndData `protobuf:"bytes,3,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty"`
+	SignatureTwo *SignatureAndData `protobuf:"bytes,4,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty"`
 }
 
 func (m *Misbehaviour) Reset()         { *m = Misbehaviour{} }
@@ -268,7 +268,7 @@ var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo
 // signature.
 type SignatureAndData struct {
 	Signature []byte   `protobuf:"bytes,1,opt,name=signature,proto3" json:"signature,omitempty"`
-	DataType  DataType `protobuf:"varint,2,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty" yaml:"data_type"`
+	DataType  DataType `protobuf:"varint,2,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty"`
 	Data      []byte   `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
 	Timestamp uint64   `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 }
@@ -309,7 +309,7 @@ var xxx_messageInfo_SignatureAndData proto.InternalMessageInfo
 // TimestampedSignatureData contains the signature data and the timestamp of the
 // signature.
 type TimestampedSignatureData struct {
-	SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty" yaml:"signature_data"`
+	SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty"`
 	Timestamp     uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 }
 
@@ -352,7 +352,7 @@ type SignBytes struct {
 	Timestamp   uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	Diversifier string `protobuf:"bytes,3,opt,name=diversifier,proto3" json:"diversifier,omitempty"`
 	// type of the data used
-	DataType DataType `protobuf:"varint,4,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty" yaml:"data_type"`
+	DataType DataType `protobuf:"varint,4,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty"`
 	// marshaled data
 	Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
 }
@@ -393,9 +393,9 @@ var xxx_messageInfo_SignBytes proto.InternalMessageInfo
 // HeaderData returns the SignBytes data for update verification.
 type HeaderData struct {
 	// header public key
-	NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty" yaml:"new_pub_key"`
+	NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty"`
 	// header diversifier
-	NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"`
+	NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"`
 }
 
 func (m *HeaderData) Reset()         { *m = HeaderData{} }
@@ -434,7 +434,7 @@ var xxx_messageInfo_HeaderData proto.InternalMessageInfo
 // ClientStateData returns the SignBytes data for client state verification.
 type ClientStateData struct {
 	Path        []byte     `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
+	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
 }
 
 func (m *ClientStateData) Reset()         { *m = ClientStateData{} }
@@ -474,7 +474,7 @@ var xxx_messageInfo_ClientStateData proto.InternalMessageInfo
 // verification.
 type ConsensusStateData struct {
 	Path           []byte     `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 }
 
 func (m *ConsensusStateData) Reset()         { *m = ConsensusStateData{} }
@@ -748,7 +748,7 @@ func (m *PacketReceiptAbsenceData) GetPath() []byte {
 // sequence to be received.
 type NextSequenceRecvData struct {
 	Path        []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	NextSeqRecv uint64 `protobuf:"varint,2,opt,name=next_seq_recv,json=nextSeqRecv,proto3" json:"next_seq_recv,omitempty" yaml:"next_seq_recv"`
+	NextSeqRecv uint64 `protobuf:"varint,2,opt,name=next_seq_recv,json=nextSeqRecv,proto3" json:"next_seq_recv,omitempty"`
 }
 
 func (m *NextSequenceRecvData) Reset()         { *m = NextSequenceRecvData{} }
@@ -823,93 +823,85 @@ func init() {
 }
 
 var fileDescriptor_141333b361aae010 = []byte{
-	// 1374 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdf, 0x8e, 0xdb, 0x44,
-	0x17, 0x5f, 0xa7, 0xe9, 0x76, 0x33, 0xd9, 0xee, 0xe6, 0x73, 0xd3, 0x36, 0xeb, 0x56, 0x89, 0x3f,
-	0x23, 0xca, 0x82, 0x68, 0xcc, 0x2e, 0xa2, 0x45, 0x15, 0x82, 0x3a, 0x8e, 0x4b, 0xd3, 0xee, 0x7a,
-	0x83, 0xe3, 0x05, 0x5a, 0x21, 0x59, 0x8e, 0x3d, 0x9b, 0x58, 0x4d, 0x3c, 0x69, 0x3c, 0x49, 0x1a,
-	0x24, 0x24, 0xc4, 0x55, 0x89, 0xb8, 0xe0, 0x05, 0x22, 0x21, 0x10, 0xcf, 0xc1, 0x1d, 0x70, 0xd9,
-	0x4b, 0xae, 0x02, 0x6a, 0xdf, 0x20, 0x4f, 0x80, 0xec, 0x99, 0xc4, 0x76, 0xb6, 0x9b, 0x15, 0xff,
-	0xee, 0x66, 0xce, 0xef, 0x9c, 0xdf, 0x39, 0x73, 0xce, 0xf1, 0x99, 0x31, 0xd8, 0x71, 0xea, 0x96,
-	0xd8, 0x72, 0x1a, 0x4d, 0x6c, 0xb5, 0x1c, 0xe8, 0x62, 0x4f, 0xf4, 0x50, 0x0b, 0xb5, 0x4d, 0xab,
-	0xe9, 0xb8, 0x50, 0xec, 0xef, 0x46, 0xb7, 0xc5, 0x4e, 0x17, 0x61, 0xc4, 0x16, 0x9c, 0xba, 0x55,
-	0x8c, 0x9a, 0x14, 0xa3, 0x3a, 0xfd, 0x5d, 0xee, 0x35, 0x9f, 0xd3, 0x42, 0x5d, 0x28, 0x5a, 0xc8,
-	0x75, 0xa1, 0x85, 0x1d, 0xe4, 0x8a, 0xfd, 0x9d, 0xc8, 0x8e, 0x30, 0x71, 0xff, 0x0f, 0x15, 0x9b,
-	0xa6, 0xeb, 0xc2, 0x56, 0xa0, 0x45, 0x96, 0x54, 0x25, 0xdb, 0x40, 0x0d, 0x14, 0x2c, 0x45, 0x7f,
-	0x45, 0xa5, 0x5b, 0x0d, 0x84, 0x1a, 0x2d, 0x28, 0x06, 0xbb, 0x7a, 0xef, 0x48, 0x34, 0xdd, 0x21,
-	0x81, 0x84, 0x9f, 0x12, 0x20, 0x2d, 0x07, 0x71, 0xd5, 0xb0, 0x89, 0x21, 0xcb, 0x81, 0x35, 0x0f,
-	0x3e, 0xee, 0x41, 0xd7, 0x82, 0x39, 0x86, 0x67, 0xb6, 0x93, 0xda, 0x7c, 0xcf, 0xee, 0x80, 0x94,
-	0xe3, 0x19, 0x47, 0x5d, 0xf4, 0x39, 0x74, 0x73, 0x09, 0x9e, 0xd9, 0x5e, 0x2b, 0x65, 0xa7, 0x93,
-	0x42, 0x66, 0x68, 0xb6, 0x5b, 0xb7, 0x84, 0x39, 0x24, 0x68, 0x6b, 0x8e, 0x77, 0x27, 0x58, 0xb2,
-	0x18, 0x6c, 0x5a, 0xc8, 0xf5, 0xa0, 0xeb, 0xf5, 0x3c, 0xc3, 0xf3, 0x3d, 0xe4, 0xce, 0xf0, 0xcc,
-	0x76, 0x7a, 0x57, 0x2c, 0x9e, 0x92, 0x96, 0xa2, 0x3c, 0xb3, 0x0b, 0x02, 0x2b, 0x71, 0xd3, 0x49,
-	0xe1, 0x12, 0xf1, 0xb4, 0xc0, 0x28, 0x68, 0x1b, 0x56, 0x4c, 0x97, 0x85, 0xe0, 0x8a, 0xd9, 0x6a,
-	0xa1, 0x81, 0xd1, 0xeb, 0xd8, 0x26, 0x86, 0x86, 0x79, 0x84, 0x61, 0xd7, 0xe8, 0x74, 0x51, 0x07,
-	0x79, 0x66, 0x2b, 0x97, 0x0c, 0x42, 0xbf, 0x36, 0x9d, 0x14, 0x04, 0x42, 0xb8, 0x44, 0x59, 0xd0,
-	0x72, 0x01, 0x7a, 0x18, 0x80, 0x92, 0x8f, 0x55, 0x29, 0x74, 0x2b, 0xf9, 0xf4, 0xbb, 0xc2, 0x8a,
-	0xf0, 0x3d, 0x03, 0x36, 0xe2, 0xb1, 0xb2, 0xf7, 0x00, 0xe8, 0xf4, 0xea, 0x2d, 0xc7, 0x32, 0x1e,
-	0xc1, 0x61, 0x90, 0xc6, 0xf4, 0x6e, 0xb6, 0x48, 0x8a, 0x50, 0x9c, 0x15, 0xa1, 0x28, 0xb9, 0xc3,
-	0xd2, 0xc5, 0xe9, 0xa4, 0xf0, 0x3f, 0x12, 0x44, 0x68, 0x21, 0x68, 0x29, 0xb2, 0xb9, 0x0f, 0x87,
-	0x2c, 0x0f, 0xd2, 0xb6, 0xd3, 0x87, 0x5d, 0xcf, 0x39, 0x72, 0x60, 0x37, 0x48, 0x7b, 0x4a, 0x8b,
-	0x8a, 0xd8, 0xab, 0x20, 0x85, 0x9d, 0x36, 0xf4, 0xb0, 0xd9, 0xee, 0x04, 0xd9, 0x4d, 0x6a, 0xa1,
-	0x80, 0x06, 0xf9, 0x55, 0x02, 0xac, 0xde, 0x85, 0xa6, 0x0d, 0xbb, 0x4b, 0x2b, 0x1c, 0xa3, 0x4a,
-	0x2c, 0x50, 0xf9, 0xa8, 0xe7, 0x34, 0x5c, 0x13, 0xf7, 0xba, 0xa4, 0x8c, 0xeb, 0x5a, 0x28, 0x60,
-	0x0f, 0xc1, 0x86, 0x0b, 0x07, 0x46, 0xe4, 0xe0, 0xc9, 0x25, 0x07, 0xdf, 0x9a, 0x4e, 0x0a, 0x17,
-	0xc9, 0xc1, 0xe3, 0x56, 0x82, 0xb6, 0xee, 0xc2, 0x41, 0x75, 0x7e, 0x7e, 0x19, 0x6c, 0xfa, 0x0a,
-	0xd1, 0x1c, 0x9c, 0xf5, 0x73, 0x10, 0x6d, 0x88, 0x05, 0x05, 0x41, 0xf3, 0x23, 0x29, 0x87, 0x02,
-	0x9a, 0x84, 0x5f, 0x12, 0x60, 0x7d, 0xdf, 0xf1, 0xea, 0xb0, 0x69, 0xf6, 0x1d, 0xd4, 0xeb, 0xfa,
-	0x0d, 0x4d, 0x9a, 0xcf, 0x70, 0xec, 0x20, 0x17, 0xa9, 0x68, 0x43, 0xcf, 0x21, 0x41, 0x5b, 0x23,
-	0xeb, 0x8a, 0x1d, 0xcb, 0x5e, 0x62, 0x21, 0x7b, 0x1d, 0x70, 0x7e, 0x9e, 0x0e, 0x03, 0xb9, 0xb3,
-	0x56, 0xdf, 0x39, 0xb5, 0xd5, 0x6b, 0x33, 0x2b, 0xc9, 0xb5, 0xcb, 0x26, 0x36, 0x4b, 0xb9, 0xe9,
-	0xa4, 0x90, 0x25, 0x51, 0xc4, 0x18, 0x05, 0x6d, 0x7d, 0xbe, 0x3f, 0x70, 0x17, 0x3c, 0xe2, 0x01,
-	0xa2, 0x29, 0xff, 0xb7, 0x3c, 0xe2, 0x01, 0x8a, 0x7a, 0xd4, 0x07, 0x88, 0x66, 0xf2, 0x67, 0x06,
-	0x64, 0x16, 0x29, 0xe2, 0xed, 0xc1, 0x2c, 0xb6, 0xc7, 0x67, 0x20, 0x65, 0x9b, 0xd8, 0x34, 0xf0,
-	0xb0, 0x43, 0x32, 0xb7, 0xb1, 0xfb, 0xfa, 0xa9, 0x61, 0xfa, 0xbc, 0xfa, 0xb0, 0x03, 0xa3, 0x65,
-	0x99, 0xb3, 0x08, 0xda, 0x9a, 0x4d, 0x71, 0x96, 0x05, 0x49, 0x7f, 0x4d, 0xbb, 0x32, 0x58, 0xc7,
-	0x9b, 0x39, 0xf9, 0xf2, 0xef, 0xe2, 0x4b, 0x06, 0xe4, 0xf4, 0x99, 0x0c, 0xda, 0xf3, 0x33, 0x05,
-	0x07, 0xba, 0x0d, 0x36, 0xc2, 0x5c, 0x04, 0xf4, 0xc1, 0xa9, 0xa2, 0xbd, 0x1b, 0xc7, 0x05, 0x2d,
-	0x2c, 0x47, 0xf9, 0x58, 0x08, 0x89, 0x97, 0x87, 0xf0, 0x3b, 0x03, 0x52, 0xbe, 0xdf, 0xd2, 0x10,
-	0x43, 0xef, 0x1f, 0x7c, 0x9d, 0x0b, 0x83, 0xe2, 0xcc, 0xf1, 0x41, 0x11, 0x2b, 0x41, 0xf2, 0xbf,
-	0x2a, 0xc1, 0xd9, 0xb0, 0x04, 0xf4, 0x84, 0x3f, 0x32, 0x00, 0x90, 0xe1, 0x13, 0x24, 0x65, 0x0f,
-	0xa4, 0xe9, 0x27, 0x7f, 0xea, 0x78, 0xbc, 0x34, 0x9d, 0x14, 0xd8, 0xd8, 0x94, 0xa0, 0xf3, 0x91,
-	0x8c, 0x88, 0x13, 0xe6, 0x43, 0xe2, 0x6f, 0xce, 0x87, 0x2f, 0xc0, 0x66, 0xe4, 0x2a, 0x0c, 0x62,
-	0x65, 0x41, 0xb2, 0x63, 0xe2, 0x26, 0x6d, 0xe7, 0x60, 0xcd, 0x56, 0xc1, 0x3a, 0x1d, 0x0d, 0xe4,
-	0x42, 0x4b, 0x2c, 0x39, 0xc0, 0xe5, 0xe9, 0xa4, 0x70, 0x21, 0x36, 0x4e, 0xe8, 0x95, 0x95, 0xb6,
-	0x42, 0x4f, 0xd4, 0xfd, 0xd7, 0x0c, 0x60, 0xe3, 0x17, 0xc9, 0x89, 0x21, 0x3c, 0x38, 0x7e, 0xad,
-	0x2e, 0x8b, 0xe2, 0x2f, 0xdc, 0x9d, 0x34, 0x96, 0x3e, 0xb8, 0x20, 0xcf, 0x9f, 0x1f, 0xcb, 0x63,
-	0x51, 0x00, 0x08, 0x5f, 0x2a, 0x34, 0x8c, 0x57, 0x83, 0xb6, 0xf2, 0x9f, 0x2a, 0xc5, 0xc8, 0x2b,
-	0xa6, 0xbf, 0x53, 0x0c, 0x49, 0x15, 0xd7, 0xd6, 0x22, 0x86, 0xd4, 0xaf, 0x0d, 0x32, 0x32, 0x79,
-	0xd0, 0x2c, 0x77, 0x7a, 0x03, 0x9c, 0xa3, 0x0f, 0x1f, 0xea, 0xf1, 0x6a, 0xc4, 0x23, 0x7d, 0x11,
-	0xf9, 0xee, 0xc8, 0x52, 0x9b, 0x29, 0x53, 0x2f, 0xf7, 0x40, 0xb6, 0x6a, 0x5a, 0x8f, 0x20, 0x96,
-	0x51, 0xbb, 0xed, 0xe0, 0x36, 0x74, 0xf1, 0x89, 0x9e, 0xf2, 0xfe, 0xf1, 0x66, 0x5a, 0x81, 0xb3,
-	0x75, 0x2d, 0x22, 0x11, 0x1e, 0x80, 0x2d, 0xc2, 0x25, 0x59, 0x8f, 0x5c, 0x34, 0x68, 0x41, 0xbb,
-	0x01, 0x97, 0x12, 0x6e, 0x83, 0x4d, 0x33, 0xae, 0x4a, 0x59, 0x17, 0xc5, 0x42, 0x11, 0xe4, 0x08,
-	0xb5, 0x06, 0x2d, 0xe8, 0x74, 0xb0, 0x54, 0xf7, 0xfc, 0x39, 0x70, 0x12, 0xb3, 0xd0, 0x04, 0x59,
-	0x15, 0x3e, 0xc1, 0x35, 0x3a, 0x2f, 0x34, 0x68, 0xf5, 0x4f, 0x8c, 0xe2, 0x3d, 0x70, 0xde, 0x85,
-	0x4f, 0xb0, 0xe1, 0xc1, 0xc7, 0x46, 0x17, 0x5a, 0x7d, 0x32, 0x4f, 0xa2, 0xd7, 0x40, 0x0c, 0x16,
-	0xb4, 0xb4, 0x4b, 0xa8, 0x7d, 0xd6, 0x37, 0xbe, 0x49, 0x82, 0xb5, 0xd9, 0x60, 0x60, 0xdf, 0x05,
-	0xaf, 0x94, 0x25, 0x5d, 0x32, 0xf4, 0x07, 0x55, 0xc5, 0x38, 0x54, 0x2b, 0x6a, 0x45, 0xaf, 0x48,
-	0x7b, 0x95, 0x87, 0x4a, 0xd9, 0x38, 0x54, 0x6b, 0x55, 0x45, 0xae, 0xdc, 0xa9, 0x28, 0xe5, 0xcc,
-	0x0a, 0xb7, 0x39, 0x1a, 0xf3, 0xe9, 0x88, 0x88, 0xbd, 0x06, 0x2e, 0x85, 0x96, 0xf2, 0x5e, 0x45,
-	0x51, 0x75, 0xa3, 0xa6, 0x4b, 0xba, 0x92, 0x61, 0x38, 0x30, 0x1a, 0xf3, 0xab, 0x44, 0xc6, 0xbe,
-	0x09, 0xb6, 0x22, 0x7a, 0x07, 0x6a, 0x4d, 0x51, 0x6b, 0x87, 0x35, 0xaa, 0x9a, 0xe0, 0xce, 0x8f,
-	0xc6, 0x7c, 0x6a, 0x2e, 0x66, 0x8b, 0x80, 0x8b, 0x69, 0xab, 0x8a, 0xac, 0x57, 0x0e, 0x54, 0xaa,
-	0x7e, 0x86, 0xdb, 0x18, 0x8d, 0x79, 0x10, 0xca, 0xd9, 0x6d, 0x70, 0x39, 0xa2, 0x7f, 0x57, 0x52,
-	0x55, 0x65, 0x8f, 0x2a, 0x27, 0xb9, 0xf4, 0x68, 0xcc, 0x9f, 0xa3, 0x42, 0xf6, 0x1d, 0x70, 0x25,
-	0xd4, 0xac, 0x4a, 0xf2, 0x7d, 0x45, 0x37, 0xe4, 0x83, 0xfd, 0xfd, 0x8a, 0xbe, 0xaf, 0xa8, 0x7a,
-	0xe6, 0x2c, 0x97, 0x1d, 0x8d, 0xf9, 0x0c, 0x01, 0x42, 0x39, 0xfb, 0x01, 0xe0, 0x8f, 0x99, 0x49,
-	0xf2, 0x7d, 0xf5, 0xe0, 0x93, 0x3d, 0xa5, 0xfc, 0xa1, 0x12, 0xd8, 0xae, 0x72, 0x5b, 0xa3, 0x31,
-	0x7f, 0x91, 0xa0, 0x0b, 0x20, 0xfb, 0xfe, 0x4b, 0x08, 0x34, 0x45, 0x56, 0x2a, 0x55, 0xdd, 0x90,
-	0x4a, 0x35, 0x45, 0x95, 0x95, 0xcc, 0x39, 0x2e, 0x37, 0x1a, 0xf3, 0x59, 0x82, 0x52, 0x90, 0x62,
-	0xec, 0x0d, 0x70, 0x35, 0xb4, 0x57, 0x95, 0x4f, 0x75, 0xa3, 0xa6, 0x7c, 0x74, 0xe8, 0x43, 0x3e,
-	0xcd, 0xc7, 0x99, 0x35, 0x12, 0xb8, 0x8f, 0xcc, 0x00, 0x5f, 0xce, 0xf2, 0x20, 0x13, 0xda, 0xdd,
-	0x55, 0xa4, 0xb2, 0xa2, 0x65, 0x52, 0xa4, 0x32, 0x64, 0xc7, 0x25, 0x9f, 0xfe, 0x90, 0x5f, 0x29,
-	0x3d, 0xfc, 0xf5, 0x79, 0x9e, 0x79, 0xf6, 0x3c, 0xcf, 0xfc, 0xf1, 0x3c, 0xcf, 0x7c, 0xfb, 0x22,
-	0xbf, 0xf2, 0xec, 0x45, 0x7e, 0xe5, 0xb7, 0x17, 0xf9, 0x95, 0x87, 0xb7, 0x1b, 0x0e, 0x6e, 0xf6,
-	0xea, 0x45, 0x0b, 0xb5, 0x45, 0x0b, 0x79, 0x6d, 0xe4, 0x89, 0x4e, 0xdd, 0xba, 0xde, 0x40, 0x62,
-	0xff, 0xa6, 0xd8, 0x46, 0x76, 0xaf, 0x05, 0x3d, 0xf2, 0x4b, 0xf3, 0xd6, 0xee, 0x75, 0x32, 0x12,
-	0xc5, 0xb6, 0xd3, 0xe8, 0x9a, 0xfe, 0x4c, 0xf0, 0xc4, 0xfe, 0xcd, 0xfa, 0x6a, 0x30, 0xc9, 0xde,
-	0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x8d, 0x81, 0x56, 0x7a, 0x0d, 0x00, 0x00,
+	// 1237 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x6f, 0xdb, 0x54,
+	0x14, 0xae, 0xb3, 0xac, 0x4b, 0x4e, 0xba, 0x36, 0x32, 0x05, 0x52, 0x6f, 0xca, 0x4c, 0xd1, 0x58,
+	0x41, 0xcc, 0xa6, 0x1d, 0x6c, 0x68, 0xd2, 0x00, 0xcf, 0xf1, 0x58, 0x58, 0xeb, 0x06, 0xc7, 0x1d,
+	0xdb, 0x5e, 0x2c, 0xc7, 0xbe, 0x4d, 0xad, 0x25, 0xbe, 0x99, 0x7d, 0x93, 0x2e, 0xfc, 0x82, 0x29,
+	0xf0, 0xc0, 0x1f, 0x88, 0x84, 0xc4, 0x1f, 0xe0, 0x67, 0x80, 0x78, 0xd9, 0x23, 0x8f, 0x68, 0x13,
+	0x3f, 0x03, 0x09, 0xf9, 0xde, 0x9b, 0xd8, 0x49, 0xd7, 0xf4, 0x61, 0x6f, 0xf7, 0x9e, 0xf3, 0x9d,
+	0xef, 0x3b, 0xe7, 0x5c, 0x9f, 0x7b, 0x0d, 0xdb, 0x41, 0xcb, 0x53, 0x3b, 0x41, 0xfb, 0x88, 0x78,
+	0x9d, 0x00, 0x85, 0x24, 0x56, 0x63, 0xdc, 0xc1, 0x5d, 0xd7, 0x3b, 0x0a, 0x42, 0xa4, 0x0e, 0x76,
+	0xb2, 0x5b, 0xa5, 0x17, 0x61, 0x82, 0xc5, 0x2b, 0x41, 0xcb, 0x53, 0xb2, 0x21, 0x4a, 0x16, 0x33,
+	0xd8, 0x91, 0xae, 0x25, 0x9c, 0x1e, 0x8e, 0x90, 0xea, 0xe1, 0x30, 0x44, 0x1e, 0x09, 0x70, 0xa8,
+	0x0e, 0xb6, 0x33, 0x3b, 0xc6, 0x24, 0x7d, 0x90, 0x02, 0x8f, 0xdc, 0x30, 0x44, 0x1d, 0x8a, 0x62,
+	0x4b, 0x0e, 0x59, 0x6f, 0xe3, 0x36, 0xa6, 0x4b, 0x35, 0x59, 0x71, 0xeb, 0x46, 0x1b, 0xe3, 0x76,
+	0x07, 0xa9, 0x74, 0xd7, 0xea, 0x1f, 0xaa, 0x6e, 0x38, 0x64, 0xae, 0xcd, 0x7f, 0x05, 0x28, 0xe9,
+	0x34, 0xaf, 0x26, 0x71, 0x09, 0x12, 0x25, 0x28, 0xc4, 0xe8, 0x59, 0x1f, 0x85, 0x1e, 0xaa, 0x08,
+	0xb2, 0xb0, 0x95, 0xb7, 0xa6, 0x7b, 0xf1, 0x12, 0x14, 0x83, 0xd8, 0x39, 0x8c, 0xf0, 0x8f, 0x28,
+	0xac, 0xe4, 0x64, 0x61, 0xab, 0x60, 0x15, 0x82, 0xf8, 0x1e, 0xdd, 0x8b, 0x8f, 0x60, 0xcd, 0xc3,
+	0x61, 0x8c, 0xc2, 0xb8, 0x1f, 0x3b, 0x71, 0xc2, 0x55, 0x39, 0x27, 0x0b, 0x5b, 0xa5, 0x1d, 0x55,
+	0x39, 0xa3, 0x01, 0x8a, 0x3e, 0x89, 0xa3, 0x29, 0x58, 0xab, 0xde, 0xcc, 0x5e, 0xbc, 0x03, 0x97,
+	0xdc, 0x4e, 0x07, 0x1f, 0x3b, 0xfd, 0x9e, 0xef, 0x12, 0xe4, 0xb8, 0x87, 0x04, 0x45, 0x4e, 0x2f,
+	0xc2, 0x3d, 0x1c, 0xbb, 0x9d, 0x4a, 0x9e, 0x26, 0x52, 0xa1, 0x90, 0x03, 0x8a, 0xd0, 0x12, 0x40,
+	0x83, 0xfb, 0x6f, 0xe7, 0x5f, 0xfc, 0x7a, 0x65, 0x69, 0xf3, 0x27, 0x01, 0x56, 0x67, 0x75, 0xc4,
+	0x1b, 0x00, 0xbd, 0x7e, 0xab, 0x13, 0x78, 0xce, 0x53, 0x34, 0xa4, 0xc5, 0x96, 0x76, 0xd6, 0x15,
+	0xd6, 0x2a, 0x65, 0xd2, 0x2a, 0x45, 0x0b, 0x87, 0x56, 0x91, 0xe1, 0x1e, 0xa0, 0xa1, 0x28, 0x43,
+	0xc9, 0x0f, 0x06, 0x28, 0x8a, 0x83, 0xc3, 0x00, 0x45, 0xb4, 0x0b, 0x45, 0x2b, 0x6b, 0x12, 0x2f,
+	0x43, 0x91, 0x04, 0x5d, 0x14, 0x13, 0xb7, 0xdb, 0xa3, 0x2d, 0xc8, 0x5b, 0xa9, 0x81, 0x67, 0xf3,
+	0x97, 0x00, 0xcb, 0xf7, 0x91, 0xeb, 0xa3, 0x68, 0x61, 0xc3, 0x67, 0xa8, 0x72, 0x73, 0x54, 0x89,
+	0x37, 0x0e, 0xda, 0xa1, 0x4b, 0xfa, 0x11, 0xeb, 0xf5, 0x8a, 0x95, 0x1a, 0xc4, 0xdb, 0xb0, 0x1a,
+	0xa2, 0x63, 0x27, 0x53, 0x61, 0x7e, 0x41, 0x85, 0x2b, 0x21, 0x3a, 0x6e, 0x4c, 0x8b, 0xbc, 0x06,
+	0x6b, 0x49, 0x6c, 0xb6, 0xd0, 0xf3, 0xb4, 0xd0, 0x84, 0xb2, 0x96, 0x5a, 0x79, 0x35, 0xff, 0x09,
+	0xb0, 0xb2, 0x17, 0xc4, 0x2d, 0x74, 0xe4, 0x0e, 0x02, 0xdc, 0x8f, 0x92, 0x0f, 0x85, 0x1d, 0xb5,
+	0x13, 0xf8, 0xb4, 0xa8, 0xa2, 0x55, 0x60, 0x86, 0xba, 0x3f, 0x53, 0x70, 0x6e, 0xae, 0xe0, 0x87,
+	0x70, 0x71, 0x5a, 0x81, 0x83, 0xc3, 0xc9, 0x27, 0xb4, 0x7d, 0xe6, 0x27, 0xd4, 0x9c, 0x44, 0x69,
+	0xa1, 0x5f, 0x73, 0x89, 0x6b, 0xad, 0x4c, 0x79, 0xf6, 0xc3, 0x39, 0x5e, 0x72, 0x8c, 0x79, 0x2f,
+	0xde, 0x8a, 0xd7, 0x3e, 0xc6, 0xbc, 0xfe, 0xdf, 0x05, 0x28, 0xcf, 0x03, 0x67, 0x4f, 0x47, 0x98,
+	0x3f, 0x9d, 0x7b, 0x50, 0xf4, 0x5d, 0xe2, 0x3a, 0x64, 0xd8, 0x63, 0x5d, 0x58, 0xdd, 0xf9, 0xf8,
+	0xcc, 0x64, 0x12, 0x5e, 0x7b, 0xd8, 0x43, 0x56, 0xc1, 0xe7, 0x2b, 0x51, 0x84, 0x7c, 0xb2, 0xe6,
+	0xc7, 0x4f, 0xd7, 0xb3, 0x5f, 0x4d, 0xfe, 0xcd, 0x1f, 0x20, 0x82, 0x8a, 0x3d, 0x31, 0x21, 0x7f,
+	0x9a, 0x3c, 0xcd, 0xfc, 0x2a, 0xac, 0xa6, 0xcd, 0xa2, 0xec, 0x2c, 0xfd, 0xb4, 0x85, 0xb5, 0x13,
+	0x32, 0xb9, 0x37, 0xcb, 0xfc, 0x29, 0x40, 0x31, 0x21, 0xbf, 0x3b, 0x24, 0x28, 0x7e, 0x8b, 0x4f,
+	0x7d, 0x6e, 0xea, 0xce, 0x9d, 0x9c, 0xba, 0x99, 0x86, 0xe6, 0xdf, 0xbe, 0xa1, 0xe7, 0xd3, 0x86,
+	0xf2, 0x5a, 0x9e, 0x01, 0xb0, 0x91, 0xa5, 0xd5, 0x7f, 0x0e, 0x25, 0x3e, 0x5e, 0x67, 0xdf, 0x1e,
+	0x6c, 0xb6, 0x4e, 0x19, 0xac, 0xdc, 0x82, 0xc1, 0xf2, 0x61, 0x2d, 0x73, 0x37, 0x53, 0x5d, 0x11,
+	0xf2, 0x3d, 0x97, 0x1c, 0xf1, 0x23, 0xa1, 0x6b, 0xf1, 0x16, 0xac, 0xf0, 0x71, 0x63, 0xf7, 0x6e,
+	0x6e, 0x41, 0x32, 0x25, 0x2f, 0x25, 0xe4, 0x2a, 0x5d, 0x10, 0x67, 0x6f, 0xc6, 0x53, 0x85, 0xee,
+	0x9c, 0xbc, 0xe3, 0x17, 0x69, 0xcd, 0x5d, 0xe4, 0x5c, 0x6e, 0x00, 0xef, 0xe8, 0xd3, 0x97, 0x6d,
+	0xb1, 0x9e, 0x01, 0x90, 0x3e, 0x82, 0x5c, 0xea, 0x2a, 0x3d, 0xd5, 0xe4, 0x15, 0x54, 0x32, 0x0f,
+	0xe4, 0x60, 0x5b, 0x49, 0x49, 0x8d, 0xd0, 0xb7, 0x32, 0x81, 0xd3, 0x66, 0x96, 0x75, 0xf6, 0x56,
+	0x2e, 0x16, 0xbd, 0x09, 0x17, 0xf8, 0x9b, 0xca, 0x15, 0x2f, 0x67, 0x14, 0xf9, 0x63, 0x9b, 0xc8,
+	0xb1, 0xa5, 0x35, 0x01, 0x73, 0x95, 0xef, 0x60, 0xbd, 0xe1, 0x7a, 0x4f, 0x11, 0xd1, 0x71, 0xb7,
+	0x1b, 0x90, 0x2e, 0x0a, 0xc9, 0xa9, 0x4a, 0xd5, 0xa4, 0xbc, 0x09, 0x8a, 0x8a, 0xad, 0x58, 0x19,
+	0xcb, 0xe6, 0x63, 0xd8, 0x60, 0x5c, 0x9a, 0xf7, 0x34, 0xc4, 0xc7, 0x1d, 0xe4, 0xb7, 0xd1, 0x42,
+	0xc2, 0x2d, 0x58, 0x73, 0x67, 0xa1, 0x9c, 0x75, 0xde, 0xbc, 0xa9, 0x40, 0x85, 0x51, 0x5b, 0xc8,
+	0x43, 0x41, 0x8f, 0x68, 0xad, 0x38, 0x19, 0xc3, 0xd3, 0x98, 0x37, 0x4d, 0x58, 0x37, 0xd1, 0x73,
+	0xd2, 0xe4, 0xe3, 0x6a, 0x21, 0x6f, 0x70, 0x6a, 0x16, 0x9b, 0x70, 0x31, 0x44, 0xcf, 0x89, 0x13,
+	0xa3, 0x67, 0x4e, 0x84, 0xbc, 0x01, 0x1f, 0xe7, 0x52, 0xc8, 0x08, 0x92, 0xd8, 0x4f, 0x7e, 0xce,
+	0x43, 0x61, 0x32, 0x7d, 0xe2, 0x97, 0xf0, 0x61, 0x4d, 0xb3, 0x35, 0xc7, 0x7e, 0xdc, 0x30, 0x9c,
+	0x03, 0xb3, 0x6e, 0xd6, 0xed, 0xba, 0xb6, 0x5b, 0x7f, 0x62, 0xd4, 0x9c, 0x03, 0xb3, 0xd9, 0x30,
+	0xf4, 0xfa, 0xbd, 0xba, 0x51, 0x2b, 0x2f, 0x49, 0x6b, 0xa3, 0xb1, 0x5c, 0xca, 0x98, 0xc4, 0x8f,
+	0xe0, 0xbd, 0x34, 0x52, 0xdf, 0xad, 0x1b, 0xa6, 0xed, 0x34, 0x6d, 0xcd, 0x36, 0xca, 0x82, 0x04,
+	0xa3, 0xb1, 0xbc, 0xcc, 0x6c, 0xe2, 0xa7, 0xb0, 0x91, 0xc1, 0xed, 0x9b, 0x4d, 0xc3, 0x6c, 0x1e,
+	0x34, 0x39, 0x34, 0x27, 0x5d, 0x1c, 0x8d, 0xe5, 0xe2, 0xd4, 0x2c, 0x2a, 0x20, 0xcd, 0xa0, 0x4d,
+	0x43, 0xb7, 0xeb, 0xfb, 0x26, 0x87, 0x9f, 0x93, 0x56, 0x47, 0x63, 0x19, 0x52, 0xbb, 0xb8, 0x05,
+	0xef, 0x67, 0xf0, 0xf7, 0x35, 0xd3, 0x34, 0x76, 0x39, 0x38, 0x2f, 0x95, 0x46, 0x63, 0xf9, 0x02,
+	0x37, 0x8a, 0x5f, 0xc0, 0xa5, 0x14, 0xd9, 0xd0, 0xf4, 0x07, 0x86, 0xed, 0xe8, 0xfb, 0x7b, 0x7b,
+	0x75, 0x7b, 0xcf, 0x30, 0xed, 0xf2, 0x79, 0x69, 0x7d, 0x34, 0x96, 0xcb, 0xcc, 0x91, 0xda, 0xc5,
+	0xaf, 0x41, 0x3e, 0x11, 0xa6, 0xe9, 0x0f, 0xcc, 0xfd, 0x1f, 0x76, 0x8d, 0xda, 0xb7, 0x06, 0x8d,
+	0x5d, 0x96, 0x36, 0x46, 0x63, 0xf9, 0x5d, 0xe6, 0x9d, 0x73, 0x8a, 0x5f, 0xbd, 0x81, 0xc0, 0x32,
+	0x74, 0xa3, 0xde, 0xb0, 0x1d, 0xed, 0x6e, 0xd3, 0x30, 0x75, 0xa3, 0x7c, 0x41, 0xaa, 0x8c, 0xc6,
+	0xf2, 0x3a, 0xf3, 0x72, 0x27, 0xf7, 0x89, 0x37, 0xe1, 0x72, 0x1a, 0x6f, 0x1a, 0x8f, 0x6c, 0xa7,
+	0x69, 0x7c, 0x7f, 0x90, 0xb8, 0x12, 0x9a, 0x87, 0xe5, 0x02, 0x4b, 0x3c, 0xf1, 0x4c, 0x1c, 0x89,
+	0x5d, 0x94, 0xa1, 0x9c, 0xc6, 0xdd, 0x37, 0xb4, 0x9a, 0x61, 0x95, 0x8b, 0xec, 0x64, 0xd8, 0x4e,
+	0xca, 0xbf, 0xf8, 0xad, 0xba, 0x74, 0xf7, 0xc9, 0x1f, 0xaf, 0xaa, 0xc2, 0xcb, 0x57, 0x55, 0xe1,
+	0x9f, 0x57, 0x55, 0xe1, 0x97, 0xd7, 0xd5, 0xa5, 0x97, 0xaf, 0xab, 0x4b, 0x7f, 0xbf, 0xae, 0x2e,
+	0x3d, 0xf9, 0xa6, 0x1d, 0x90, 0xa3, 0x7e, 0x4b, 0xf1, 0x70, 0x57, 0xf5, 0x70, 0xdc, 0xc5, 0xb1,
+	0x1a, 0xb4, 0xbc, 0xeb, 0x6d, 0xac, 0x0e, 0x6e, 0xa9, 0x5d, 0xec, 0xf7, 0x3b, 0x28, 0x66, 0xff,
+	0xc4, 0x9f, 0xed, 0x5c, 0x67, 0x77, 0x9b, 0xda, 0x0d, 0xda, 0x91, 0x9b, 0x4c, 0x7e, 0xac, 0x0e,
+	0x6e, 0xb5, 0x96, 0xe9, 0x9d, 0x74, 0xe3, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x4f, 0xdc,
+	0xef, 0xbb, 0x0b, 0x00, 0x00,
 }
 
 func (m *ClientState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/02-client/types/client.pb.go b/modules/core/02-client/types/client.pb.go
index badaa482f47..d65d15ccb43 100644
--- a/modules/core/02-client/types/client.pb.go
+++ b/modules/core/02-client/types/client.pb.go
@@ -30,9 +30,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // identifier field.
 type IdentifiedClientState struct {
 	// client identifier
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// client state
-	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
+	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
 }
 
 func (m *IdentifiedClientState) Reset()         { *m = IdentifiedClientState{} }
@@ -88,7 +88,7 @@ type ConsensusStateWithHeight struct {
 	// consensus state height
 	Height Height `protobuf:"bytes,1,opt,name=height,proto3" json:"height"`
 	// consensus state
-	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 }
 
 func (m *ConsensusStateWithHeight) Reset()         { *m = ConsensusStateWithHeight{} }
@@ -142,9 +142,9 @@ func (m *ConsensusStateWithHeight) GetConsensusState() *types.Any {
 // client.
 type ClientConsensusStates struct {
 	// client identifier
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// consensus states and their heights associated with the client
-	ConsensusStates []ConsensusStateWithHeight `protobuf:"bytes,2,rep,name=consensus_states,json=consensusStates,proto3" json:"consensus_states" yaml:"consensus_states"`
+	ConsensusStates []ConsensusStateWithHeight `protobuf:"bytes,2,rep,name=consensus_states,json=consensusStates,proto3" json:"consensus_states"`
 }
 
 func (m *ClientConsensusStates) Reset()         { *m = ClientConsensusStates{} }
@@ -204,10 +204,10 @@ type ClientUpdateProposal struct {
 	// the description of the proposal
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// the client identifier for the client to be updated if the proposal passes
-	SubjectClientId string `protobuf:"bytes,3,opt,name=subject_client_id,json=subjectClientId,proto3" json:"subject_client_id,omitempty" yaml:"subject_client_id"`
+	SubjectClientId string `protobuf:"bytes,3,opt,name=subject_client_id,json=subjectClientId,proto3" json:"subject_client_id,omitempty"`
 	// the substitute client identifier for the client standing in for the subject
 	// client
-	SubstituteClientId string `protobuf:"bytes,4,opt,name=substitute_client_id,json=substituteClientId,proto3" json:"substitute_client_id,omitempty" yaml:"substitute_client_id"`
+	SubstituteClientId string `protobuf:"bytes,4,opt,name=substitute_client_id,json=substituteClientId,proto3" json:"substitute_client_id,omitempty"`
 }
 
 func (m *ClientUpdateProposal) Reset()         { *m = ClientUpdateProposal{} }
@@ -255,7 +255,7 @@ type UpgradeProposal struct {
 	// new upgraded client is valid by verifying a proof on the previous version
 	// of the chain. This will allow IBC connections to persist smoothly across
 	// planned chain upgrades
-	UpgradedClientState *types.Any `protobuf:"bytes,4,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty" yaml:"upgraded_client_state"`
+	UpgradedClientState *types.Any `protobuf:"bytes,4,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty"`
 }
 
 func (m *UpgradeProposal) Reset()      { *m = UpgradeProposal{} }
@@ -302,9 +302,9 @@ var xxx_messageInfo_UpgradeProposal proto.InternalMessageInfo
 // gets reset
 type Height struct {
 	// the revision that the client is currently on
-	RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty" yaml:"revision_number"`
+	RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"`
 	// the height within the given revision
-	RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty" yaml:"revision_height"`
+	RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty"`
 }
 
 func (m *Height) Reset()      { *m = Height{} }
@@ -344,7 +344,7 @@ type Params struct {
 	// allowed_clients defines the list of allowed client state types which can be created
 	// and interacted with. If a client type is removed from the allowed clients list, usage
 	// of this client will be disabled until it is added again to the list.
-	AllowedClients []string `protobuf:"bytes,1,rep,name=allowed_clients,json=allowedClients,proto3" json:"allowed_clients,omitempty" yaml:"allowed_clients"`
+	AllowedClients []string `protobuf:"bytes,1,rep,name=allowed_clients,json=allowedClients,proto3" json:"allowed_clients,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -400,53 +400,47 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) }
 
 var fileDescriptor_b6bc4c8185546947 = []byte{
-	// 734 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbd, 0x6e, 0x13, 0x4b,
-	0x18, 0xf5, 0x3a, 0xbe, 0x56, 0x3c, 0xbe, 0x8a, 0x73, 0x37, 0xce, 0x8d, 0xaf, 0x6f, 0xe4, 0xb1,
-	0x46, 0x14, 0x16, 0x22, 0xbb, 0xd8, 0x48, 0x10, 0xb9, 0xc3, 0x6e, 0x92, 0x02, 0x64, 0x16, 0x45,
-	0x08, 0x1a, 0x6b, 0x7f, 0x26, 0xeb, 0x89, 0xd6, 0x3b, 0xd6, 0xce, 0xac, 0xc1, 0x6f, 0x40, 0x07,
-	0x25, 0x48, 0x29, 0xf2, 0x06, 0x34, 0x3c, 0x02, 0x45, 0x44, 0x95, 0x92, 0x6a, 0x85, 0x92, 0x86,
-	0xda, 0x4f, 0x80, 0x3c, 0x33, 0x9b, 0xd8, 0xf9, 0x01, 0x04, 0xdd, 0xcc, 0x99, 0xb3, 0x67, 0xce,
-	0x77, 0xbc, 0xc7, 0x0b, 0x20, 0x71, 0x5c, 0xd3, 0xa5, 0x11, 0x36, 0xdd, 0x80, 0xe0, 0x90, 0x9b,
-	0xe3, 0xa6, 0x5a, 0x19, 0xa3, 0x88, 0x72, 0xaa, 0xeb, 0xc4, 0x71, 0x8d, 0x19, 0xc1, 0x50, 0xf0,
-	0xb8, 0x59, 0x2d, 0xfb, 0xd4, 0xa7, 0xe2, 0xd8, 0x9c, 0xad, 0x24, 0xb3, 0xfa, 0x9f, 0x4f, 0xa9,
-	0x1f, 0x60, 0x53, 0xec, 0x9c, 0x78, 0xdf, 0xb4, 0xc3, 0x89, 0x3a, 0xba, 0xe5, 0x52, 0x36, 0xa4,
-	0xcc, 0x8c, 0x47, 0x7e, 0x64, 0x7b, 0xd8, 0x1c, 0x37, 0x1d, 0xcc, 0xed, 0x66, 0xba, 0x4f, 0x05,
-	0x24, 0xab, 0x2f, 0x95, 0xe5, 0x46, 0x1e, 0xa1, 0x43, 0x0d, 0xac, 0xef, 0x7a, 0x38, 0xe4, 0x64,
-	0x9f, 0x60, 0xaf, 0x2b, 0x9c, 0x3c, 0xe5, 0x36, 0xc7, 0x7a, 0x13, 0x14, 0xa4, 0xb1, 0x3e, 0xf1,
-	0x2a, 0x5a, 0x5d, 0x6b, 0x14, 0x3a, 0xe5, 0x69, 0x02, 0x57, 0x27, 0xf6, 0x30, 0x68, 0xa3, 0xf3,
-	0x23, 0x64, 0x2d, 0xcb, 0xf5, 0xae, 0xa7, 0xf7, 0xc0, 0xdf, 0x0a, 0x67, 0x33, 0x89, 0x4a, 0xb6,
-	0xae, 0x35, 0x8a, 0xad, 0xb2, 0x21, 0xfd, 0x1b, 0xa9, 0x7f, 0xe3, 0x61, 0x38, 0xe9, 0x6c, 0x4c,
-	0x13, 0xb8, 0xb6, 0xa0, 0x25, 0x9e, 0x41, 0x56, 0xd1, 0xbd, 0x30, 0x81, 0x3e, 0x68, 0xa0, 0xd2,
-	0xa5, 0x21, 0xc3, 0x21, 0x8b, 0x99, 0x80, 0x9e, 0x11, 0x3e, 0xd8, 0xc1, 0xc4, 0x1f, 0x70, 0x7d,
-	0x1b, 0xe4, 0x07, 0x62, 0x25, 0xec, 0x15, 0x5b, 0x55, 0xe3, 0x6a, 0xa4, 0x86, 0xe4, 0x76, 0x72,
-	0xc7, 0x09, 0xcc, 0x58, 0x8a, 0xaf, 0x3f, 0x07, 0x25, 0x37, 0x55, 0xfd, 0x05, 0xaf, 0xd5, 0x69,
-	0x02, 0xff, 0x55, 0x5e, 0x17, 0x1f, 0x43, 0xd6, 0x8a, 0xbb, 0x60, 0x0f, 0x7d, 0xd2, 0xc0, 0xba,
-	0x8c, 0x71, 0xd1, 0x37, 0xfb, 0x9d, 0x40, 0x5f, 0x81, 0xd5, 0x4b, 0x17, 0xb2, 0x4a, 0xb6, 0xbe,
-	0xd4, 0x28, 0xb6, 0xee, 0x5c, 0x37, 0xeb, 0x4d, 0x49, 0x75, 0xe0, 0x6c, 0xfa, 0x69, 0x02, 0x37,
-	0xae, 0x1d, 0x82, 0x21, 0xab, 0xb4, 0x38, 0x05, 0x43, 0x6f, 0xb2, 0xa0, 0x2c, 0xc7, 0xd8, 0x1b,
-	0x79, 0x36, 0xc7, 0xbd, 0x88, 0x8e, 0x28, 0xb3, 0x03, 0xbd, 0x0c, 0xfe, 0xe2, 0x84, 0x07, 0x58,
-	0x4e, 0x60, 0xc9, 0x8d, 0x5e, 0x07, 0x45, 0x0f, 0x33, 0x37, 0x22, 0x23, 0x4e, 0x68, 0x28, 0xc2,
-	0x2c, 0x58, 0xf3, 0x90, 0xbe, 0x03, 0xfe, 0x61, 0xb1, 0x73, 0x80, 0x5d, 0xde, 0xbf, 0x48, 0x61,
-	0x49, 0xa4, 0xb0, 0x39, 0x4d, 0x60, 0x45, 0x3a, 0xbb, 0x42, 0x41, 0x56, 0x49, 0x61, 0xdd, 0x34,
-	0x94, 0x27, 0xa0, 0xcc, 0x62, 0x87, 0x71, 0xc2, 0x63, 0x8e, 0xe7, 0xc4, 0x72, 0x42, 0x0c, 0x4e,
-	0x13, 0xf8, 0xff, 0xb9, 0xd8, 0x15, 0x16, 0xb2, 0xf4, 0x0b, 0x38, 0x95, 0x6c, 0xa3, 0xd7, 0x47,
-	0x30, 0xf3, 0xf9, 0xe3, 0x56, 0x55, 0x75, 0xc3, 0xa7, 0x63, 0x43, 0x55, 0x69, 0x16, 0x2a, 0xc7,
-	0x21, 0x47, 0xef, 0xb3, 0xa0, 0xb4, 0x27, 0x6b, 0xf5, 0xc7, 0x61, 0xdc, 0x07, 0xb9, 0x51, 0x60,
-	0x87, 0x62, 0xfe, 0x62, 0x6b, 0xd3, 0x50, 0xd7, 0xa6, 0xad, 0x4d, 0xaf, 0xee, 0x05, 0x76, 0xa8,
-	0xde, 0x5c, 0xc1, 0xd7, 0x0f, 0xc0, 0xba, 0xe2, 0x78, 0xfd, 0x85, 0xa6, 0xe5, 0x7e, 0xf0, 0xf6,
-	0xd6, 0xa7, 0x09, 0xdc, 0x94, 0x89, 0x5c, 0xfb, 0x30, 0xb2, 0xd6, 0x52, 0x7c, 0xae, 0xff, 0xed,
-	0xdb, 0xb3, 0x4c, 0xde, 0x1d, 0xc1, 0xcc, 0xb7, 0x23, 0xa8, 0xfd, 0x24, 0x9b, 0x43, 0x0d, 0xe4,
-	0x55, 0x29, 0xbb, 0xa0, 0x14, 0xe1, 0x31, 0x61, 0x84, 0x86, 0xfd, 0x30, 0x1e, 0x3a, 0x38, 0x12,
-	0xe1, 0xe4, 0xe6, 0x4b, 0x74, 0x89, 0x80, 0xac, 0x95, 0x14, 0x79, 0x2c, 0x80, 0x05, 0x11, 0x55,
-	0xf1, 0xec, 0x8d, 0x22, 0x92, 0x30, 0x27, 0x22, 0x9d, 0xb4, 0x97, 0xd3, 0x01, 0xd0, 0x23, 0x90,
-	0xef, 0xd9, 0x91, 0x3d, 0x64, 0x33, 0x61, 0x3b, 0x08, 0xe8, 0xcb, 0xf3, 0x08, 0x58, 0x45, 0xab,
-	0x2f, 0x35, 0x0a, 0xf3, 0xc2, 0x97, 0x08, 0xc8, 0x5a, 0x51, 0x88, 0x4c, 0x87, 0x75, 0xac, 0xe3,
-	0xd3, 0x9a, 0x76, 0x72, 0x5a, 0xd3, 0xbe, 0x9e, 0xd6, 0xb4, 0xb7, 0x67, 0xb5, 0xcc, 0xc9, 0x59,
-	0x2d, 0xf3, 0xe5, 0xac, 0x96, 0x79, 0xb1, 0xed, 0x13, 0x3e, 0x88, 0x1d, 0xc3, 0xa5, 0x43, 0xf5,
-	0x37, 0x6b, 0x12, 0xc7, 0xdd, 0xf2, 0xa9, 0x39, 0x7e, 0x60, 0x0e, 0xa9, 0x17, 0x07, 0x98, 0xc9,
-	0x8f, 0xc2, 0xdd, 0xd6, 0x96, 0xfa, 0x2e, 0xf0, 0xc9, 0x08, 0x33, 0x27, 0x2f, 0x7e, 0xb2, 0x7b,
-	0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x69, 0x32, 0x4f, 0x37, 0x06, 0x00, 0x00,
+	// 633 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0xd4, 0x40,
+	0x14, 0x4f, 0xda, 0x75, 0xe9, 0x4e, 0xa4, 0xab, 0x71, 0x0b, 0xeb, 0x2a, 0xd9, 0x25, 0x08, 0x2e,
+	0xc5, 0x26, 0xdd, 0x15, 0x6c, 0x29, 0x78, 0xb0, 0xbd, 0xb4, 0x17, 0x29, 0x91, 0x22, 0x08, 0xb2,
+	0x24, 0x93, 0x69, 0x76, 0x24, 0x99, 0x09, 0x99, 0x49, 0xa4, 0xdf, 0xc0, 0xa3, 0xe0, 0xc5, 0x63,
+	0x3f, 0x84, 0x1f, 0xa2, 0x78, 0xea, 0xd1, 0x93, 0xc8, 0xee, 0xc5, 0x6f, 0xe0, 0x55, 0x32, 0x33,
+	0x71, 0x37, 0xfe, 0xa9, 0x82, 0xb7, 0x79, 0xef, 0xfd, 0xe6, 0xbd, 0xdf, 0xef, 0xf1, 0x9b, 0x01,
+	0x7d, 0x1c, 0x40, 0x17, 0xd2, 0x0c, 0xb9, 0x30, 0xc6, 0x88, 0x70, 0xb7, 0x18, 0xa9, 0x93, 0x93,
+	0x66, 0x94, 0x53, 0xd3, 0xc4, 0x01, 0x74, 0x4a, 0x80, 0xa3, 0xd2, 0xc5, 0xa8, 0xd7, 0x89, 0x68,
+	0x44, 0x45, 0xd9, 0x2d, 0x4f, 0x12, 0xd9, 0xbb, 0x1d, 0x51, 0x1a, 0xc5, 0xc8, 0x15, 0x51, 0x90,
+	0x9f, 0xba, 0x3e, 0x39, 0x53, 0xa5, 0x7b, 0x90, 0xb2, 0x84, 0x32, 0x37, 0x4f, 0xa3, 0xcc, 0x0f,
+	0x91, 0x5b, 0x8c, 0x02, 0xc4, 0xfd, 0x51, 0x15, 0x57, 0x0d, 0x24, 0x6a, 0x22, 0x3b, 0xcb, 0x40,
+	0x96, 0xec, 0x04, 0x6c, 0x1c, 0x85, 0x88, 0x70, 0x7c, 0x8a, 0x51, 0x78, 0x20, 0x88, 0x3c, 0xe3,
+	0x3e, 0x47, 0xe6, 0x1d, 0xd0, 0x92, 0xbc, 0x26, 0x38, 0xec, 0xea, 0x03, 0x7d, 0xd8, 0xf2, 0xd6,
+	0x64, 0xe2, 0x28, 0x34, 0x77, 0xc0, 0x75, 0x55, 0x64, 0x25, 0xb8, 0xbb, 0x32, 0xd0, 0x87, 0xc6,
+	0xb8, 0xe3, 0x48, 0xa2, 0x4e, 0x45, 0xd4, 0x79, 0x42, 0xce, 0x3c, 0x03, 0x2e, 0xba, 0xda, 0xef,
+	0x74, 0xd0, 0x3d, 0xa0, 0x84, 0x21, 0xc2, 0x72, 0x26, 0x52, 0xcf, 0x31, 0x9f, 0x1e, 0x22, 0x1c,
+	0x4d, 0xb9, 0xb9, 0x0b, 0x9a, 0x53, 0x71, 0x12, 0xf3, 0x8c, 0x71, 0xcf, 0xf9, 0x75, 0x45, 0x8e,
+	0xc4, 0xee, 0x37, 0x2e, 0x3e, 0xf7, 0x35, 0x4f, 0xe1, 0xcd, 0xc7, 0xa0, 0x0d, 0xab, 0xae, 0xff,
+	0x40, 0x69, 0x1d, 0xd6, 0x28, 0x94, 0xac, 0x36, 0xa4, 0xf6, 0x3a, 0x37, 0x76, 0xf5, 0x16, 0x5e,
+	0x82, 0x1b, 0x3f, 0x4d, 0x65, 0xdd, 0x95, 0xc1, 0xea, 0xd0, 0x18, 0x3f, 0xf8, 0x1d, 0xf3, 0x3f,
+	0xe9, 0x56, 0x5a, 0xda, 0x75, 0x52, 0xcc, 0xbe, 0xd4, 0x41, 0x47, 0xb2, 0x3a, 0x49, 0x43, 0x9f,
+	0xa3, 0xe3, 0x8c, 0xa6, 0x94, 0xf9, 0xb1, 0xd9, 0x01, 0xd7, 0x38, 0xe6, 0x31, 0x52, 0x84, 0x64,
+	0x60, 0x0e, 0x80, 0x11, 0x22, 0x06, 0x33, 0x9c, 0x72, 0x4c, 0x89, 0xd0, 0xdf, 0xf2, 0x96, 0x53,
+	0xe6, 0x26, 0xb8, 0xc9, 0xf2, 0xe0, 0x15, 0x82, 0x7c, 0xb2, 0x10, 0xb5, 0x2a, 0x70, 0x6d, 0x55,
+	0x38, 0xa8, 0xb4, 0x6d, 0x83, 0x0e, 0xcb, 0x03, 0xc6, 0x31, 0xcf, 0x39, 0x5a, 0x82, 0x37, 0x04,
+	0xdc, 0x5c, 0xd4, 0xaa, 0x1b, 0x7b, 0xf6, 0x9b, 0xf3, 0xbe, 0xf6, 0xf1, 0xc3, 0x56, 0x4f, 0xf9,
+	0x2b, 0xa2, 0x85, 0xa3, 0xec, 0x58, 0x4a, 0xe7, 0x88, 0x70, 0xfb, 0x9b, 0x0e, 0xda, 0x27, 0xd2,
+	0x9a, 0xff, 0xad, 0xe6, 0x11, 0x68, 0xa4, 0xb1, 0x4f, 0x84, 0x00, 0x63, 0x7c, 0xd7, 0x51, 0x63,
+	0x2b, 0xe7, 0x57, 0xa3, 0x8f, 0x63, 0x9f, 0xa8, 0x0d, 0x0b, 0xbc, 0x79, 0x08, 0x36, 0x14, 0x26,
+	0x9c, 0xd4, 0x4c, 0xdc, 0xb8, 0xc2, 0x31, 0xb7, 0xaa, 0x2b, 0x4b, 0x4f, 0x64, 0x6f, 0xb3, 0x54,
+	0xfc, 0xfe, 0xbc, 0xaf, 0x7d, 0x3d, 0xef, 0xeb, 0x7f, 0x51, 0x1e, 0x82, 0xa6, 0x72, 0xf9, 0x7d,
+	0xd0, 0xce, 0x50, 0x81, 0x19, 0xa6, 0x64, 0x42, 0xf2, 0x24, 0x40, 0x99, 0x50, 0xde, 0xf0, 0xd6,
+	0xab, 0xf4, 0x53, 0x91, 0xad, 0x01, 0xd5, 0xbb, 0x58, 0xa9, 0x03, 0x65, 0xc7, 0xbd, 0xb5, 0x8a,
+	0x87, 0x3d, 0x02, 0xcd, 0x63, 0x3f, 0xf3, 0x13, 0x56, 0x5e, 0xf6, 0xe3, 0x98, 0xbe, 0xfe, 0x21,
+	0x92, 0x75, 0xf5, 0xc1, 0xea, 0xb0, 0xe5, 0xad, 0xab, 0xb4, 0x14, 0xc2, 0xf6, 0xbd, 0x8b, 0x99,
+	0xa5, 0x5f, 0xce, 0x2c, 0xfd, 0xcb, 0xcc, 0xd2, 0xdf, 0xce, 0x2d, 0xed, 0x72, 0x6e, 0x69, 0x9f,
+	0xe6, 0x96, 0xf6, 0x62, 0x37, 0xc2, 0x7c, 0x9a, 0x07, 0x0e, 0xa4, 0x89, 0xfa, 0x33, 0x5c, 0x1c,
+	0xc0, 0xad, 0x88, 0xba, 0xc5, 0x8e, 0x9b, 0xd0, 0x30, 0x8f, 0x11, 0x93, 0x3f, 0xdc, 0xf6, 0x78,
+	0x4b, 0x7d, 0x72, 0xfc, 0x2c, 0x45, 0x2c, 0x68, 0x8a, 0xdd, 0x3d, 0xfc, 0x1e, 0x00, 0x00, 0xff,
+	0xff, 0x80, 0xfe, 0x7c, 0xd0, 0x04, 0x05, 0x00, 0x00,
 }
 
 func (this *UpgradeProposal) Equal(that interface{}) bool {
diff --git a/modules/core/02-client/types/genesis.pb.go b/modules/core/02-client/types/genesis.pb.go
index d6d4fad8cd5..3f2fc730a98 100644
--- a/modules/core/02-client/types/genesis.pb.go
+++ b/modules/core/02-client/types/genesis.pb.go
@@ -28,14 +28,14 @@ type GenesisState struct {
 	// client states with their corresponding identifiers
 	Clients IdentifiedClientStates `protobuf:"bytes,1,rep,name=clients,proto3,castrepeated=IdentifiedClientStates" json:"clients"`
 	// consensus states from each client
-	ClientsConsensus ClientsConsensusStates `protobuf:"bytes,2,rep,name=clients_consensus,json=clientsConsensus,proto3,castrepeated=ClientsConsensusStates" json:"clients_consensus" yaml:"clients_consensus"`
+	ClientsConsensus ClientsConsensusStates `protobuf:"bytes,2,rep,name=clients_consensus,json=clientsConsensus,proto3,castrepeated=ClientsConsensusStates" json:"clients_consensus"`
 	// metadata from each client
-	ClientsMetadata []IdentifiedGenesisMetadata `protobuf:"bytes,3,rep,name=clients_metadata,json=clientsMetadata,proto3" json:"clients_metadata" yaml:"clients_metadata"`
+	ClientsMetadata []IdentifiedGenesisMetadata `protobuf:"bytes,3,rep,name=clients_metadata,json=clientsMetadata,proto3" json:"clients_metadata"`
 	Params          Params                      `protobuf:"bytes,4,opt,name=params,proto3" json:"params"`
 	// create localhost on initialization
-	CreateLocalhost bool `protobuf:"varint,5,opt,name=create_localhost,json=createLocalhost,proto3" json:"create_localhost,omitempty" yaml:"create_localhost"`
+	CreateLocalhost bool `protobuf:"varint,5,opt,name=create_localhost,json=createLocalhost,proto3" json:"create_localhost,omitempty"`
 	// the sequence for the next generated client identifier
-	NextClientSequence uint64 `protobuf:"varint,6,opt,name=next_client_sequence,json=nextClientSequence,proto3" json:"next_client_sequence,omitempty" yaml:"next_client_sequence"`
+	NextClientSequence uint64 `protobuf:"varint,6,opt,name=next_client_sequence,json=nextClientSequence,proto3" json:"next_client_sequence,omitempty"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -158,8 +158,8 @@ var xxx_messageInfo_GenesisMetadata proto.InternalMessageInfo
 // IdentifiedGenesisMetadata has the client metadata with the corresponding
 // client id.
 type IdentifiedGenesisMetadata struct {
-	ClientId       string            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
-	ClientMetadata []GenesisMetadata `protobuf:"bytes,2,rep,name=client_metadata,json=clientMetadata,proto3" json:"client_metadata" yaml:"client_metadata"`
+	ClientId       string            `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	ClientMetadata []GenesisMetadata `protobuf:"bytes,2,rep,name=client_metadata,json=clientMetadata,proto3" json:"client_metadata"`
 }
 
 func (m *IdentifiedGenesisMetadata) Reset()         { *m = IdentifiedGenesisMetadata{} }
@@ -218,41 +218,37 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/genesis.proto", fileDescriptor_bcd0c0f1f2e6a91a) }
 
 var fileDescriptor_bcd0c0f1f2e6a91a = []byte{
-	// 539 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x41, 0x6e, 0xd3, 0x40,
-	0x14, 0xcd, 0x34, 0x69, 0x68, 0xa7, 0x15, 0x0d, 0xa3, 0xa8, 0x98, 0x54, 0xb2, 0x2d, 0xb3, 0x09,
-	0x8b, 0xd8, 0x24, 0x2c, 0xa8, 0xb2, 0x41, 0x72, 0x25, 0x50, 0x25, 0x90, 0xc0, 0xec, 0xd8, 0x58,
-	0x93, 0xf1, 0x90, 0x8e, 0xb0, 0x3d, 0x21, 0x33, 0x89, 0xc8, 0x0d, 0x58, 0x22, 0x4e, 0xc0, 0x9a,
-	0x33, 0x70, 0x80, 0x2e, 0xbb, 0xec, 0x2a, 0xa0, 0xe4, 0x06, 0x39, 0x01, 0xf2, 0xcc, 0x98, 0xb6,
-	0x69, 0xca, 0xee, 0xe7, 0xf9, 0xbd, 0xf7, 0x9f, 0xde, 0xcf, 0x40, 0x97, 0x0d, 0x48, 0x40, 0xf8,
-	0x98, 0x06, 0x24, 0x65, 0x34, 0x97, 0xc1, 0xb4, 0x1b, 0x0c, 0x69, 0x4e, 0x05, 0x13, 0xfe, 0x68,
-	0xcc, 0x25, 0x47, 0x88, 0x0d, 0x88, 0x5f, 0x30, 0x7c, 0xcd, 0xf0, 0xa7, 0xdd, 0x96, 0xb3, 0x41,
-	0x65, 0xbe, 0x2a, 0x51, 0xab, 0x39, 0xe4, 0x43, 0xae, 0xc6, 0xa0, 0x98, 0x34, 0xea, 0x5d, 0xd6,
-	0xe0, 0xfe, 0x2b, 0x6d, 0xfe, 0x5e, 0x62, 0x49, 0x11, 0x81, 0xf7, 0xb4, 0x4c, 0x58, 0xc0, 0xad,
-	0xb6, 0xf7, 0x7a, 0x4f, 0xfc, 0xdb, 0xdb, 0xfc, 0xd3, 0x84, 0xe6, 0x92, 0x7d, 0x64, 0x34, 0x39,
-	0x51, 0x98, 0xd2, 0x86, 0xf6, 0xf9, 0xdc, 0xa9, 0xfc, 0xfc, 0xed, 0x1c, 0x6e, 0xfc, 0x2c, 0xa2,
-	0xd2, 0x19, 0x7d, 0x07, 0xf0, 0x81, 0x99, 0x63, 0xc2, 0x73, 0x41, 0x73, 0x31, 0x11, 0xd6, 0xd6,
-	0xdd, 0xfb, 0xb4, 0xcd, 0x49, 0x49, 0xd5, 0x7e, 0x61, 0xbf, 0xd8, 0xb7, 0x9a, 0x3b, 0xd6, 0x0c,
-	0x67, 0x69, 0xdf, 0xbb, 0xe5, 0xe8, 0x15, 0x59, 0xb4, 0x54, 0xac, 0x69, 0xa3, 0x06, 0x59, 0xc3,
-	0xd1, 0x0c, 0x96, 0x58, 0x9c, 0x51, 0x89, 0x13, 0x2c, 0xb1, 0x55, 0x55, 0x91, 0x3a, 0xff, 0xaf,
-	0xc0, 0xf4, 0xf7, 0xc6, 0x88, 0x42, 0xc7, 0xc4, 0x7a, 0x78, 0x33, 0x56, 0x69, 0xea, 0x45, 0x07,
-	0x06, 0x2a, 0x15, 0xe8, 0x18, 0xd6, 0x47, 0x78, 0x8c, 0x33, 0x61, 0xd5, 0x5c, 0xd0, 0xde, 0xeb,
-	0xb5, 0x36, 0x2d, 0x7c, 0xab, 0x18, 0x61, 0xad, 0x70, 0x8f, 0x0c, 0x1f, 0xbd, 0x84, 0x0d, 0x32,
-	0xa6, 0x58, 0xd2, 0x38, 0xe5, 0x04, 0xa7, 0x67, 0x5c, 0x48, 0x6b, 0xdb, 0x05, 0xed, 0x9d, 0xf0,
-	0xe8, 0x5a, 0x82, 0x35, 0x46, 0x91, 0x40, 0x41, 0xaf, 0x4b, 0x04, 0xbd, 0x83, 0xcd, 0x9c, 0x7e,
-	0x91, 0xb1, 0x5e, 0x17, 0x0b, 0xfa, 0x79, 0x42, 0x73, 0x42, 0xad, 0xba, 0x0b, 0xda, 0xb5, 0xd0,
-	0x59, 0xcd, 0x9d, 0x23, 0xed, 0xb5, 0x89, 0xe5, 0x45, 0xa8, 0x80, 0xcd, 0xad, 0x4b, 0xf0, 0x05,
-	0x3c, 0x58, 0x6b, 0x06, 0x35, 0x60, 0xf5, 0x13, 0x9d, 0x59, 0xc0, 0x05, 0xed, 0xfd, 0xa8, 0x18,
-	0x51, 0x13, 0x6e, 0x4f, 0x71, 0x3a, 0xa1, 0xd6, 0x96, 0xc2, 0xf4, 0x8f, 0x7e, 0xed, 0xeb, 0x0f,
-	0xa7, 0xe2, 0xfd, 0x02, 0xf0, 0xd1, 0x9d, 0x2d, 0xa3, 0x2e, 0xdc, 0x35, 0x31, 0x58, 0xa2, 0x1c,
-	0x77, 0xc3, 0xe6, 0x6a, 0xee, 0x34, 0xae, 0x97, 0x1e, 0xb3, 0xc4, 0x8b, 0x76, 0xf4, 0x7c, 0x9a,
-	0xa0, 0x14, 0x9a, 0xe6, 0xaf, 0x0e, 0xac, 0xff, 0x73, 0x8f, 0x37, 0xf5, 0xbd, 0x7e, 0x56, 0xdb,
-	0x9c, 0xf5, 0xf0, 0xc6, 0x86, 0xab, 0xab, 0xde, 0xd7, 0xc8, 0x3f, 0x7e, 0x74, 0xbe, 0xb0, 0xc1,
-	0xc5, 0xc2, 0x06, 0x7f, 0x16, 0x36, 0xf8, 0xb6, 0xb4, 0x2b, 0x17, 0x4b, 0xbb, 0x72, 0xb9, 0xb4,
-	0x2b, 0x1f, 0x8e, 0x87, 0x4c, 0x9e, 0x4d, 0x06, 0x3e, 0xe1, 0x59, 0x40, 0xb8, 0xc8, 0xb8, 0x08,
-	0xd8, 0x80, 0x74, 0x86, 0x3c, 0x98, 0x3e, 0x0f, 0x32, 0x9e, 0x4c, 0x52, 0x2a, 0xf4, 0x5b, 0x7e,
-	0xda, 0xeb, 0x98, 0xe7, 0x2c, 0x67, 0x23, 0x2a, 0x06, 0x75, 0xf5, 0x6a, 0x9f, 0xfd, 0x0d, 0x00,
-	0x00, 0xff, 0xff, 0x62, 0xb6, 0x99, 0xab, 0x24, 0x04, 0x00, 0x00,
+	// 477 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c,
+	0x18, 0xf4, 0x36, 0x69, 0xfe, 0x76, 0x5b, 0xfd, 0x09, 0xab, 0x08, 0x99, 0x20, 0x39, 0x56, 0xb8,
+	0xb8, 0x87, 0xd8, 0x6d, 0x38, 0x50, 0x71, 0x41, 0x6a, 0x0f, 0xa8, 0x12, 0x48, 0xc8, 0xdc, 0x38,
+	0x60, 0xd9, 0xeb, 0x0f, 0x77, 0x85, 0xed, 0x0d, 0xd9, 0xb5, 0x45, 0xdf, 0x80, 0x03, 0x07, 0x1e,
+	0x81, 0x33, 0x4f, 0xd2, 0x63, 0x8f, 0x9c, 0x00, 0x25, 0x2f, 0x82, 0xbc, 0xbb, 0xa6, 0x52, 0x70,
+	0xb9, 0x7d, 0x99, 0x99, 0x6f, 0x26, 0x3b, 0xd6, 0x87, 0x5d, 0x96, 0xd0, 0x80, 0xf2, 0x15, 0x04,
+	0x34, 0x67, 0x50, 0xca, 0xa0, 0x3e, 0x09, 0x32, 0x28, 0x41, 0x30, 0xe1, 0x2f, 0x57, 0x5c, 0x72,
+	0x42, 0x58, 0x42, 0xfd, 0x46, 0xe1, 0x6b, 0x85, 0x5f, 0x9f, 0x4c, 0xa6, 0x1d, 0x5b, 0x86, 0x55,
+	0x4b, 0x93, 0x71, 0xc6, 0x33, 0xae, 0xc6, 0xa0, 0x99, 0x34, 0x3a, 0x5b, 0xf7, 0xf0, 0xe1, 0x73,
+	0x6d, 0xfe, 0x5a, 0xc6, 0x12, 0x08, 0xc5, 0xff, 0xe9, 0x35, 0x61, 0x23, 0xb7, 0xe7, 0x1d, 0x2c,
+	0x8e, 0xfc, 0xbf, 0xd3, 0xfc, 0x8b, 0x14, 0x4a, 0xc9, 0xde, 0x31, 0x48, 0xcf, 0x15, 0xa6, 0x76,
+	0xcf, 0x9c, 0xeb, 0x1f, 0x53, 0xeb, 0xdb, 0xcf, 0xe9, 0xfd, 0x4e, 0x5a, 0x84, 0xad, 0x33, 0xa9,
+	0xf1, 0x3d, 0x33, 0x46, 0x94, 0x97, 0x02, 0x4a, 0x51, 0x09, 0x7b, 0xe7, 0xee, 0x38, 0xed, 0x72,
+	0xde, 0x4a, 0xb5, 0xdd, 0x6d, 0x9c, 0xa6, 0xc5, 0x16, 0x1f, 0x8e, 0xe8, 0x16, 0x4e, 0xde, 0xe2,
+	0x16, 0x8b, 0x0a, 0x90, 0x71, 0x1a, 0xcb, 0xd8, 0xee, 0xa9, 0xd8, 0xf9, 0xbf, 0x5f, 0x69, 0x2a,
+	0x7a, 0x69, 0x96, 0xce, 0xfa, 0x4d, 0x74, 0x38, 0x34, 0x66, 0x2d, 0x4c, 0x4e, 0xf1, 0x60, 0x19,
+	0xaf, 0xe2, 0x42, 0xd8, 0x7d, 0x17, 0x79, 0x07, 0x8b, 0x49, 0x97, 0xeb, 0x2b, 0xa5, 0x30, 0x16,
+	0x46, 0x4f, 0x8e, 0xf0, 0x88, 0xae, 0x20, 0x96, 0x10, 0xe5, 0x9c, 0xc6, 0xf9, 0x25, 0x17, 0xd2,
+	0xde, 0x75, 0x91, 0xb7, 0x17, 0x0e, 0x35, 0xfe, 0xa2, 0x85, 0xc9, 0x31, 0x1e, 0x97, 0xf0, 0x51,
+	0x46, 0xda, 0x31, 0x12, 0xf0, 0xa1, 0x82, 0x92, 0x82, 0x3d, 0x70, 0x91, 0xd7, 0x0f, 0x49, 0xc3,
+	0x99, 0xd6, 0x0d, 0x33, 0x7b, 0x86, 0x87, 0x5b, 0x0f, 0x20, 0x23, 0xdc, 0x7b, 0x0f, 0x57, 0x36,
+	0x72, 0x91, 0x77, 0x18, 0x36, 0x23, 0x19, 0xe3, 0xdd, 0x3a, 0xce, 0x2b, 0xb0, 0x77, 0x14, 0xa6,
+	0x7f, 0x3c, 0xed, 0x7f, 0xfa, 0x3a, 0xb5, 0x66, 0x9f, 0x11, 0x7e, 0x70, 0x67, 0x19, 0xe4, 0x21,
+	0xde, 0x37, 0xff, 0x85, 0xa5, 0xca, 0x71, 0x3f, 0xdc, 0xd3, 0xc0, 0x45, 0x4a, 0x42, 0x6c, 0x5a,
+	0xba, 0x6d, 0x5c, 0x7f, 0xe8, 0x47, 0x5d, 0xdd, 0x74, 0xf7, 0xfc, 0xbf, 0x16, 0xfc, 0x41, 0xc3,
+	0xeb, 0xb5, 0x83, 0x6e, 0xd6, 0x0e, 0xfa, 0xb5, 0x76, 0xd0, 0x97, 0x8d, 0x63, 0xdd, 0x6c, 0x1c,
+	0xeb, 0xfb, 0xc6, 0xb1, 0xde, 0x9c, 0x66, 0x4c, 0x5e, 0x56, 0x89, 0x4f, 0x79, 0x11, 0x50, 0x2e,
+	0x0a, 0x2e, 0x02, 0x96, 0xd0, 0x79, 0xc6, 0x83, 0xfa, 0x49, 0x50, 0xf0, 0xb4, 0xca, 0x41, 0xe8,
+	0x2b, 0x39, 0x5e, 0xcc, 0xcd, 0xa1, 0xc8, 0xab, 0x25, 0x88, 0x64, 0xa0, 0xee, 0xe1, 0xf1, 0xef,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x3c, 0x2d, 0x37, 0x7e, 0x03, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/02-client/types/tx.pb.go b/modules/core/02-client/types/tx.pb.go
index ce17ca96ad7..8ac4ff760c0 100644
--- a/modules/core/02-client/types/tx.pb.go
+++ b/modules/core/02-client/types/tx.pb.go
@@ -32,10 +32,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // MsgCreateClient defines a message to create an IBC client
 type MsgCreateClient struct {
 	// light client state
-	ClientState *types.Any `protobuf:"bytes,1,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
+	ClientState *types.Any `protobuf:"bytes,1,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
 	// consensus state associated with the client that corresponds to a given
 	// height.
-	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 	// signer address
 	Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"`
 }
@@ -114,7 +114,7 @@ var xxx_messageInfo_MsgCreateClientResponse proto.InternalMessageInfo
 // 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"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,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
@@ -195,16 +195,16 @@ var xxx_messageInfo_MsgUpdateClientResponse proto.InternalMessageInfo
 // state
 type MsgUpgradeClient struct {
 	// client unique identifier
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// upgraded client state
-	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
+	ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
 	// upgraded consensus state, only contains enough information to serve as a
 	// basis of trust in update logic
-	ConsensusState *types.Any `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	ConsensusState *types.Any `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 	// proof that old chain committed to new client
-	ProofUpgradeClient []byte `protobuf:"bytes,4,opt,name=proof_upgrade_client,json=proofUpgradeClient,proto3" json:"proof_upgrade_client,omitempty" yaml:"proof_upgrade_client"`
+	ProofUpgradeClient []byte `protobuf:"bytes,4,opt,name=proof_upgrade_client,json=proofUpgradeClient,proto3" json:"proof_upgrade_client,omitempty"`
 	// proof that old chain committed to new consensus state
-	ProofUpgradeConsensusState []byte `protobuf:"bytes,5,opt,name=proof_upgrade_consensus_state,json=proofUpgradeConsensusState,proto3" json:"proof_upgrade_consensus_state,omitempty" yaml:"proof_upgrade_consensus_state"`
+	ProofUpgradeConsensusState []byte `protobuf:"bytes,5,opt,name=proof_upgrade_consensus_state,json=proofUpgradeConsensusState,proto3" json:"proof_upgrade_consensus_state,omitempty"`
 	// signer address
 	Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"`
 }
@@ -284,7 +284,7 @@ var xxx_messageInfo_MsgUpgradeClientResponse proto.InternalMessageInfo
 // Warning: DEPRECATED
 type MsgSubmitMisbehaviour struct {
 	// client unique identifier
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use.
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: Do not use.
 	// misbehaviour used for freezing the light client
 	Misbehaviour *types.Any `protobuf:"bytes,2,opt,name=misbehaviour,proto3" json:"misbehaviour,omitempty"` // Deprecated: Do not use.
 	// signer address
@@ -376,46 +376,43 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/tx.proto", fileDescriptor_cb5dc4651eb49a04) }
 
 var fileDescriptor_cb5dc4651eb49a04 = []byte{
-	// 623 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0x8d, 0x9b, 0xef, 0x8b, 0x9a, 0x69, 0xfa, 0x23, 0x13, 0x52, 0xd7, 0x55, 0xed, 0xc8, 0x74,
-	0x11, 0x04, 0xb5, 0x49, 0xba, 0x00, 0x15, 0x36, 0xa4, 0x2b, 0x16, 0x91, 0xc0, 0x15, 0x0b, 0xd8,
-	0x04, 0xff, 0x4c, 0xa7, 0x23, 0x62, 0x4f, 0xe4, 0xb1, 0x23, 0xf2, 0x06, 0x2c, 0x79, 0x84, 0x0a,
-	0x5e, 0x80, 0xc7, 0x60, 0xd9, 0x05, 0x0b, 0x56, 0x51, 0x95, 0x6c, 0x58, 0xe7, 0x09, 0x50, 0x3c,
-	0x4e, 0xb0, 0x1d, 0x3b, 0x8a, 0x04, 0xec, 0x3c, 0x73, 0xcf, 0x9c, 0x73, 0x8f, 0xcf, 0x1d, 0x1b,
-	0x1c, 0x62, 0xd3, 0xd2, 0x2c, 0xe2, 0x41, 0xcd, 0xea, 0x61, 0xe8, 0xfa, 0xda, 0xa0, 0xa9, 0xf9,
-	0x1f, 0xd4, 0xbe, 0x47, 0x7c, 0xc2, 0xf3, 0xd8, 0xb4, 0xd4, 0x59, 0x51, 0x65, 0x45, 0x75, 0xd0,
-	0x14, 0xab, 0x88, 0x20, 0x12, 0x96, 0xb5, 0xd9, 0x13, 0x43, 0x8a, 0x07, 0x88, 0x10, 0xd4, 0x83,
-	0x5a, 0xb8, 0x32, 0x83, 0x4b, 0xcd, 0x70, 0x87, 0xac, 0xa4, 0xdc, 0x72, 0x60, 0xb7, 0x43, 0xd1,
-	0xb9, 0x07, 0x0d, 0x1f, 0x9e, 0x87, 0x3c, 0xfc, 0x4b, 0x50, 0x61, 0x8c, 0x5d, 0xea, 0x1b, 0x3e,
-	0x14, 0xb8, 0x3a, 0xd7, 0xd8, 0x6a, 0x55, 0x55, 0xc6, 0xa2, 0xce, 0x59, 0xd4, 0xe7, 0xee, 0xb0,
-	0xbd, 0x3f, 0x1d, 0xc9, 0x77, 0x86, 0x86, 0xd3, 0x3b, 0x53, 0xe2, 0x67, 0x14, 0x7d, 0x8b, 0x2d,
-	0x2f, 0x66, 0x2b, 0xfe, 0x0d, 0xd8, 0xb5, 0x88, 0x4b, 0xa1, 0x4b, 0x03, 0x1a, 0x91, 0x6e, 0xac,
-	0x20, 0x15, 0xa7, 0x23, 0xb9, 0x16, 0x91, 0x26, 0x8f, 0x29, 0xfa, 0xce, 0x62, 0x87, 0x51, 0xd7,
-	0x40, 0x89, 0x62, 0xe4, 0x42, 0x4f, 0x28, 0xd6, 0xb9, 0x46, 0x59, 0x8f, 0x56, 0x67, 0x9b, 0x1f,
-	0xaf, 0xe5, 0xc2, 0xcf, 0x6b, 0xb9, 0xa0, 0x1c, 0x80, 0xfd, 0x94, 0x43, 0x1d, 0xd2, 0xfe, 0x8c,
-	0x45, 0xf9, 0xc2, 0xdc, 0xbf, 0xee, 0xdb, 0xbf, 0xdd, 0x37, 0x41, 0x39, 0x72, 0x82, 0xed, 0xd0,
-	0x7a, 0xb9, 0x5d, 0x9d, 0x8e, 0xe4, 0xbd, 0x84, 0x49, 0x6c, 0x2b, 0xfa, 0x26, 0x7b, 0x7e, 0x61,
-	0xf3, 0x4f, 0xc1, 0x4e, 0xb4, 0xef, 0x40, 0x4a, 0x0d, 0xb4, 0xd2, 0x9d, 0xbe, 0xcd, 0xb0, 0x1d,
-	0x06, 0x5d, 0xdb, 0x40, 0xbc, 0xc9, 0x85, 0x81, 0xef, 0x45, 0xb0, 0x17, 0xd6, 0x90, 0x67, 0xd8,
-	0x7f, 0xe0, 0x20, 0x1d, 0xf9, 0xc6, 0xbf, 0x88, 0xbc, 0xf8, 0x97, 0x22, 0x7f, 0x05, 0xaa, 0x7d,
-	0x8f, 0x90, 0xcb, 0x6e, 0xc0, 0x6c, 0x77, 0x99, 0xae, 0xf0, 0x5f, 0x9d, 0x6b, 0x54, 0xda, 0xf2,
-	0x74, 0x24, 0x1f, 0x32, 0xa6, 0x2c, 0x94, 0xa2, 0xf3, 0xe1, 0x76, 0xf2, 0x95, 0xbd, 0x07, 0x47,
-	0x29, 0x70, 0xaa, 0xf7, 0xff, 0x43, 0xee, 0xc6, 0x74, 0x24, 0x1f, 0x67, 0x72, 0xa7, 0x7b, 0x16,
-	0x13, 0x22, 0x79, 0x23, 0x5b, 0xca, 0x49, 0x5c, 0x04, 0x42, 0x3a, 0xd5, 0x45, 0xe4, 0x5f, 0x39,
-	0x70, 0xb7, 0x43, 0xd1, 0x45, 0x60, 0x3a, 0xd8, 0xef, 0x60, 0x6a, 0xc2, 0x2b, 0x63, 0x80, 0x49,
-	0xe0, 0xf1, 0xa7, 0xcb, 0xb9, 0xd7, 0xb2, 0x72, 0x17, 0xb8, 0x58, 0xf2, 0xcf, 0x40, 0xc5, 0x89,
-	0x91, 0xac, 0x4c, 0x7e, 0x43, 0xe0, 0xf4, 0x04, 0x9a, 0x17, 0x93, 0xc3, 0x1b, 0x22, 0x96, 0xed,
-	0xc8, 0xe0, 0x28, 0xb3, 0xe3, 0xb9, 0xa7, 0xd6, 0xe7, 0x22, 0x28, 0x76, 0x28, 0xe2, 0xdf, 0x81,
-	0x4a, 0xe2, 0x4b, 0x74, 0x4f, 0x5d, 0xfe, 0xc6, 0xa9, 0xa9, 0xcb, 0x2c, 0x3e, 0x58, 0x03, 0x34,
-	0x57, 0x9a, 0x29, 0x24, 0x6e, 0x7b, 0x9e, 0x42, 0x1c, 0x94, 0xab, 0x90, 0x75, 0x25, 0x79, 0x0b,
-	0x6c, 0x27, 0x67, 0xeb, 0x38, 0xf7, 0x74, 0x0c, 0x25, 0x3e, 0x5c, 0x07, 0xb5, 0x10, 0xf1, 0x00,
-	0x9f, 0x31, 0x00, 0xf7, 0x73, 0x38, 0x96, 0xa1, 0x62, 0x73, 0x6d, 0xe8, 0x5c, 0xb3, 0xad, 0x7f,
-	0x1b, 0x4b, 0xdc, 0xcd, 0x58, 0xe2, 0x6e, 0xc7, 0x12, 0xf7, 0x69, 0x22, 0x15, 0x6e, 0x26, 0x52,
-	0xe1, 0xc7, 0x44, 0x2a, 0xbc, 0x7d, 0x82, 0xb0, 0x7f, 0x15, 0x98, 0xaa, 0x45, 0x1c, 0xcd, 0x22,
-	0xd4, 0x21, 0x54, 0xc3, 0xa6, 0x75, 0x82, 0x88, 0x36, 0x78, 0xac, 0x39, 0xc4, 0x0e, 0x7a, 0x90,
-	0xb2, 0xdf, 0xd8, 0xa3, 0xd6, 0x49, 0xf4, 0x27, 0xf3, 0x87, 0x7d, 0x48, 0xcd, 0x52, 0x38, 0x5f,
-	0xa7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x8f, 0x23, 0x99, 0xe9, 0x06, 0x00, 0x00,
+	// 561 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0x12, 0x41,
+	0x18, 0x66, 0x40, 0x49, 0x99, 0xd2, 0xd6, 0x4c, 0x50, 0xe9, 0x36, 0x5d, 0x08, 0x7a, 0xc0, 0x68,
+	0x67, 0x0a, 0x1e, 0x6a, 0xfc, 0x38, 0xb4, 0x3d, 0x79, 0xe0, 0xb2, 0x8d, 0x17, 0x2f, 0xb8, 0xbb,
+	0x4c, 0xa7, 0x93, 0xb0, 0x3b, 0x64, 0x67, 0x97, 0xc8, 0x3f, 0xf0, 0x62, 0xe2, 0x0f, 0xf0, 0xd0,
+	0x78, 0xf5, 0x3f, 0x78, 0xf6, 0xd8, 0xa3, 0x47, 0x03, 0x17, 0x7f, 0x86, 0x61, 0x06, 0x90, 0x5d,
+	0x58, 0xb2, 0xa6, 0x37, 0x96, 0xf7, 0x79, 0xde, 0xe7, 0x79, 0xbf, 0x06, 0x1e, 0x70, 0xc7, 0x25,
+	0xae, 0x08, 0x28, 0x71, 0xfb, 0x9c, 0xfa, 0x21, 0x19, 0xb6, 0x48, 0xf8, 0x11, 0x0f, 0x02, 0x11,
+	0x0a, 0x84, 0xb8, 0xe3, 0xe2, 0x69, 0x10, 0xeb, 0x20, 0x1e, 0xb6, 0x8c, 0x0a, 0x13, 0x4c, 0xa8,
+	0x30, 0x99, 0xfe, 0xd2, 0x48, 0x63, 0x9f, 0x09, 0xc1, 0xfa, 0x94, 0xa8, 0x2f, 0x27, 0xba, 0x24,
+	0xb6, 0x3f, 0xd2, 0xa1, 0xc6, 0x77, 0x00, 0xf7, 0x3a, 0x92, 0x9d, 0x07, 0xd4, 0x0e, 0xe9, 0xb9,
+	0xca, 0x83, 0x4e, 0x60, 0x59, 0x67, 0xec, 0xca, 0xd0, 0x0e, 0x69, 0x15, 0xd4, 0x41, 0x73, 0xbb,
+	0x5d, 0xc1, 0x3a, 0x0b, 0x9e, 0x67, 0xc1, 0xa7, 0xfe, 0xc8, 0xda, 0xd6, 0xc8, 0x8b, 0x29, 0x10,
+	0xbd, 0x81, 0x7b, 0xae, 0xf0, 0x25, 0xf5, 0x65, 0x24, 0x67, 0xdc, 0xfc, 0x06, 0xee, 0xee, 0x02,
+	0xac, 0xe9, 0x0f, 0x60, 0x51, 0x72, 0xe6, 0xd3, 0xa0, 0x5a, 0xa8, 0x83, 0x66, 0xc9, 0x9a, 0x7d,
+	0xbd, 0xdc, 0xfa, 0x74, 0x5d, 0xcb, 0xfd, 0xb9, 0xae, 0xe5, 0x1a, 0xfb, 0xf0, 0x61, 0xc2, 0xac,
+	0x45, 0xe5, 0x60, 0x9a, 0xa5, 0xf1, 0x59, 0x17, 0xf2, 0x6e, 0xd0, 0xfb, 0x57, 0xc8, 0x01, 0x2c,
+	0xcd, 0x0a, 0xe1, 0x3d, 0x55, 0x45, 0xc9, 0xda, 0xd2, 0x7f, 0xbc, 0xed, 0xa1, 0x57, 0x70, 0x77,
+	0x16, 0xf4, 0xa8, 0x94, 0x36, 0xdb, 0xec, 0x75, 0x47, 0x63, 0x3b, 0x1a, 0x9a, 0xd9, 0xea, 0xb2,
+	0x9d, 0x85, 0xd5, 0x1f, 0x79, 0x78, 0x4f, 0xc5, 0x58, 0x60, 0xf7, 0x32, 0x79, 0x4d, 0x4e, 0x24,
+	0x7f, 0x8b, 0x89, 0x14, 0xfe, 0x63, 0x22, 0xc7, 0xb0, 0x32, 0x08, 0x84, 0xb8, 0xec, 0x46, 0xda,
+	0x6b, 0x57, 0xe7, 0xae, 0xde, 0xa9, 0x83, 0x66, 0xd9, 0x42, 0x2a, 0x16, 0x2f, 0xe3, 0x14, 0x1e,
+	0x26, 0x18, 0x09, 0xf9, 0xbb, 0x8a, 0x6a, 0xc4, 0xa8, 0x69, 0x6b, 0x50, 0x4c, 0xe9, 0xad, 0x01,
+	0xab, 0xc9, 0xfe, 0x2d, 0x9a, 0xfb, 0x15, 0xc0, 0xfb, 0x1d, 0xc9, 0x2e, 0x22, 0xc7, 0xe3, 0x61,
+	0x87, 0x4b, 0x87, 0x5e, 0xd9, 0x43, 0x2e, 0xa2, 0x00, 0xd5, 0x56, 0x3a, 0x7c, 0x96, 0xaf, 0x82,
+	0xa5, 0x2e, 0xbf, 0x86, 0x65, 0x6f, 0x89, 0xb0, 0xa9, 0xcb, 0x8a, 0x19, 0x43, 0x23, 0x23, 0xbe,
+	0x12, 0x0a, 0xb1, 0x6a, 0xbd, 0x06, 0x0f, 0xd7, 0xba, 0x9b, 0xfb, 0x6f, 0x7f, 0x2b, 0xc0, 0x42,
+	0x47, 0x32, 0xf4, 0x01, 0x96, 0x63, 0x47, 0xf9, 0x08, 0xaf, 0x9e, 0x3b, 0x4e, 0x1c, 0x83, 0xf1,
+	0x34, 0x03, 0x68, 0xae, 0x34, 0x55, 0x88, 0x5d, 0x4b, 0x9a, 0xc2, 0x32, 0x28, 0x55, 0x61, 0xdd,
+	0xa2, 0x23, 0x17, 0xee, 0xc4, 0xb7, 0xe3, 0x71, 0x2a, 0x7b, 0x09, 0x65, 0x3c, 0xcb, 0x82, 0x5a,
+	0x88, 0x04, 0x10, 0xad, 0x19, 0xf6, 0x93, 0x94, 0x1c, 0xab, 0x50, 0xa3, 0x95, 0x19, 0x3a, 0xd7,
+	0x3c, 0xb3, 0x7e, 0x8e, 0x4d, 0x70, 0x33, 0x36, 0xc1, 0xef, 0xb1, 0x09, 0xbe, 0x4c, 0xcc, 0xdc,
+	0xcd, 0xc4, 0xcc, 0xfd, 0x9a, 0x98, 0xb9, 0xf7, 0x2f, 0x18, 0x0f, 0xaf, 0x22, 0x07, 0xbb, 0xc2,
+	0x23, 0xae, 0x90, 0x9e, 0x90, 0x84, 0x3b, 0xee, 0x11, 0x13, 0x64, 0x78, 0x42, 0x3c, 0xd1, 0x8b,
+	0xfa, 0x54, 0xea, 0x17, 0xfd, 0xb8, 0x7d, 0x34, 0x7b, 0xd4, 0xc3, 0xd1, 0x80, 0x4a, 0xa7, 0xa8,
+	0xf6, 0xeb, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x54, 0x95, 0x90, 0xf4, 0x05, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/core/03-connection/types/connection.pb.go b/modules/core/03-connection/types/connection.pb.go
index 86d1741edaf..2d557b9389d 100644
--- a/modules/core/03-connection/types/connection.pb.go
+++ b/modules/core/03-connection/types/connection.pb.go
@@ -68,7 +68,7 @@ func (State) EnumDescriptor() ([]byte, []int) {
 // a connection between two chains.
 type ConnectionEnd struct {
 	// client associated with this connection.
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// IBC version which can be utilised to determine encodings or protocols for
 	// channels or packets utilising this connection.
 	Versions []*Version `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"`
@@ -79,7 +79,7 @@ type ConnectionEnd struct {
 	// delay period that must pass before a consensus state can be used for
 	// packet-verification NOTE: delay period logic is only implemented by some
 	// clients.
-	DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"`
+	DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"`
 }
 
 func (m *ConnectionEnd) Reset()         { *m = ConnectionEnd{} }
@@ -119,9 +119,9 @@ var xxx_messageInfo_ConnectionEnd proto.InternalMessageInfo
 // identifier field.
 type IdentifiedConnection struct {
 	// connection identifier.
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// client associated with this connection.
-	ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// IBC version which can be utilised to determine encodings or protocols for
 	// channels or packets utilising this connection
 	Versions []*Version `protobuf:"bytes,3,rep,name=versions,proto3" json:"versions,omitempty"`
@@ -130,7 +130,7 @@ type IdentifiedConnection struct {
 	// counterparty chain associated with this connection.
 	Counterparty Counterparty `protobuf:"bytes,5,opt,name=counterparty,proto3" json:"counterparty"`
 	// delay period associated with this connection.
-	DelayPeriod uint64 `protobuf:"varint,6,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"`
+	DelayPeriod uint64 `protobuf:"varint,6,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"`
 }
 
 func (m *IdentifiedConnection) Reset()         { *m = IdentifiedConnection{} }
@@ -170,10 +170,10 @@ var xxx_messageInfo_IdentifiedConnection proto.InternalMessageInfo
 type Counterparty struct {
 	// identifies the client on the counterparty chain associated with a given
 	// connection.
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// identifies the connection end on the counterparty chain associated with a
 	// given connection.
-	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 	// commitment merkle prefix of the counterparty chain.
 	Prefix types.MerklePrefix `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix"`
 }
@@ -260,7 +260,7 @@ func (m *ClientPaths) GetPaths() []string {
 // ConnectionPaths define all the connection paths for a given client state.
 type ConnectionPaths struct {
 	// client state unique identifier
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// list of connection paths
 	Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"`
 }
@@ -359,7 +359,7 @@ type Params struct {
 	// maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the
 	// largest amount of time that the chain might reasonably take to produce the next block under normal operating
 	// conditions. A safe choice is 3-5x the expected time per block.
-	MaxExpectedTimePerBlock uint64 `protobuf:"varint,1,opt,name=max_expected_time_per_block,json=maxExpectedTimePerBlock,proto3" json:"max_expected_time_per_block,omitempty" yaml:"max_expected_time_per_block"`
+	MaxExpectedTimePerBlock uint64 `protobuf:"varint,1,opt,name=max_expected_time_per_block,json=maxExpectedTimePerBlock,proto3" json:"max_expected_time_per_block,omitempty"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -418,53 +418,49 @@ func init() {
 }
 
 var fileDescriptor_90572467c054e43a = []byte{
-	// 721 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xda, 0x48,
-	0x14, 0xc7, 0xc6, 0x10, 0x18, 0xc2, 0x2e, 0x3b, 0x8b, 0x36, 0x16, 0xab, 0xd8, 0x96, 0x77, 0xb5,
-	0x8b, 0x56, 0x0a, 0x5e, 0x12, 0x69, 0x57, 0x4a, 0xdb, 0x43, 0x20, 0x54, 0xb2, 0xda, 0x52, 0xe4,
-	0x90, 0x48, 0xcd, 0x05, 0x19, 0x7b, 0x42, 0x46, 0xc1, 0x1e, 0x64, 0x0f, 0x08, 0xbe, 0x41, 0x94,
-	0x53, 0xaf, 0x3d, 0x44, 0xaa, 0xd4, 0xef, 0x52, 0x45, 0x3d, 0xe5, 0xd8, 0x13, 0xaa, 0x92, 0x6b,
-	0x4f, 0x7c, 0x82, 0xca, 0x1e, 0x03, 0x4e, 0xd4, 0x54, 0x4a, 0xda, 0xdb, 0x7b, 0xfe, 0xfd, 0xe1,
-	0xbd, 0x1f, 0x0f, 0x03, 0xfe, 0xc6, 0x5d, 0x4b, 0xb3, 0x88, 0x87, 0x34, 0x8b, 0xb8, 0x2e, 0xb2,
-	0x28, 0x26, 0xae, 0x36, 0xaa, 0xc6, 0xba, 0xca, 0xc0, 0x23, 0x94, 0xc0, 0xdf, 0x70, 0xd7, 0xaa,
-	0x04, 0xc4, 0x4a, 0x0c, 0x1a, 0x55, 0x4b, 0xc5, 0x1e, 0xe9, 0x91, 0x90, 0xa2, 0x05, 0x15, 0x63,
-	0x97, 0xe2, 0xb6, 0x8e, 0x83, 0xa9, 0x83, 0x5c, 0xca, 0x6c, 0xe7, 0x1d, 0x23, 0xaa, 0xef, 0x79,
-	0x90, 0xaf, 0x2f, 0x0c, 0x1b, 0xae, 0x0d, 0xab, 0x20, 0x6b, 0xf5, 0x31, 0x72, 0x69, 0x07, 0xdb,
-	0x22, 0xa7, 0x70, 0xe5, 0x6c, 0xad, 0x38, 0x9b, 0xca, 0x85, 0x89, 0xe9, 0xf4, 0xb7, 0xd5, 0x05,
-	0xa4, 0x1a, 0x19, 0x56, 0xeb, 0x36, 0x7c, 0x04, 0x32, 0x23, 0xe4, 0xf9, 0x98, 0xb8, 0xbe, 0xc8,
-	0x2b, 0xc9, 0x72, 0x6e, 0x53, 0xae, 0x7c, 0x7d, 0xdc, 0xca, 0x01, 0xe3, 0x19, 0x0b, 0x01, 0xdc,
-	0x02, 0x29, 0x9f, 0x9a, 0x14, 0x89, 0x49, 0x85, 0x2b, 0xff, 0xb4, 0xb9, 0x7e, 0x97, 0x72, 0x2f,
-	0x20, 0x19, 0x8c, 0x0b, 0x9b, 0x60, 0xd5, 0x22, 0x43, 0x97, 0x22, 0x6f, 0x60, 0x7a, 0x74, 0x22,
-	0x0a, 0x0a, 0x57, 0xce, 0x6d, 0xfe, 0x79, 0x97, 0xb6, 0x1e, 0xe3, 0xd6, 0x84, 0x8b, 0xa9, 0x9c,
-	0x30, 0x6e, 0xe8, 0xe1, 0x36, 0x58, 0xb5, 0x51, 0xdf, 0x9c, 0x74, 0x06, 0xc8, 0xc3, 0xc4, 0x16,
-	0x53, 0x0a, 0x57, 0x16, 0x6a, 0x6b, 0xb3, 0xa9, 0xfc, 0x2b, 0xdb, 0x3b, 0x8e, 0xaa, 0x46, 0x2e,
-	0x6c, 0x5b, 0x61, 0xb7, 0x2d, 0x9c, 0xbe, 0x95, 0x13, 0xea, 0x67, 0x1e, 0x14, 0x75, 0x1b, 0xb9,
-	0x14, 0x1f, 0x61, 0x64, 0x2f, 0x23, 0x85, 0xeb, 0x80, 0x5f, 0x04, 0x99, 0x9f, 0x4d, 0xe5, 0x2c,
-	0x33, 0x0c, 0x12, 0xe4, 0xf1, 0xad, 0xb8, 0xf9, 0x7b, 0xc7, 0x9d, 0x7c, 0x70, 0xdc, 0xc2, 0x77,
-	0xc4, 0x9d, 0xfa, 0xc1, 0x71, 0xa7, 0xef, 0x1d, 0xf7, 0x07, 0x0e, 0xac, 0xc6, 0x3f, 0xe6, 0x21,
-	0x67, 0xfb, 0x04, 0xe4, 0x97, 0x73, 0x2f, 0xe3, 0x17, 0x67, 0x53, 0xb9, 0x18, 0xc9, 0xe2, 0xb0,
-	0x1a, 0x2c, 0x31, 0xef, 0x75, 0x1b, 0xd6, 0x40, 0x7a, 0xe0, 0xa1, 0x23, 0x3c, 0x0e, 0x2f, 0xf7,
-	0x56, 0x1c, 0x8b, 0x9f, 0xd9, 0xa8, 0x5a, 0x79, 0x81, 0xbc, 0x93, 0x3e, 0x6a, 0x85, 0xdc, 0x28,
-	0x8e, 0x48, 0x19, 0x2d, 0xf3, 0x07, 0xc8, 0xd5, 0xc3, 0xa1, 0x5a, 0x26, 0x3d, 0xf6, 0x61, 0x11,
-	0xa4, 0x06, 0x41, 0x21, 0x72, 0x4a, 0xb2, 0x9c, 0x35, 0x58, 0xa3, 0x1e, 0x82, 0x9f, 0x97, 0x57,
-	0xc5, 0x88, 0x0f, 0xd8, 0x79, 0xe1, 0xcd, 0xc7, 0xbd, 0x9f, 0x81, 0x95, 0xe8, 0x52, 0xa0, 0x04,
-	0x00, 0x9e, 0x9f, 0xb1, 0xc7, 0x4c, 0x8d, 0xd8, 0x13, 0x58, 0x02, 0x99, 0x23, 0x64, 0xd2, 0xa1,
-	0x87, 0xe6, 0x1e, 0x8b, 0x3e, 0xda, 0xc6, 0x05, 0xe9, 0x96, 0xe9, 0x99, 0x8e, 0x0f, 0x6d, 0xf0,
-	0xbb, 0x63, 0x8e, 0x3b, 0x68, 0x3c, 0x40, 0x16, 0x45, 0x76, 0x87, 0x62, 0x07, 0x05, 0x5f, 0x6a,
-	0xa7, 0xdb, 0x27, 0xd6, 0x49, 0x68, 0x2e, 0xd4, 0xfe, 0x9a, 0x4d, 0x65, 0x95, 0x4d, 0xfc, 0x0d,
-	0xb2, 0x6a, 0xac, 0x39, 0xe6, 0xb8, 0x11, 0x81, 0x6d, 0xec, 0xa0, 0x16, 0xf2, 0x6a, 0x01, 0xf2,
-	0xcf, 0x1b, 0x0e, 0xa4, 0xc2, 0x6b, 0x85, 0xff, 0x01, 0x79, 0xaf, 0xbd, 0xd3, 0x6e, 0x74, 0xf6,
-	0x9b, 0x7a, 0x53, 0x6f, 0xeb, 0x3b, 0xcf, 0xf5, 0xc3, 0xc6, 0x6e, 0x67, 0xbf, 0xb9, 0xd7, 0x6a,
-	0xd4, 0xf5, 0xa7, 0x7a, 0x63, 0xb7, 0x90, 0x28, 0xfd, 0x72, 0x76, 0xae, 0xe4, 0x6f, 0x10, 0xa0,
-	0x08, 0x00, 0xd3, 0x05, 0x0f, 0x0b, 0x5c, 0x29, 0x73, 0x76, 0xae, 0x08, 0x41, 0x0d, 0x25, 0x90,
-	0x67, 0x48, 0xdb, 0x78, 0xf5, 0xb2, 0xd5, 0x68, 0x16, 0xf8, 0x52, 0xee, 0xec, 0x5c, 0x59, 0x89,
-	0xda, 0xa5, 0x32, 0x04, 0x93, 0x4c, 0x19, 0xd4, 0x25, 0xe1, 0xf4, 0x9d, 0x94, 0xa8, 0x1d, 0x5c,
-	0x5c, 0x49, 0xdc, 0xe5, 0x95, 0xc4, 0x7d, 0xba, 0x92, 0xb8, 0xd7, 0xd7, 0x52, 0xe2, 0xf2, 0x5a,
-	0x4a, 0x7c, 0xbc, 0x96, 0x12, 0x87, 0x8f, 0x7b, 0x98, 0x1e, 0x0f, 0xbb, 0xc1, 0xa9, 0x68, 0x16,
-	0xf1, 0x1d, 0xe2, 0x6b, 0xb8, 0x6b, 0x6d, 0xf4, 0x88, 0x36, 0xfa, 0x5f, 0x73, 0x88, 0x3d, 0xec,
-	0x23, 0x9f, 0xbd, 0xc1, 0xff, 0xdd, 0xda, 0x88, 0xfd, 0x37, 0xd0, 0xc9, 0x00, 0xf9, 0xdd, 0x74,
-	0xf8, 0xf6, 0xde, 0xfa, 0x12, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xa7, 0x84, 0x5c, 0x3f, 0x06, 0x00,
-	0x00,
+	// 661 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x5d, 0x4b, 0xdb, 0x50,
+	0x18, 0x4e, 0xd2, 0xb4, 0xd6, 0xd3, 0xd6, 0xb9, 0x83, 0x6c, 0x21, 0xb2, 0x34, 0xd3, 0xc1, 0xca,
+	0xc0, 0x66, 0x2a, 0x6c, 0xb0, 0x79, 0x63, 0x6b, 0x84, 0xb0, 0xad, 0x0b, 0xb1, 0x0a, 0xf3, 0x26,
+	0xa4, 0xc9, 0xb1, 0x1e, 0x6c, 0x72, 0x42, 0x72, 0x5a, 0xea, 0x3f, 0x10, 0xaf, 0x76, 0x37, 0x36,
+	0x10, 0x06, 0xbb, 0xdf, 0xef, 0xf0, 0xd2, 0xcb, 0x5d, 0x8d, 0xa1, 0x7f, 0x64, 0xe4, 0xc3, 0x26,
+	0xca, 0xec, 0xc5, 0xb6, 0xbb, 0xf7, 0xe3, 0x79, 0x9e, 0xbc, 0x79, 0xde, 0x97, 0x03, 0x9e, 0xe2,
+	0x9e, 0xad, 0xd8, 0x24, 0x40, 0x8a, 0x4d, 0x3c, 0x0f, 0xd9, 0x14, 0x13, 0x4f, 0x19, 0xad, 0xe6,
+	0xb2, 0xa6, 0x1f, 0x10, 0x4a, 0xe0, 0x03, 0xdc, 0xb3, 0x9b, 0x11, 0xb0, 0x99, 0x6b, 0x8d, 0x56,
+	0xc5, 0x85, 0x3e, 0xe9, 0x93, 0x18, 0xa2, 0x44, 0x51, 0x82, 0x16, 0xf3, 0xb2, 0xae, 0x8b, 0xa9,
+	0x8b, 0x3c, 0x9a, 0xc8, 0x5e, 0x67, 0x09, 0x70, 0xe9, 0x13, 0x07, 0x6a, 0xed, 0x89, 0xa0, 0xea,
+	0x39, 0x70, 0x11, 0xcc, 0xda, 0x03, 0x8c, 0x3c, 0x6a, 0x62, 0x47, 0x60, 0x65, 0xb6, 0x31, 0x6b,
+	0x94, 0x93, 0x82, 0xe6, 0xc0, 0xd7, 0xa0, 0x3c, 0x42, 0x41, 0x88, 0x89, 0x17, 0x0a, 0x9c, 0x5c,
+	0x68, 0x54, 0xd6, 0xea, 0xcd, 0x3f, 0x0f, 0xd6, 0xdc, 0x4b, 0x70, 0xc6, 0x84, 0x00, 0xd7, 0x41,
+	0x31, 0xa4, 0x16, 0x45, 0x42, 0x41, 0x66, 0x1b, 0x73, 0x6b, 0x8f, 0xee, 0x62, 0xee, 0x44, 0x20,
+	0x23, 0xc1, 0xc2, 0x0e, 0xa8, 0xda, 0x64, 0xe8, 0x51, 0x14, 0xf8, 0x56, 0x40, 0x8f, 0x05, 0x5e,
+	0x66, 0x1b, 0x95, 0xb5, 0x27, 0x77, 0x71, 0xdb, 0x39, 0x6c, 0x8b, 0x3f, 0xff, 0x59, 0x67, 0x8c,
+	0x1b, 0x7c, 0xf8, 0x18, 0x54, 0x1d, 0x34, 0xb0, 0x8e, 0x4d, 0x1f, 0x05, 0x98, 0x38, 0x42, 0x51,
+	0x66, 0x1b, 0xbc, 0x51, 0x89, 0x6b, 0x7a, 0x5c, 0x7a, 0xc5, 0x9f, 0x7c, 0xad, 0x33, 0x4b, 0xdf,
+	0x39, 0xb0, 0xa0, 0x39, 0xc8, 0xa3, 0xf8, 0x00, 0x23, 0x27, 0xf3, 0x08, 0xce, 0x01, 0x6e, 0xe2,
+	0x0c, 0x87, 0x6f, 0x19, 0xc6, 0x4d, 0x31, 0xac, 0xf0, 0xd7, 0x86, 0xf1, 0xff, 0x60, 0x58, 0xf1,
+	0x3f, 0x1b, 0x56, 0xba, 0xcb, 0xb0, 0x2f, 0x2c, 0xa8, 0xe6, 0xd5, 0xa6, 0x5f, 0xd2, 0x32, 0xa8,
+	0x65, 0x83, 0x64, 0xce, 0x55, 0xb3, 0xa2, 0xe6, 0xc0, 0x16, 0x28, 0xf9, 0x01, 0x3a, 0xc0, 0xe3,
+	0xf8, 0x64, 0x6e, 0xfd, 0xc5, 0xe4, 0x92, 0x47, 0xab, 0xcd, 0x77, 0x28, 0x38, 0x1a, 0x20, 0x3d,
+	0xc6, 0xa6, 0x7f, 0x91, 0x32, 0xd3, 0xe1, 0x96, 0x41, 0xa5, 0x1d, 0x7f, 0x5a, 0xb7, 0xe8, 0x61,
+	0x08, 0x17, 0x40, 0xd1, 0x8f, 0x02, 0x81, 0x95, 0x0b, 0x8d, 0x59, 0x23, 0x49, 0x96, 0xb6, 0xc0,
+	0xbd, 0x6c, 0xcf, 0x09, 0x70, 0xea, 0x3f, 0x4c, 0x54, 0xb8, 0xbc, 0xca, 0x1b, 0x30, 0x93, 0xae,
+	0x12, 0x4a, 0x00, 0xe0, 0xeb, 0x13, 0x0a, 0x52, 0x7a, 0xae, 0x02, 0x45, 0x50, 0x3e, 0x40, 0x16,
+	0x1d, 0x06, 0xe8, 0x5a, 0x63, 0x92, 0xa7, 0x73, 0x6f, 0x83, 0x92, 0x6e, 0x05, 0x96, 0x1b, 0xc2,
+	0x0d, 0xb0, 0xe8, 0x5a, 0x63, 0x13, 0x8d, 0x7d, 0x64, 0x53, 0xe4, 0x98, 0x14, 0xbb, 0x28, 0xda,
+	0x89, 0xd9, 0x1b, 0x10, 0xfb, 0x28, 0x16, 0xe7, 0x8d, 0x87, 0xae, 0x35, 0x56, 0x53, 0x44, 0x17,
+	0xbb, 0x48, 0x47, 0x41, 0x2b, 0x6a, 0x3f, 0xfb, 0xcc, 0x82, 0x62, 0x7c, 0x26, 0xf0, 0x05, 0xa8,
+	0xef, 0x74, 0x37, 0xbb, 0xaa, 0xb9, 0xdb, 0xd1, 0x3a, 0x5a, 0x57, 0xdb, 0x7c, 0xab, 0xed, 0xab,
+	0x5b, 0xe6, 0x6e, 0x67, 0x47, 0x57, 0xdb, 0xda, 0xb6, 0xa6, 0x6e, 0xcd, 0x33, 0xe2, 0xfd, 0xd3,
+	0x33, 0xb9, 0x76, 0x03, 0x00, 0x05, 0x00, 0x12, 0x5e, 0x54, 0x9c, 0x67, 0xc5, 0xf2, 0xe9, 0x99,
+	0xcc, 0x47, 0x31, 0x94, 0x40, 0x2d, 0xe9, 0x74, 0x8d, 0x0f, 0xef, 0x75, 0xb5, 0x33, 0xcf, 0x89,
+	0x95, 0xd3, 0x33, 0x79, 0x26, 0x4d, 0x33, 0x66, 0xdc, 0x2c, 0x24, 0xcc, 0x28, 0x16, 0xf9, 0x93,
+	0x6f, 0x12, 0xd3, 0xda, 0x3b, 0xbf, 0x94, 0xd8, 0x8b, 0x4b, 0x89, 0xfd, 0x75, 0x29, 0xb1, 0x1f,
+	0xaf, 0x24, 0xe6, 0xe2, 0x4a, 0x62, 0x7e, 0x5c, 0x49, 0xcc, 0xfe, 0x46, 0x1f, 0xd3, 0xc3, 0x61,
+	0x2f, 0x5a, 0xb6, 0x62, 0x93, 0xd0, 0x25, 0xa1, 0x82, 0x7b, 0xf6, 0x4a, 0x9f, 0x28, 0xa3, 0x97,
+	0x8a, 0x4b, 0x9c, 0xe1, 0x00, 0x85, 0xc9, 0x33, 0xf7, 0x7c, 0x7d, 0x25, 0xf7, 0x80, 0xd2, 0x63,
+	0x1f, 0x85, 0xbd, 0x52, 0xfc, 0xc4, 0xad, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x16, 0x1e, 0x46,
+	0x70, 0x64, 0x05, 0x00, 0x00,
 }
 
 func (m *ConnectionEnd) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/03-connection/types/genesis.pb.go b/modules/core/03-connection/types/genesis.pb.go
index 126cc211457..a3514c7c0cc 100644
--- a/modules/core/03-connection/types/genesis.pb.go
+++ b/modules/core/03-connection/types/genesis.pb.go
@@ -26,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // GenesisState defines the ibc connection submodule's genesis state.
 type GenesisState struct {
 	Connections           []IdentifiedConnection `protobuf:"bytes,1,rep,name=connections,proto3" json:"connections"`
-	ClientConnectionPaths []ConnectionPaths      `protobuf:"bytes,2,rep,name=client_connection_paths,json=clientConnectionPaths,proto3" json:"client_connection_paths" yaml:"client_connection_paths"`
+	ClientConnectionPaths []ConnectionPaths      `protobuf:"bytes,2,rep,name=client_connection_paths,json=clientConnectionPaths,proto3" json:"client_connection_paths"`
 	// the sequence for the next generated connection identifier
-	NextConnectionSequence uint64 `protobuf:"varint,3,opt,name=next_connection_sequence,json=nextConnectionSequence,proto3" json:"next_connection_sequence,omitempty" yaml:"next_connection_sequence"`
+	NextConnectionSequence uint64 `protobuf:"varint,3,opt,name=next_connection_sequence,json=nextConnectionSequence,proto3" json:"next_connection_sequence,omitempty"`
 	Params                 Params `protobuf:"bytes,4,opt,name=params,proto3" json:"params"`
 }
 
@@ -102,30 +102,28 @@ func init() {
 }
 
 var fileDescriptor_1879d34bc6ac3cd7 = []byte{
-	// 359 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4e, 0xea, 0x40,
-	0x14, 0x86, 0xdb, 0x0b, 0x61, 0x51, 0xee, 0xaa, 0xb9, 0x17, 0x1b, 0x16, 0x53, 0x52, 0x8d, 0xb0,
-	0x90, 0x19, 0x81, 0x85, 0x89, 0x61, 0x55, 0x17, 0xc6, 0x1d, 0x01, 0xe3, 0xc2, 0xc4, 0x90, 0x76,
-	0x38, 0x96, 0x49, 0xe8, 0x4c, 0x65, 0x06, 0x22, 0x4f, 0xe0, 0xc2, 0x8d, 0x8f, 0xc5, 0x92, 0xa5,
-	0x2b, 0x62, 0xe0, 0x0d, 0x78, 0x02, 0xd3, 0x96, 0x58, 0x34, 0x76, 0xd7, 0x9c, 0xf3, 0xfd, 0xdf,
-	0x9f, 0xce, 0x31, 0x4e, 0x98, 0x4f, 0x09, 0x15, 0x53, 0x20, 0x54, 0x70, 0x0e, 0x54, 0x31, 0xc1,
-	0xc9, 0xbc, 0x45, 0x02, 0xe0, 0x20, 0x99, 0xc4, 0xd1, 0x54, 0x28, 0x61, 0x56, 0x98, 0x4f, 0x71,
-	0x4c, 0xe1, 0x8c, 0xc2, 0xf3, 0x56, 0xf5, 0x5f, 0x20, 0x02, 0x91, 0x20, 0x24, 0xfe, 0x4a, 0xe9,
-	0x6a, 0x3d, 0xc7, 0x79, 0x90, 0x4d, 0x40, 0xe7, 0xb5, 0x60, 0xfc, 0xbd, 0x4e, 0x8b, 0x06, 0xca,
-	0x53, 0x60, 0xde, 0x1a, 0xe5, 0x0c, 0x92, 0x96, 0x5e, 0x2b, 0x34, 0xca, 0xed, 0x33, 0xfc, 0x7b,
-	0x3b, 0xbe, 0x19, 0x01, 0x57, 0xec, 0x91, 0xc1, 0xe8, 0xea, 0x6b, 0xee, 0x16, 0x97, 0x6b, 0x5b,
-	0xeb, 0x1f, 0x6a, 0xcc, 0x17, 0xdd, 0x38, 0xa2, 0x13, 0x06, 0x5c, 0x0d, 0xb3, 0xf1, 0x30, 0xf2,
-	0xd4, 0x58, 0x5a, 0x7f, 0x92, 0x8a, 0x7a, 0x5e, 0x45, 0x26, 0xee, 0xc5, 0xb8, 0x7b, 0x1a, 0xdb,
-	0x77, 0x6b, 0x1b, 0x2d, 0xbc, 0x70, 0x72, 0xe9, 0xe4, 0x58, 0x9d, 0xfe, 0xff, 0x74, 0xf3, 0x23,
-	0x6e, 0x3e, 0x18, 0x16, 0x87, 0xe7, 0x6f, 0x01, 0x09, 0x4f, 0x33, 0xe0, 0x14, 0xac, 0x42, 0x4d,
-	0x6f, 0x14, 0xdd, 0xe3, 0xdd, 0xda, 0xb6, 0x53, 0x79, 0x1e, 0xe9, 0xf4, 0x2b, 0xf1, 0x2a, 0x73,
-	0x0f, 0xf6, 0x0b, 0xb3, 0x6b, 0x94, 0x22, 0x6f, 0xea, 0x85, 0xd2, 0x2a, 0xd6, 0xf4, 0x46, 0xb9,
-	0x8d, 0xf2, 0x7e, 0xab, 0x97, 0x50, 0xfb, 0xb7, 0xda, 0x67, 0xdc, 0xbb, 0xe5, 0x06, 0xe9, 0xab,
-	0x0d, 0xd2, 0x3f, 0x36, 0x48, 0x7f, 0xdb, 0x22, 0x6d, 0xb5, 0x45, 0xda, 0xfb, 0x16, 0x69, 0xf7,
-	0xdd, 0x80, 0xa9, 0xf1, 0xcc, 0xc7, 0x54, 0x84, 0x84, 0x0a, 0x19, 0x0a, 0x49, 0x98, 0x4f, 0x9b,
-	0x81, 0x20, 0xf3, 0x0b, 0x12, 0x8a, 0xd1, 0x6c, 0x02, 0x32, 0x3d, 0xf8, 0x79, 0xa7, 0x79, 0x70,
-	0x73, 0xb5, 0x88, 0x40, 0xfa, 0xa5, 0xe4, 0xd8, 0x9d, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56,
-	0x1d, 0xd8, 0x5e, 0x6b, 0x02, 0x00, 0x00,
+	// 328 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xbf, 0x4e, 0x32, 0x41,
+	0x14, 0xc5, 0x77, 0x81, 0x50, 0x0c, 0x5f, 0xb5, 0xf9, 0xc4, 0x0d, 0xc5, 0x48, 0x8c, 0x09, 0x14,
+	0x32, 0x23, 0x50, 0x68, 0x41, 0x85, 0x85, 0xb1, 0x23, 0x60, 0x2c, 0x6c, 0xc8, 0xee, 0x70, 0x5d,
+	0x26, 0x61, 0xe7, 0xae, 0xcc, 0x40, 0xf4, 0x2d, 0x7c, 0x27, 0x1b, 0x4a, 0x4a, 0x2b, 0x63, 0xe0,
+	0x45, 0xcc, 0xfe, 0x89, 0x8b, 0xc6, 0xed, 0x26, 0x73, 0x7e, 0xe7, 0x9c, 0x9b, 0x1c, 0x72, 0x26,
+	0x7d, 0xc1, 0x05, 0x2e, 0x81, 0x0b, 0x54, 0x0a, 0x84, 0x91, 0xa8, 0xf8, 0xba, 0xcb, 0x03, 0x50,
+	0xa0, 0xa5, 0x66, 0xd1, 0x12, 0x0d, 0x3a, 0x75, 0xe9, 0x0b, 0x16, 0x53, 0x2c, 0xa7, 0xd8, 0xba,
+	0xdb, 0xf8, 0x1f, 0x60, 0x80, 0x09, 0xc2, 0xe3, 0x57, 0x4a, 0x37, 0x5a, 0x05, 0x99, 0x07, 0xde,
+	0x04, 0x3c, 0x7d, 0x2b, 0x91, 0x7f, 0x37, 0x69, 0xd1, 0xc4, 0x78, 0x06, 0x9c, 0x3b, 0x52, 0xcb,
+	0x21, 0xed, 0xda, 0xcd, 0x72, 0xbb, 0xd6, 0x3b, 0x67, 0x7f, 0xb7, 0xb3, 0xdb, 0x19, 0x28, 0x23,
+	0x1f, 0x25, 0xcc, 0xae, 0xbf, 0xff, 0x87, 0x95, 0xcd, 0xc7, 0x89, 0x35, 0x3e, 0x8c, 0x71, 0x80,
+	0x1c, 0x8b, 0x85, 0x04, 0x65, 0xa6, 0xf9, 0xef, 0x34, 0xf2, 0xcc, 0x5c, 0xbb, 0xa5, 0xa4, 0xa1,
+	0x55, 0xd4, 0x90, 0xe7, 0x8e, 0x62, 0x3c, 0x0b, 0x3f, 0x4a, 0xd3, 0x7e, 0x89, 0xce, 0x15, 0x71,
+	0x15, 0x3c, 0xff, 0x28, 0xd1, 0xf0, 0xb4, 0x02, 0x25, 0xc0, 0x2d, 0x37, 0xed, 0x76, 0x65, 0x5c,
+	0x8f, 0xf5, 0xdc, 0x36, 0xc9, 0x54, 0x67, 0x40, 0xaa, 0x91, 0xb7, 0xf4, 0x42, 0xed, 0x56, 0x9a,
+	0x76, 0xbb, 0xd6, 0xa3, 0x45, 0xf7, 0x8c, 0x12, 0x2a, 0x3b, 0x23, 0xf3, 0x0c, 0xef, 0x37, 0x3b,
+	0x6a, 0x6f, 0x77, 0xd4, 0xfe, 0xdc, 0x51, 0xfb, 0x75, 0x4f, 0xad, 0xed, 0x9e, 0x5a, 0xef, 0x7b,
+	0x6a, 0x3d, 0x0c, 0x02, 0x69, 0xe6, 0x2b, 0x9f, 0x09, 0x0c, 0xb9, 0x40, 0x1d, 0xa2, 0xe6, 0xd2,
+	0x17, 0x9d, 0x00, 0xf9, 0xfa, 0x92, 0x87, 0x38, 0x5b, 0x2d, 0x40, 0xa7, 0x43, 0x5d, 0xf4, 0x3b,
+	0x07, 0x5b, 0x99, 0x97, 0x08, 0xb4, 0x5f, 0x4d, 0x46, 0xea, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff,
+	0x2e, 0xe5, 0xed, 0xd8, 0x23, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/03-connection/types/query.pb.go b/modules/core/03-connection/types/query.pb.go
index 2d87fa0c3ff..ca9d60fad74 100644
--- a/modules/core/03-connection/types/query.pb.go
+++ b/modules/core/03-connection/types/query.pb.go
@@ -372,7 +372,7 @@ func (m *QueryClientConnectionsResponse) GetProofHeight() types.Height {
 // Query/ConnectionClientState RPC method
 type QueryConnectionClientStateRequest struct {
 	// connection identifier
-	ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 }
 
 func (m *QueryConnectionClientStateRequest) Reset()         { *m = QueryConnectionClientStateRequest{} }
@@ -484,7 +484,7 @@ func (m *QueryConnectionClientStateResponse) GetProofHeight() types.Height {
 // Query/ConnectionConsensusState RPC method
 type QueryConnectionConsensusStateRequest struct {
 	// connection identifier
-	ConnectionId   string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId   string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 	RevisionNumber uint64 `protobuf:"varint,2,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"`
 	RevisionHeight uint64 `protobuf:"varint,3,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty"`
 }
@@ -720,67 +720,66 @@ func init() {
 }
 
 var fileDescriptor_cd8d529f8c7cd06b = []byte{
-	// 958 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0xce, 0x6c, 0xd2, 0x88, 0xbc, 0x0d, 0x6d, 0x19, 0xa5, 0xed, 0x62, 0x8a, 0x13, 0x5c, 0xd2,
-	0xa4, 0x40, 0x3d, 0xdd, 0x84, 0x84, 0x52, 0x12, 0x04, 0xa9, 0x0a, 0xcd, 0xa5, 0x0a, 0x46, 0x02,
-	0x89, 0x4b, 0x64, 0x7b, 0x27, 0x8e, 0xa5, 0xac, 0x67, 0xbb, 0xe3, 0x5d, 0xb4, 0xaa, 0x22, 0x24,
-	0x7e, 0x01, 0x12, 0x17, 0x2e, 0x5c, 0x41, 0xe2, 0x0f, 0x20, 0xc4, 0x8d, 0x53, 0x8f, 0x95, 0xb8,
-	0xf4, 0x14, 0xa1, 0x0d, 0x57, 0x2e, 0xfc, 0x02, 0xe4, 0x99, 0x71, 0x3d, 0xde, 0xb5, 0x93, 0xcd,
-	0x8a, 0xdc, 0x36, 0x6f, 0xde, 0x7b, 0xf3, 0x7d, 0xdf, 0x7b, 0xf3, 0x59, 0x01, 0x2b, 0xf4, 0x7c,
-	0xe2, 0xb3, 0x36, 0x25, 0x3e, 0x8b, 0x22, 0xea, 0xc7, 0x21, 0x8b, 0x48, 0xb7, 0x4e, 0x1e, 0x77,
-	0x68, 0xbb, 0x67, 0xb7, 0xda, 0x2c, 0x66, 0xf8, 0x6a, 0xe8, 0xf9, 0x76, 0x92, 0x63, 0x67, 0x39,
-	0x76, 0xb7, 0x6e, 0xcc, 0x05, 0x2c, 0x60, 0x22, 0x85, 0x24, 0xbf, 0x64, 0xb6, 0xf1, 0x96, 0xcf,
-	0x78, 0x93, 0x71, 0xe2, 0xb9, 0x9c, 0xca, 0x36, 0xa4, 0x5b, 0xf7, 0x68, 0xec, 0xd6, 0x49, 0xcb,
-	0x0d, 0xc2, 0xc8, 0x15, 0xe5, 0x32, 0x77, 0x3e, 0xbb, 0xfd, 0x20, 0xa4, 0x51, 0x9c, 0xdc, 0x2c,
-	0x7f, 0xa9, 0x84, 0xa5, 0x12, 0x78, 0x1a, 0x10, 0x99, 0x78, 0x3d, 0x60, 0x2c, 0x38, 0xa0, 0xc4,
-	0x6d, 0x85, 0xc4, 0x8d, 0x22, 0x16, 0x8b, 0x6b, 0xb8, 0x3a, 0x7d, 0x55, 0x9d, 0x8a, 0xbf, 0xbc,
-	0xce, 0x1e, 0x71, 0x23, 0x45, 0xce, 0xda, 0x84, 0xab, 0x9f, 0x25, 0x20, 0xef, 0xbf, 0xe8, 0xe8,
-	0xd0, 0xc7, 0x1d, 0xca, 0x63, 0x7c, 0x03, 0x5e, 0xce, 0xae, 0xd9, 0x0d, 0x1b, 0x35, 0xb4, 0x80,
-	0x96, 0x67, 0x9c, 0xd9, 0x2c, 0xb8, 0xdd, 0xb0, 0x7e, 0x47, 0x70, 0x6d, 0xa8, 0x9e, 0xb7, 0x58,
-	0xc4, 0x29, 0x7e, 0x00, 0x90, 0xe5, 0x8a, 0xea, 0xea, 0xca, 0xa2, 0x5d, 0x2c, 0xa6, 0x9d, 0xd5,
-	0x3f, 0x88, 0x1a, 0x8e, 0x56, 0x88, 0xe7, 0xe0, 0x42, 0xab, 0xcd, 0xd8, 0x5e, 0xad, 0xb2, 0x80,
-	0x96, 0x67, 0x1d, 0xf9, 0x07, 0xbe, 0x0f, 0xb3, 0xe2, 0xc7, 0xee, 0x3e, 0x0d, 0x83, 0xfd, 0xb8,
-	0x36, 0x29, 0xda, 0x1b, 0x5a, 0x7b, 0xa9, 0x63, 0xb7, 0x6e, 0x3f, 0x14, 0x19, 0x5b, 0x53, 0x4f,
-	0x8f, 0xe6, 0x27, 0x9c, 0xaa, 0xa8, 0x92, 0x21, 0xcb, 0x1d, 0x02, 0xcf, 0x53, 0xf6, 0x9f, 0x00,
-	0x64, 0xe3, 0x52, 0xe0, 0x6f, 0xda, 0x72, 0xb6, 0x76, 0x32, 0x5b, 0x5b, 0xae, 0x88, 0x9a, 0xad,
-	0xbd, 0xe3, 0x06, 0x54, 0xd5, 0x3a, 0x5a, 0xa5, 0xf5, 0x0f, 0x82, 0xda, 0xf0, 0x1d, 0x4a, 0xa1,
-	0x47, 0x50, 0xcd, 0x88, 0xf2, 0x1a, 0x5a, 0x98, 0x5c, 0xae, 0xae, 0xbc, 0x53, 0x26, 0xd1, 0x76,
-	0x83, 0x46, 0x71, 0xb8, 0x17, 0xd2, 0x86, 0x26, 0xb6, 0xde, 0x00, 0x7f, 0x9a, 0x03, 0x5d, 0x11,
-	0xa0, 0x97, 0x4e, 0x05, 0x2d, 0xc1, 0xe8, 0xa8, 0xf1, 0x5d, 0x98, 0x3e, 0xa3, 0xae, 0x2a, 0xdf,
-	0xda, 0x80, 0xd7, 0x25, 0x5d, 0x91, 0x56, 0x20, 0xec, 0x6b, 0x30, 0x23, 0x5b, 0x64, 0x2b, 0xf5,
-	0x92, 0x0c, 0x6c, 0x37, 0xac, 0x9f, 0x10, 0x98, 0x65, 0xe5, 0x4a, 0xb3, 0x5b, 0x70, 0x59, 0x5b,
-	0xcb, 0x96, 0x1b, 0xef, 0x4b, 0xe1, 0x66, 0x9c, 0x4b, 0x59, 0x7c, 0x27, 0x09, 0x9f, 0xe7, 0xe6,
-	0x78, 0xf0, 0xc6, 0xc0, 0x54, 0x25, 0xe2, 0xcf, 0x63, 0x37, 0x4e, 0xf7, 0x00, 0x6f, 0x16, 0xbe,
-	0xa0, 0xad, 0xda, 0xbf, 0x47, 0xf3, 0x73, 0x3d, 0xb7, 0x79, 0x70, 0xcf, 0xca, 0x1d, 0x5b, 0x03,
-	0x6f, 0xab, 0x8f, 0xc0, 0x3a, 0xe9, 0x12, 0x25, 0x88, 0x0b, 0xd7, 0xc2, 0x17, 0x9b, 0xb1, 0xab,
-	0xb4, 0xe5, 0x49, 0x8a, 0x5a, 0xdb, 0x5b, 0x45, 0xd4, 0xb4, 0x65, 0xd2, 0x7a, 0x5e, 0x09, 0x8b,
-	0xc2, 0xe7, 0x29, 0xe4, 0xaf, 0x08, 0xde, 0x1c, 0x24, 0x99, 0xd0, 0x8a, 0x78, 0x87, 0xff, 0x8f,
-	0x62, 0xe2, 0x25, 0xb8, 0xd4, 0xa6, 0xdd, 0x90, 0x27, 0xa7, 0x51, 0xa7, 0xe9, 0xd1, 0xb6, 0x20,
-	0x33, 0xe5, 0x5c, 0x4c, 0xc3, 0x8f, 0x44, 0x34, 0x97, 0xa8, 0x11, 0xd3, 0x12, 0x15, 0xf2, 0x23,
-	0x04, 0x8b, 0xa7, 0x20, 0x57, 0x13, 0xda, 0x84, 0x64, 0x35, 0xe5, 0x49, 0x6e, 0x32, 0x73, 0xb6,
-	0x34, 0x66, 0x3b, 0x35, 0x66, 0xfb, 0xe3, 0xa8, 0xe7, 0x5c, 0xf4, 0x73, 0x6d, 0xf2, 0x2f, 0xa6,
-	0x92, 0x7f, 0x31, 0xd9, 0x68, 0x26, 0x4f, 0x1a, 0xcd, 0xd4, 0x38, 0xa3, 0x31, 0xe1, 0xfa, 0x00,
-	0xbf, 0x1d, 0xb7, 0xed, 0x36, 0xd3, 0x97, 0x6c, 0x7d, 0x99, 0x3e, 0xf5, 0xa1, 0x73, 0xc5, 0x7b,
-	0x1d, 0xa6, 0x5b, 0x22, 0xa2, 0xe8, 0x9a, 0x65, 0xce, 0xa6, 0xea, 0x54, 0xf6, 0xca, 0x6f, 0x33,
-	0x70, 0x41, 0x74, 0xc6, 0xbf, 0x20, 0x80, 0xac, 0x3d, 0xb6, 0xcb, 0x1a, 0x14, 0x7f, 0xc2, 0x0c,
-	0x32, 0x72, 0xbe, 0x44, 0x6c, 0x7d, 0xf0, 0xed, 0x9f, 0x7f, 0x7f, 0x5f, 0x59, 0xc3, 0xab, 0xe4,
-	0xd4, 0x0f, 0x2f, 0x27, 0x4f, 0x72, 0x0b, 0x77, 0x88, 0x7f, 0x44, 0x50, 0xd5, 0x1c, 0x0b, 0x8f,
-	0x7a, 0x7b, 0x2a, 0xa8, 0x71, 0x67, 0xf4, 0x02, 0x85, 0xf7, 0x6d, 0x81, 0x77, 0x11, 0xdf, 0x18,
-	0x01, 0x2f, 0xfe, 0x03, 0xc1, 0x2b, 0x43, 0xbe, 0x8a, 0xd7, 0x4e, 0xbe, 0xb4, 0xc4, 0xc6, 0x8d,
-	0xf5, 0xb3, 0x96, 0x29, 0xc4, 0x1f, 0x0a, 0xc4, 0x77, 0xf1, 0x7a, 0x29, 0x62, 0xb9, 0xea, 0x79,
-	0xa1, 0xd3, 0xf5, 0x3f, 0xc4, 0xcf, 0x11, 0x5c, 0x29, 0xf4, 0x43, 0xfc, 0xfe, 0x88, 0xea, 0x0d,
-	0x1b, 0xb5, 0x71, 0x6f, 0x9c, 0x52, 0x45, 0xe8, 0xa1, 0x20, 0xb4, 0x85, 0x3f, 0x1a, 0x63, 0x65,
-	0x88, 0xee, 0xd6, 0xf8, 0x87, 0x0a, 0xd4, 0xca, 0xbc, 0x04, 0x6f, 0x8c, 0x0a, 0xb1, 0xc8, 0x3c,
-	0x8d, 0xcd, 0x31, 0xab, 0x15, 0xc7, 0x6f, 0x04, 0xc7, 0x1e, 0xfe, 0x7a, 0x2c, 0x8e, 0x79, 0xeb,
-	0x23, 0xa9, 0x8d, 0x92, 0x27, 0x03, 0x86, 0x7c, 0x48, 0xa4, 0x5b, 0x69, 0x07, 0x32, 0x70, 0x88,
-	0x7f, 0x46, 0x70, 0x79, 0xd0, 0x66, 0xf0, 0xbb, 0x23, 0x92, 0xca, 0xb9, 0x96, 0xb1, 0x76, 0xc6,
-	0x2a, 0x25, 0xc1, 0x4d, 0x21, 0xc1, 0x02, 0x36, 0xcb, 0x24, 0x90, 0xde, 0xb5, 0xf5, 0xc5, 0xd3,
-	0xbe, 0x89, 0x9e, 0xf5, 0x4d, 0xf4, 0x57, 0xdf, 0x44, 0xdf, 0x1d, 0x9b, 0x13, 0xcf, 0x8e, 0xcd,
-	0x89, 0xe7, 0xc7, 0xe6, 0xc4, 0x57, 0x1b, 0x41, 0x18, 0xef, 0x77, 0x3c, 0xdb, 0x67, 0x4d, 0xa2,
-	0xfe, 0x47, 0x08, 0x3d, 0xff, 0x76, 0xc0, 0x48, 0xf7, 0x3d, 0xd2, 0x64, 0x8d, 0xce, 0x01, 0xe5,
-	0xb2, 0xf1, 0x9d, 0xd5, 0xdb, 0x5a, 0xef, 0xb8, 0xd7, 0xa2, 0xdc, 0x9b, 0x16, 0x9f, 0x88, 0xd5,
-	0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x40, 0x19, 0x02, 0xb1, 0x0c, 0x00, 0x00,
+	// 935 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
+	0x14, 0xce, 0x6c, 0xd2, 0x88, 0xbc, 0x0d, 0x6d, 0x19, 0xa5, 0xed, 0x62, 0x8a, 0x1b, 0x5c, 0xd2,
+	0xa4, 0x40, 0x67, 0xba, 0x09, 0x09, 0x05, 0x12, 0x04, 0xa9, 0x0a, 0xc9, 0xa5, 0x0a, 0x46, 0x02,
+	0x89, 0x4b, 0x64, 0x7b, 0x27, 0x8e, 0xa5, 0xac, 0x67, 0xbb, 0xe3, 0x5d, 0x14, 0x55, 0x11, 0x12,
+	0xbf, 0x00, 0x89, 0x0b, 0x97, 0x5e, 0x41, 0xe2, 0x1f, 0x20, 0x6e, 0x9c, 0x7a, 0xac, 0xc4, 0xa5,
+	0xa7, 0x0a, 0x25, 0x5c, 0xf9, 0x0f, 0x95, 0x67, 0xc6, 0xf5, 0x78, 0x77, 0x9d, 0xec, 0xae, 0x94,
+	0x9b, 0xf7, 0xcd, 0x7b, 0x6f, 0xbe, 0xef, 0x7b, 0xcf, 0x9f, 0x17, 0x9c, 0xc8, 0x0f, 0x68, 0xc0,
+	0xdb, 0x8c, 0x06, 0x3c, 0x8e, 0x59, 0x90, 0x44, 0x3c, 0xa6, 0xdd, 0x3a, 0x7d, 0xd4, 0x61, 0xed,
+	0x43, 0xd2, 0x6a, 0xf3, 0x84, 0xe3, 0xab, 0x91, 0x1f, 0x90, 0x34, 0x87, 0xe4, 0x39, 0xa4, 0x5b,
+	0xb7, 0xe6, 0x42, 0x1e, 0x72, 0x99, 0x42, 0xd3, 0x27, 0x95, 0x6d, 0xbd, 0x17, 0x70, 0xd1, 0xe4,
+	0x82, 0xfa, 0x9e, 0x60, 0xaa, 0x0d, 0xed, 0xd6, 0x7d, 0x96, 0x78, 0x75, 0xda, 0xf2, 0xc2, 0x28,
+	0xf6, 0x64, 0xb9, 0xca, 0xbd, 0x91, 0xdf, 0x7e, 0x10, 0xb1, 0x38, 0x49, 0x6f, 0x56, 0x4f, 0x3a,
+	0x61, 0xb1, 0x04, 0x9e, 0x01, 0x44, 0x25, 0x5e, 0x0f, 0x39, 0x0f, 0x0f, 0x18, 0xf5, 0x5a, 0x11,
+	0xf5, 0xe2, 0x98, 0x27, 0xf2, 0x1a, 0xa1, 0x4f, 0xdf, 0xd4, 0xa7, 0xf2, 0x97, 0xdf, 0xd9, 0xa3,
+	0x5e, 0xac, 0xc9, 0x39, 0x1b, 0x70, 0xf5, 0xeb, 0x14, 0xe4, 0xfd, 0x57, 0x1d, 0x5d, 0xf6, 0xa8,
+	0xc3, 0x44, 0x82, 0x6f, 0xc2, 0xeb, 0xf9, 0x35, 0xbb, 0x51, 0xa3, 0x86, 0xe6, 0xd1, 0xd2, 0x8c,
+	0x3b, 0x9b, 0x07, 0xb7, 0x1b, 0xce, 0x5f, 0x08, 0xae, 0xf5, 0xd5, 0x8b, 0x16, 0x8f, 0x05, 0xc3,
+	0x0f, 0x00, 0xf2, 0x5c, 0x59, 0x5d, 0x5d, 0x5e, 0x20, 0x83, 0xc5, 0x24, 0x79, 0xfd, 0x83, 0xb8,
+	0xe1, 0x1a, 0x85, 0x78, 0x0e, 0x2e, 0xb4, 0xda, 0x9c, 0xef, 0xd5, 0x2a, 0xf3, 0x68, 0x69, 0xd6,
+	0x55, 0x3f, 0xf0, 0x7d, 0x98, 0x95, 0x0f, 0xbb, 0xfb, 0x2c, 0x0a, 0xf7, 0x93, 0xda, 0xa4, 0x6c,
+	0x6f, 0x19, 0xed, 0x95, 0x8e, 0xdd, 0x3a, 0xd9, 0x92, 0x19, 0x9b, 0x53, 0x4f, 0x5f, 0xdc, 0x98,
+	0x70, 0xab, 0xb2, 0x4a, 0x85, 0x1c, 0xaf, 0x0f, 0xbc, 0xc8, 0xd8, 0x7f, 0x09, 0x90, 0x8f, 0x4b,
+	0x83, 0xbf, 0x45, 0xd4, 0x6c, 0x49, 0x3a, 0x5b, 0xa2, 0x56, 0x44, 0xcf, 0x96, 0xec, 0x78, 0x21,
+	0xd3, 0xb5, 0xae, 0x51, 0xe9, 0xfc, 0x8f, 0xa0, 0xd6, 0x7f, 0x87, 0x56, 0xe8, 0x21, 0x54, 0x73,
+	0xa2, 0xa2, 0x86, 0xe6, 0x27, 0x97, 0xaa, 0xcb, 0x1f, 0x94, 0x49, 0xb4, 0xdd, 0x60, 0x71, 0x12,
+	0xed, 0x45, 0xac, 0x61, 0x88, 0x6d, 0x36, 0xc0, 0x5f, 0x15, 0x40, 0x57, 0x24, 0xe8, 0xc5, 0x33,
+	0x41, 0x2b, 0x30, 0x26, 0x6a, 0x7c, 0x0f, 0xa6, 0x47, 0xd4, 0x55, 0xe7, 0x3b, 0xeb, 0xf0, 0xb6,
+	0xa2, 0x2b, 0xd3, 0x06, 0x08, 0xfb, 0x16, 0xcc, 0xa8, 0x16, 0xf9, 0x4a, 0xbd, 0xa6, 0x02, 0xdb,
+	0x0d, 0xe7, 0x37, 0x04, 0x76, 0x59, 0xb9, 0xd6, 0xec, 0x36, 0x5c, 0x36, 0xd6, 0xb2, 0xe5, 0x25,
+	0xfb, 0x4a, 0xb8, 0x19, 0xf7, 0x52, 0x1e, 0xdf, 0x49, 0xc3, 0xe7, 0xb9, 0x39, 0x5b, 0xf0, 0x4e,
+	0xcf, 0x54, 0x15, 0xe2, 0x6f, 0x12, 0x2f, 0x61, 0x23, 0xbd, 0x41, 0xc7, 0x08, 0x9c, 0xd3, 0x5a,
+	0x69, 0xda, 0x1e, 0x5c, 0x8b, 0x5e, 0xcd, 0x7f, 0x57, 0x2b, 0x28, 0xd2, 0x14, 0xbd, 0x9c, 0xb7,
+	0x07, 0x11, 0x30, 0x56, 0xc6, 0xe8, 0x79, 0x25, 0x1a, 0x14, 0x3e, 0x4f, 0xb9, 0x9e, 0x20, 0x78,
+	0xb7, 0x97, 0x64, 0x4a, 0x2b, 0x16, 0x1d, 0x31, 0xb2, 0x64, 0x78, 0x11, 0x2e, 0xb5, 0x59, 0x37,
+	0x12, 0x69, 0x4a, 0xdc, 0x69, 0xfa, 0xac, 0x2d, 0x21, 0x4f, 0xb9, 0x17, 0xb3, 0xf0, 0x43, 0x19,
+	0x2d, 0x24, 0x1a, 0xf0, 0x8d, 0x44, 0x8d, 0xef, 0x05, 0x82, 0x85, 0x33, 0xf0, 0xe9, 0x39, 0x6c,
+	0x40, 0xba, 0x66, 0xea, 0xa4, 0xa0, 0xff, 0x1c, 0x51, 0x26, 0x4b, 0x32, 0x93, 0x25, 0x5f, 0xc4,
+	0x87, 0xee, 0xc5, 0xa0, 0xd0, 0xa6, 0xb8, 0xfd, 0x95, 0xe2, 0xf6, 0xe7, 0x03, 0x98, 0x3c, 0x6d,
+	0x00, 0x53, 0xe3, 0x0c, 0xc0, 0x86, 0xeb, 0x3d, 0xfc, 0x76, 0xbc, 0xb6, 0xd7, 0xcc, 0xde, 0x4a,
+	0xe7, 0xbb, 0xec, 0xb5, 0xed, 0x3b, 0xd7, 0xbc, 0xd7, 0x60, 0xba, 0x25, 0x23, 0x9a, 0xae, 0x5d,
+	0xe6, 0x52, 0xba, 0x4e, 0x67, 0x2f, 0xff, 0x39, 0x03, 0x17, 0x64, 0x67, 0xfc, 0x07, 0x02, 0xc8,
+	0xdb, 0x63, 0x52, 0xd6, 0x60, 0xf0, 0xe7, 0xc8, 0xa2, 0x43, 0xe7, 0x2b, 0xc4, 0xce, 0xa7, 0x3f,
+	0xfd, 0xf3, 0xdf, 0x2f, 0x95, 0x55, 0xbc, 0x42, 0xcf, 0xfc, 0x88, 0x0a, 0xfa, 0xb8, 0xb0, 0x75,
+	0x47, 0xf8, 0x09, 0x82, 0xaa, 0xe1, 0x3e, 0x78, 0xd8, 0xdb, 0x33, 0x41, 0xad, 0xbb, 0xc3, 0x17,
+	0x68, 0xbc, 0xef, 0x4b, 0xbc, 0x0b, 0xf8, 0xe6, 0x10, 0x78, 0xf1, 0xdf, 0x08, 0xde, 0xe8, 0xf3,
+	0x48, 0xbc, 0x7a, 0xfa, 0xa5, 0x25, 0x96, 0x6c, 0xad, 0x8d, 0x5a, 0xa6, 0x11, 0x7f, 0x26, 0x11,
+	0xdf, 0xc3, 0x6b, 0xa5, 0x88, 0xd5, 0xaa, 0x17, 0x85, 0xce, 0xd6, 0xff, 0x08, 0x3f, 0x47, 0x70,
+	0x65, 0xa0, 0xeb, 0xe1, 0x8f, 0x87, 0x54, 0xaf, 0xdf, 0x74, 0xad, 0x4f, 0xc6, 0x29, 0xd5, 0x84,
+	0xb6, 0x24, 0xa1, 0x4d, 0xfc, 0xf9, 0x18, 0x2b, 0x43, 0x4d, 0x4f, 0xc6, 0xbf, 0x56, 0xa0, 0x56,
+	0xe6, 0x25, 0x78, 0x7d, 0x58, 0x88, 0x83, 0x2c, 0xd2, 0xda, 0x18, 0xb3, 0x5a, 0x73, 0xfc, 0x51,
+	0x72, 0x3c, 0xc4, 0x3f, 0x8c, 0xc5, 0xb1, 0x68, 0x7d, 0x34, 0xb3, 0x51, 0xfa, 0xb8, 0xc7, 0x90,
+	0x8f, 0xa8, 0x72, 0x2b, 0xe3, 0x40, 0x05, 0x8e, 0xf0, 0xef, 0x08, 0x2e, 0xf7, 0xda, 0x0c, 0xfe,
+	0x70, 0x48, 0x52, 0x05, 0xd7, 0xb2, 0x56, 0x47, 0xac, 0xd2, 0x12, 0xdc, 0x92, 0x12, 0xcc, 0x63,
+	0xbb, 0x4c, 0x02, 0xe5, 0x5d, 0x9b, 0xdf, 0x3e, 0x3d, 0xb6, 0xd1, 0xb3, 0x63, 0x1b, 0xfd, 0x7b,
+	0x6c, 0xa3, 0x9f, 0x4f, 0xec, 0x89, 0x67, 0x27, 0xf6, 0xc4, 0xf3, 0x13, 0x7b, 0xe2, 0xfb, 0xf5,
+	0x30, 0x4a, 0xf6, 0x3b, 0x3e, 0x09, 0x78, 0x93, 0xea, 0xff, 0xfb, 0x91, 0x1f, 0xdc, 0x09, 0x39,
+	0xed, 0x7e, 0x44, 0x9b, 0xbc, 0xd1, 0x39, 0x60, 0x42, 0x35, 0xbe, 0xbb, 0x72, 0xc7, 0xe8, 0x9d,
+	0x1c, 0xb6, 0x98, 0xf0, 0xa7, 0xe5, 0x27, 0x62, 0xe5, 0x65, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9,
+	0x35, 0x5d, 0x16, 0x7d, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/core/03-connection/types/tx.pb.go b/modules/core/03-connection/types/tx.pb.go
index acfeff2341d..6d3d80ca3b6 100644
--- a/modules/core/03-connection/types/tx.pb.go
+++ b/modules/core/03-connection/types/tx.pb.go
@@ -33,10 +33,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // MsgConnectionOpenInit defines the msg sent by an account on Chain A to
 // initialize a connection with Chain B.
 type MsgConnectionOpenInit struct {
-	ClientId     string       `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId     string       `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	Counterparty Counterparty `protobuf:"bytes,2,opt,name=counterparty,proto3" json:"counterparty"`
 	Version      *Version     `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
-	DelayPeriod  uint64       `protobuf:"varint,4,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"`
+	DelayPeriod  uint64       `protobuf:"varint,4,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"`
 	Signer       string       `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -114,22 +114,22 @@ var xxx_messageInfo_MsgConnectionOpenInitResponse proto.InternalMessageInfo
 // MsgConnectionOpenTry defines a msg sent by a Relayer to try to open a
 // connection on Chain B.
 type MsgConnectionOpenTry struct {
-	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
+	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
 	// Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC.
-	PreviousConnectionId string        `protobuf:"bytes,2,opt,name=previous_connection_id,json=previousConnectionId,proto3" json:"previous_connection_id,omitempty" yaml:"previous_connection_id"` // Deprecated: Do not use.
-	ClientState          *types.Any    `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
+	PreviousConnectionId string        `protobuf:"bytes,2,opt,name=previous_connection_id,json=previousConnectionId,proto3" json:"previous_connection_id,omitempty"` // Deprecated: Do not use.
+	ClientState          *types.Any    `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
 	Counterparty         Counterparty  `protobuf:"bytes,4,opt,name=counterparty,proto3" json:"counterparty"`
-	DelayPeriod          uint64        `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"`
-	CounterpartyVersions []*Version    `protobuf:"bytes,6,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty" yaml:"counterparty_versions"`
-	ProofHeight          types1.Height `protobuf:"bytes,7,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	DelayPeriod          uint64        `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"`
+	CounterpartyVersions []*Version    `protobuf:"bytes,6,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty"`
+	ProofHeight          types1.Height `protobuf:"bytes,7,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	// proof of the initialization the connection on Chain A: `UNITIALIZED ->
 	// INIT`
-	ProofInit []byte `protobuf:"bytes,8,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"`
+	ProofInit []byte `protobuf:"bytes,8,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"`
 	// proof of client state included in message
-	ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty" yaml:"proof_client"`
+	ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"`
 	// proof of client consensus state
-	ProofConsensus  []byte        `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty" yaml:"proof_consensus"`
-	ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height" yaml:"consensus_height"`
+	ProofConsensus  []byte        `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"`
+	ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`
 	Signer          string        `protobuf:"bytes,12,opt,name=signer,proto3" json:"signer,omitempty"`
 	// optional proof data for host state machines that are unable to introspect their own consensus state
 	HostConsensusStateProof []byte `protobuf:"bytes,13,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"`
@@ -208,19 +208,19 @@ var xxx_messageInfo_MsgConnectionOpenTryResponse proto.InternalMessageInfo
 // MsgConnectionOpenAck defines a msg sent by a Relayer to Chain A to
 // acknowledge the change of connection state to TRYOPEN on Chain B.
 type MsgConnectionOpenAck struct {
-	ConnectionId             string        `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
-	CounterpartyConnectionId string        `protobuf:"bytes,2,opt,name=counterparty_connection_id,json=counterpartyConnectionId,proto3" json:"counterparty_connection_id,omitempty" yaml:"counterparty_connection_id"`
+	ConnectionId             string        `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	CounterpartyConnectionId string        `protobuf:"bytes,2,opt,name=counterparty_connection_id,json=counterpartyConnectionId,proto3" json:"counterparty_connection_id,omitempty"`
 	Version                  *Version      `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
-	ClientState              *types.Any    `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
-	ProofHeight              types1.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	ClientState              *types.Any    `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
+	ProofHeight              types1.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	// proof of the initialization the connection on Chain B: `UNITIALIZED ->
 	// TRYOPEN`
-	ProofTry []byte `protobuf:"bytes,6,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty" yaml:"proof_try"`
+	ProofTry []byte `protobuf:"bytes,6,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty"`
 	// proof of client state included in message
-	ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty" yaml:"proof_client"`
+	ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"`
 	// proof of client consensus state
-	ProofConsensus  []byte        `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty" yaml:"proof_consensus"`
-	ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height" yaml:"consensus_height"`
+	ProofConsensus  []byte        `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"`
+	ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"`
 	Signer          string        `protobuf:"bytes,10,opt,name=signer,proto3" json:"signer,omitempty"`
 	// optional proof data for host state machines that are unable to introspect their own consensus state
 	HostConsensusStateProof []byte `protobuf:"bytes,11,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"`
@@ -299,10 +299,10 @@ var xxx_messageInfo_MsgConnectionOpenAckResponse proto.InternalMessageInfo
 // MsgConnectionOpenConfirm defines a msg sent by a Relayer to Chain B to
 // acknowledge the change of connection state to OPEN on Chain A.
 type MsgConnectionOpenConfirm struct {
-	ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
+	ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
 	// proof for the change of the connection state on Chain A: `INIT -> OPEN`
-	ProofAck    []byte        `protobuf:"bytes,2,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"`
-	ProofHeight types1.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	ProofAck    []byte        `protobuf:"bytes,2,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty"`
+	ProofHeight types1.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer      string        `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -391,68 +391,60 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/connection/v1/tx.proto", fileDescriptor_5d00fde5fc97399e) }
 
 var fileDescriptor_5d00fde5fc97399e = []byte{
-	// 965 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x31, 0x73, 0xe3, 0x44,
-	0x14, 0xb6, 0x62, 0xc7, 0xb1, 0xd7, 0x3e, 0xee, 0x6e, 0x71, 0x12, 0x21, 0xee, 0x2c, 0x23, 0x60,
-	0x48, 0x41, 0xa4, 0xf3, 0xdd, 0x31, 0x40, 0x80, 0x22, 0x76, 0x43, 0x8a, 0x83, 0x8c, 0xb8, 0xb9,
-	0x19, 0xae, 0xf1, 0xd8, 0xf2, 0x46, 0xd9, 0xb1, 0xad, 0xf5, 0x68, 0x65, 0x83, 0x68, 0x69, 0x18,
-	0x2a, 0x7e, 0x01, 0x73, 0xff, 0x81, 0x3f, 0x71, 0x65, 0x0a, 0x0a, 0x2a, 0x0d, 0x93, 0x34, 0xd4,
-	0xee, 0xe8, 0x98, 0xdd, 0x95, 0xe4, 0xb5, 0x23, 0x0f, 0x31, 0x0e, 0x9d, 0x9e, 0xde, 0xf7, 0xde,
-	0xdb, 0xf7, 0xf6, 0xfb, 0xde, 0x48, 0x40, 0xc7, 0x3d, 0xc7, 0x72, 0x88, 0x8f, 0x2c, 0x87, 0x78,
-	0x1e, 0x72, 0x02, 0x4c, 0x3c, 0x6b, 0xda, 0xb4, 0x82, 0xef, 0xcd, 0xb1, 0x4f, 0x02, 0x02, 0xf7,
-	0x70, 0xcf, 0x31, 0x19, 0xc0, 0x9c, 0x03, 0xcc, 0x69, 0x53, 0xab, 0xb9, 0xc4, 0x25, 0x1c, 0x62,
-	0xb1, 0x27, 0x81, 0xd6, 0xde, 0x72, 0x09, 0x71, 0x87, 0xc8, 0xe2, 0x56, 0x6f, 0x72, 0x66, 0x75,
-	0xbd, 0x30, 0x76, 0x49, 0x95, 0x86, 0x18, 0x79, 0x01, 0xab, 0x22, 0x9e, 0x62, 0xc0, 0x07, 0x2b,
-	0x8e, 0x22, 0xd5, 0xe5, 0x40, 0xe3, 0xb7, 0x2d, 0xb0, 0xfb, 0x8c, 0xba, 0xed, 0xf4, 0xfd, 0xd7,
-	0x63, 0xe4, 0x9d, 0x78, 0x38, 0x80, 0x4d, 0x50, 0x16, 0x29, 0x3b, 0xb8, 0xaf, 0x2a, 0x0d, 0xe5,
-	0xa0, 0xdc, 0xaa, 0xcd, 0x22, 0xfd, 0x5e, 0xd8, 0x1d, 0x0d, 0x8f, 0x8c, 0xd4, 0x65, 0xd8, 0x25,
-	0xf1, 0x7c, 0xd2, 0x87, 0x5f, 0x81, 0xaa, 0x43, 0x26, 0x5e, 0x80, 0xfc, 0x71, 0xd7, 0x0f, 0x42,
-	0x75, 0xab, 0xa1, 0x1c, 0x54, 0x1e, 0xbf, 0x67, 0x66, 0xb7, 0x6d, 0xb6, 0x25, 0x6c, 0xab, 0xf0,
-	0x3a, 0xd2, 0x73, 0xf6, 0x42, 0x3c, 0xfc, 0x14, 0xec, 0x4c, 0x91, 0x4f, 0x31, 0xf1, 0xd4, 0x3c,
-	0x4f, 0xa5, 0xaf, 0x4a, 0xf5, 0x42, 0xc0, 0xec, 0x04, 0x0f, 0x8f, 0x40, 0xb5, 0x8f, 0x86, 0xdd,
-	0xb0, 0x33, 0x46, 0x3e, 0x26, 0x7d, 0xb5, 0xd0, 0x50, 0x0e, 0x0a, 0xad, 0xfd, 0x59, 0xa4, 0xbf,
-	0x29, 0x1a, 0x90, 0xbd, 0x86, 0x5d, 0xe1, 0xe6, 0x29, 0xb7, 0xe0, 0x1e, 0x28, 0x52, 0xec, 0x7a,
-	0xc8, 0x57, 0xb7, 0x59, 0xdb, 0x76, 0x6c, 0x1d, 0x95, 0x7e, 0x7a, 0xa5, 0xe7, 0xfe, 0x7a, 0xa5,
-	0xe7, 0x0c, 0x1d, 0x3c, 0xcc, 0x1c, 0x9a, 0x8d, 0xe8, 0x98, 0x78, 0x14, 0x19, 0xbf, 0xef, 0x80,
-	0xda, 0x35, 0xc4, 0x73, 0x3f, 0xfc, 0x2f, 0x53, 0xfd, 0x16, 0xec, 0x8d, 0x7d, 0x34, 0xc5, 0x64,
-	0x42, 0x3b, 0xf3, 0xae, 0x59, 0xfc, 0x16, 0x8f, 0x7f, 0x77, 0x16, 0xe9, 0x0f, 0x45, 0x7c, 0x36,
-	0xce, 0x50, 0x15, 0xbb, 0x96, 0xb8, 0xe6, 0x47, 0x3a, 0xe9, 0xc3, 0x53, 0x50, 0x8d, 0x4b, 0xd2,
-	0xa0, 0x1b, 0xa0, 0x78, 0xca, 0x35, 0x53, 0x30, 0xcf, 0x4c, 0x98, 0x67, 0x1e, 0x7b, 0xa1, 0x3c,
-	0x3b, 0x39, 0xc6, 0xb0, 0x2b, 0xc2, 0xfc, 0x86, 0x59, 0xd7, 0x28, 0x50, 0xd8, 0x90, 0x02, 0xcb,
-	0xf7, 0xb8, 0xbd, 0xc6, 0x3d, 0x4e, 0xc1, 0xae, 0x9c, 0xab, 0x13, 0x73, 0x83, 0xaa, 0xc5, 0x46,
-	0xfe, 0x06, 0x64, 0x6a, 0x35, 0x66, 0x91, 0xfe, 0x20, 0xee, 0x38, 0x2b, 0x8f, 0x61, 0xd7, 0xe4,
-	0xf7, 0x71, 0x18, 0x85, 0x2f, 0x41, 0x75, 0xec, 0x13, 0x72, 0xd6, 0x39, 0x47, 0xd8, 0x3d, 0x0f,
-	0xd4, 0x1d, 0x3e, 0x03, 0x4d, 0x2a, 0x27, 0xa4, 0x3a, 0x6d, 0x9a, 0x5f, 0x72, 0x44, 0xeb, 0x6d,
-	0xd6, 0xf9, 0xbc, 0x27, 0x39, 0xda, 0xb0, 0x2b, 0xdc, 0x14, 0x48, 0xf8, 0x14, 0x00, 0xe1, 0xc5,
-	0x1e, 0x0e, 0xd4, 0x52, 0x43, 0x39, 0xa8, 0xb6, 0x76, 0x67, 0x91, 0x7e, 0x5f, 0x8e, 0x64, 0x3e,
-	0xc3, 0x2e, 0x73, 0x83, 0x6b, 0xf9, 0x28, 0x39, 0x91, 0xa8, 0xac, 0x96, 0x79, 0xdc, 0xfe, 0x72,
-	0x45, 0xe1, 0x4d, 0x2a, 0xb6, 0xb9, 0x05, 0xdb, 0xe0, 0x6e, 0xec, 0x65, 0xcc, 0xf6, 0xe8, 0x84,
-	0xaa, 0x80, 0x87, 0x6b, 0xb3, 0x48, 0xdf, 0x5b, 0x08, 0x4f, 0x00, 0x86, 0xfd, 0x86, 0xc8, 0x90,
-	0xbc, 0x80, 0x67, 0xe0, 0x5e, 0xea, 0x4d, 0xc6, 0x52, 0xf9, 0xd7, 0xb1, 0xe8, 0xf1, 0x58, 0xf6,
-	0x93, 0x4b, 0x58, 0xcc, 0x60, 0xd8, 0x77, 0xd3, 0x57, 0xf1, 0x78, 0xe6, 0xd2, 0xad, 0xca, 0xd2,
-	0x85, 0x9f, 0x01, 0xed, 0x9c, 0xd0, 0x60, 0x7e, 0x44, 0x41, 0xde, 0x0e, 0x3f, 0xa6, 0x7a, 0x87,
-	0xf5, 0x63, 0xef, 0x33, 0x44, 0x7a, 0x64, 0x4e, 0xe7, 0x53, 0xe6, 0x96, 0x74, 0x5f, 0x07, 0x0f,
-	0xb2, 0x54, 0x9d, 0xca, 0xfe, 0xd7, 0x62, 0x86, 0xec, 0x8f, 0x9d, 0x01, 0xfc, 0x02, 0xdc, 0x59,
-	0x94, 0xae, 0x90, 0xbe, 0x3a, 0x8b, 0xf4, 0x5a, 0xda, 0x9c, 0xa4, 0x58, 0xa6, 0x02, 0x49, 0xa7,
-	0x0e, 0xd0, 0x16, 0x18, 0x98, 0xb5, 0x06, 0xde, 0x9f, 0x45, 0xfa, 0x3b, 0x19, 0x6c, 0x5d, 0x4a,
-	0xac, 0xca, 0xce, 0x85, 0x65, 0xb0, 0xc1, 0xb6, 0x5d, 0xde, 0x23, 0x85, 0x8d, 0xf7, 0xc8, 0xb2,
-	0x86, 0xb6, 0x6f, 0x51, 0x43, 0x4d, 0x20, 0xa4, 0xd1, 0x09, 0xfc, 0x50, 0x2d, 0x72, 0x2e, 0x4b,
-	0x3b, 0x38, 0x75, 0x19, 0x76, 0x89, 0x3f, 0xb3, 0xb5, 0xbd, 0x2c, 0xa0, 0x9d, 0xcd, 0x04, 0x54,
-	0xba, 0x15, 0x01, 0x95, 0xff, 0x57, 0x01, 0x81, 0x35, 0x04, 0x54, 0xd9, 0x44, 0x40, 0xc7, 0xce,
-	0x20, 0x15, 0xd0, 0xcf, 0x5b, 0x40, 0xbd, 0x06, 0x68, 0x13, 0xef, 0x0c, 0xfb, 0xa3, 0x4d, 0x45,
-	0x94, 0x5e, 0x7b, 0xd7, 0x19, 0x70, 0xcd, 0x64, 0x5c, 0x7b, 0xd7, 0x19, 0x24, 0xd7, 0xce, 0x64,
-	0xbb, 0xcc, 0xc2, 0xfc, 0x2d, 0xb2, 0x70, 0x3e, 0xe9, 0xc2, 0x8a, 0xaf, 0x0c, 0x03, 0x34, 0x56,
-	0xcd, 0x22, 0x19, 0xd8, 0xe3, 0xbf, 0xf3, 0x20, 0xff, 0x8c, 0xba, 0xf0, 0x07, 0x00, 0x33, 0xbe,
-	0xe1, 0x0e, 0x57, 0x29, 0x38, 0xf3, 0xeb, 0x45, 0xfb, 0x68, 0x2d, 0x78, 0x72, 0x06, 0xf8, 0x1d,
-	0xb8, 0x7f, 0xfd, 0x43, 0xe7, 0xc3, 0x1b, 0xe7, 0x7a, 0xee, 0x87, 0xda, 0xd3, 0x75, 0xd0, 0xab,
-	0x0b, 0xb3, 0x3b, 0xbb, 0x79, 0xe1, 0x63, 0x67, 0xb0, 0x46, 0x61, 0x89, 0xa6, 0xf0, 0x47, 0x05,
-	0xec, 0x66, 0x73, 0xf4, 0xd1, 0x8d, 0xf3, 0xc5, 0x11, 0xda, 0x27, 0xeb, 0x46, 0x24, 0xa7, 0x68,
-	0xbd, 0x78, 0x7d, 0x59, 0x57, 0x2e, 0x2e, 0xeb, 0xca, 0x9f, 0x97, 0x75, 0xe5, 0x97, 0xab, 0x7a,
-	0xee, 0xe2, 0xaa, 0x9e, 0xfb, 0xe3, 0xaa, 0x9e, 0x7b, 0xf9, 0xb9, 0x8b, 0x83, 0xf3, 0x49, 0xcf,
-	0x74, 0xc8, 0xc8, 0x72, 0x08, 0x1d, 0x11, 0x6a, 0xe1, 0x9e, 0x73, 0xe8, 0x12, 0x6b, 0xfa, 0xb1,
-	0x35, 0x22, 0xfd, 0xc9, 0x10, 0x51, 0xf1, 0x7b, 0xf0, 0xe8, 0xc9, 0xa1, 0xf4, 0x87, 0x10, 0x84,
-	0x63, 0x44, 0x7b, 0x45, 0xbe, 0xaf, 0x9f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x40, 0xa4, 0x36,
-	0x0d, 0xd0, 0x0c, 0x00, 0x00,
+	// 833 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x4d, 0x6f, 0xda, 0x48,
+	0x18, 0xc7, 0x71, 0x78, 0x09, 0x0c, 0x64, 0xb3, 0x3b, 0x22, 0x59, 0xaf, 0xb3, 0x01, 0xc2, 0xae,
+	0x14, 0x0e, 0x1b, 0x3b, 0x2f, 0xbb, 0x4a, 0x76, 0x37, 0x17, 0xc2, 0xa5, 0x51, 0x95, 0x36, 0x72,
+	0xa3, 0x1c, 0x7a, 0x41, 0x60, 0x26, 0x66, 0x04, 0x78, 0x2c, 0x8f, 0xa1, 0x75, 0xaf, 0xed, 0xa1,
+	0xc7, 0x7e, 0x84, 0x7c, 0x97, 0x1e, 0x1a, 0xa9, 0x97, 0x1c, 0x7b, 0xaa, 0xaa, 0xe4, 0xd2, 0xaf,
+	0xd0, 0x5b, 0xe5, 0x19, 0x1b, 0x0c, 0x98, 0xca, 0x84, 0x9b, 0xfd, 0xf8, 0xff, 0xbc, 0xff, 0xec,
+	0x31, 0x28, 0xe2, 0xa6, 0xa6, 0x68, 0xc4, 0x42, 0x8a, 0x46, 0x0c, 0x03, 0x69, 0x36, 0x26, 0x86,
+	0x32, 0xd8, 0x53, 0xec, 0x97, 0xb2, 0x69, 0x11, 0x9b, 0xc0, 0x75, 0xdc, 0xd4, 0x64, 0x57, 0x20,
+	0x8f, 0x04, 0xf2, 0x60, 0x4f, 0xca, 0xeb, 0x44, 0x27, 0x4c, 0xa2, 0xb8, 0x57, 0x5c, 0x2d, 0xfd,
+	0xa6, 0x13, 0xa2, 0x77, 0x91, 0xc2, 0xee, 0x9a, 0xfd, 0x2b, 0xa5, 0x61, 0x38, 0xde, 0xa3, 0x40,
+	0xa6, 0x2e, 0x46, 0x86, 0xed, 0x66, 0xe1, 0x57, 0x9e, 0x60, 0x7b, 0x46, 0x29, 0x81, 0xbc, 0x4c,
+	0x58, 0x7e, 0xb3, 0x04, 0xd6, 0xce, 0xa8, 0x5e, 0x1b, 0xda, 0x9f, 0x9a, 0xc8, 0x38, 0x35, 0xb0,
+	0x0d, 0x37, 0x40, 0x86, 0x87, 0xac, 0xe3, 0x96, 0x28, 0x94, 0x84, 0x4a, 0x46, 0x4d, 0x73, 0xc3,
+	0x69, 0x0b, 0x3e, 0x01, 0x39, 0x8d, 0xf4, 0x0d, 0x1b, 0x59, 0x66, 0xc3, 0xb2, 0x1d, 0x71, 0xa9,
+	0x24, 0x54, 0xb2, 0xfb, 0x7f, 0xca, 0xe1, 0x0d, 0xca, 0xb5, 0x80, 0xf6, 0x24, 0x71, 0xf3, 0xb9,
+	0x18, 0x53, 0xc7, 0xfc, 0xe1, 0xbf, 0x60, 0x79, 0x80, 0x2c, 0x8a, 0x89, 0x21, 0xc6, 0x59, 0xa8,
+	0xe2, 0xac, 0x50, 0x97, 0x5c, 0xa6, 0xfa, 0x7a, 0xb8, 0x05, 0x72, 0x2d, 0xd4, 0x6d, 0x38, 0x75,
+	0x13, 0x59, 0x98, 0xb4, 0xc4, 0x44, 0x49, 0xa8, 0x24, 0xd4, 0x2c, 0xb3, 0x9d, 0x33, 0x13, 0x5c,
+	0x07, 0x29, 0x8a, 0x75, 0x03, 0x59, 0x62, 0x92, 0xf5, 0xe1, 0xdd, 0xfd, 0x97, 0x7e, 0x7b, 0x5d,
+	0x8c, 0x7d, 0xbd, 0x2e, 0xc6, 0xca, 0x45, 0xb0, 0x19, 0x3a, 0x05, 0x15, 0x51, 0x93, 0x18, 0x14,
+	0x95, 0x3f, 0x26, 0x41, 0x7e, 0x4a, 0x71, 0x61, 0x39, 0x3f, 0x1e, 0xd3, 0x11, 0x58, 0x37, 0x2d,
+	0x34, 0xc0, 0xa4, 0x4f, 0xeb, 0xa3, 0x36, 0x5c, 0xa5, 0x3b, 0xb0, 0xcc, 0xc9, 0x92, 0x28, 0xa8,
+	0x79, 0x5f, 0x31, 0x8a, 0x7d, 0xda, 0x82, 0x87, 0x20, 0xe7, 0x85, 0xa5, 0x76, 0xc3, 0x46, 0xde,
+	0x54, 0xf2, 0x32, 0x67, 0x42, 0xf6, 0x99, 0x90, 0xab, 0x86, 0xa3, 0x66, 0xb9, 0xf2, 0x99, 0x2b,
+	0x9c, 0xda, 0x4c, 0x62, 0xc1, 0xcd, 0x4c, 0x8e, 0x37, 0x39, 0x3d, 0xde, 0x0b, 0xb0, 0x16, 0x74,
+	0xa9, 0x7b, 0x9b, 0xa1, 0x62, 0xaa, 0x14, 0x8f, 0xb2, 0xca, 0x7c, 0xd0, 0xdb, 0x33, 0x52, 0x58,
+	0x03, 0x39, 0xd3, 0x22, 0xe4, 0xaa, 0xde, 0x46, 0x58, 0x6f, 0xdb, 0xe2, 0x32, 0x6b, 0x44, 0x0a,
+	0x04, 0xe3, 0xc0, 0x0f, 0xf6, 0xe4, 0x47, 0x4c, 0xe1, 0x95, 0x9f, 0x65, 0x5e, 0xdc, 0x04, 0x37,
+	0x01, 0xe0, 0x41, 0xb0, 0x81, 0x6d, 0x31, 0x5d, 0x12, 0x2a, 0x39, 0x35, 0xc3, 0x2c, 0x8c, 0xf1,
+	0x2d, 0x3f, 0x07, 0x8f, 0x25, 0x66, 0x98, 0x80, 0x47, 0xa8, 0x31, 0x13, 0xdc, 0x06, 0xab, 0x9e,
+	0xc4, 0xe5, 0xc0, 0xa0, 0x7d, 0x2a, 0x02, 0xa6, 0xfa, 0x89, 0xab, 0x7c, 0x2b, 0x7c, 0x0c, 0x7e,
+	0x1e, 0x4a, 0xfc, 0x9a, 0xb3, 0x11, 0x6b, 0x5e, 0x1d, 0x7a, 0x7a, 0x75, 0x8f, 0x88, 0xcd, 0x05,
+	0x89, 0x85, 0xff, 0x03, 0xa9, 0x4d, 0xa8, 0x3d, 0x2a, 0x86, 0xe3, 0x51, 0x67, 0xb5, 0x88, 0x2b,
+	0xac, 0xb0, 0x5f, 0x5d, 0xc5, 0xb0, 0x2e, 0x46, 0xc5, 0xb9, 0xfb, 0x38, 0x80, 0x7b, 0x01, 0xfc,
+	0x1e, 0x06, 0xf3, 0x90, 0xf6, 0x0f, 0x89, 0x10, 0xda, 0xab, 0x5a, 0x07, 0xfe, 0x01, 0x56, 0xc6,
+	0x39, 0xe6, 0xc4, 0xe7, 0xb4, 0x20, 0xbb, 0xc7, 0x40, 0x1a, 0xe3, 0x21, 0x84, 0x7c, 0x55, 0x0c,
+	0x2a, 0xc6, 0xc8, 0x5f, 0xe0, 0x53, 0x30, 0xf9, 0xd2, 0x24, 0xa2, 0xbe, 0x34, 0x93, 0xac, 0x25,
+	0x1f, 0xc2, 0xda, 0x06, 0xe0, 0x64, 0xd5, 0x6d, 0xcb, 0x11, 0x53, 0x6c, 0x15, 0x69, 0x66, 0x70,
+	0x3f, 0x13, 0x93, 0xa4, 0x2d, 0x47, 0x22, 0x2d, 0x1d, 0x99, 0xb4, 0xcc, 0xe2, 0xa4, 0x81, 0x39,
+	0x48, 0xcb, 0x2e, 0x42, 0x5a, 0x55, 0xeb, 0x0c, 0x49, 0x7b, 0x2f, 0x00, 0x71, 0x4a, 0x50, 0x23,
+	0xc6, 0x15, 0xb6, 0x7a, 0xd1, 0x68, 0x1b, 0x8e, 0xbd, 0xa1, 0x75, 0x18, 0x5c, 0xfe, 0xd8, 0x5d,
+	0x5e, 0x27, 0x17, 0x1b, 0x7f, 0xc8, 0x62, 0x47, 0x23, 0x4a, 0xcc, 0x38, 0x3e, 0xca, 0xa0, 0x34,
+	0xab, 0x09, 0xbf, 0xd3, 0xfd, 0x6f, 0x71, 0x10, 0x3f, 0xa3, 0x3a, 0x7c, 0x05, 0x60, 0xc8, 0x69,
+	0xbb, 0x33, 0x0b, 0xf2, 0xd0, 0x63, 0x49, 0xfa, 0x67, 0x2e, 0xb9, 0x5f, 0x03, 0x7c, 0x01, 0x7e,
+	0x99, 0x3e, 0xc1, 0xfe, 0x8a, 0x1c, 0xeb, 0xc2, 0x72, 0xa4, 0xbf, 0xe7, 0x51, 0xcf, 0x4e, 0xec,
+	0x2e, 0x27, 0x7a, 0xe2, 0xaa, 0xd6, 0x99, 0x23, 0x71, 0x80, 0x2f, 0xf8, 0x5a, 0x00, 0x6b, 0xe1,
+	0x70, 0xed, 0x46, 0x8e, 0xe7, 0x79, 0x48, 0x47, 0xf3, 0x7a, 0xf8, 0x55, 0x9c, 0x5c, 0xde, 0xdc,
+	0x15, 0x84, 0xdb, 0xbb, 0x82, 0xf0, 0xe5, 0xae, 0x20, 0xbc, 0xbb, 0x2f, 0xc4, 0x6e, 0xef, 0x0b,
+	0xb1, 0x4f, 0xf7, 0x85, 0xd8, 0xf3, 0x63, 0x1d, 0xdb, 0xed, 0x7e, 0x53, 0xd6, 0x48, 0x4f, 0xd1,
+	0x08, 0xed, 0x11, 0xaa, 0xe0, 0xa6, 0xb6, 0xa3, 0x13, 0x65, 0x70, 0xa8, 0xf4, 0x48, 0xab, 0xdf,
+	0x45, 0x94, 0xff, 0xc8, 0xed, 0x1e, 0xec, 0x04, 0xfe, 0xe5, 0x6c, 0xc7, 0x44, 0xb4, 0x99, 0x62,
+	0x9f, 0xb4, 0x83, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xc7, 0x72, 0x20, 0x7a, 0x0a, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/core/04-channel/types/channel.pb.go b/modules/core/04-channel/types/channel.pb.go
index ef0929bbac3..594a4e93470 100644
--- a/modules/core/04-channel/types/channel.pb.go
+++ b/modules/core/04-channel/types/channel.pb.go
@@ -112,7 +112,7 @@ type Channel struct {
 	Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"`
 	// list of connection identifiers, in order, along which packets sent on
 	// this channel will travel
-	ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty" yaml:"connection_hops"`
+	ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty"`
 	// opaque channel version, which is agreed upon during the handshake
 	Version string `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
 }
@@ -161,7 +161,7 @@ type IdentifiedChannel struct {
 	Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"`
 	// list of connection identifiers, in order, along which packets sent on
 	// this channel will travel
-	ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty" yaml:"connection_hops"`
+	ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty"`
 	// opaque channel version, which is agreed upon during the handshake
 	Version string `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
 	// port identifier
@@ -206,9 +206,9 @@ var xxx_messageInfo_IdentifiedChannel proto.InternalMessageInfo
 // Counterparty defines a channel end counterparty
 type Counterparty struct {
 	// port on the counterparty chain which owns the other end of the channel.
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// channel end on the counterparty chain
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 }
 
 func (m *Counterparty) Reset()         { *m = Counterparty{} }
@@ -251,19 +251,19 @@ type Packet struct {
 	// with a later sequence number.
 	Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	// identifies the port on the sending chain.
-	SourcePort string `protobuf:"bytes,2,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"`
+	SourcePort string `protobuf:"bytes,2,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"`
 	// identifies the channel end on the sending chain.
-	SourceChannel string `protobuf:"bytes,3,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"`
+	SourceChannel string `protobuf:"bytes,3,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"`
 	// identifies the port on the receiving chain.
-	DestinationPort string `protobuf:"bytes,4,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty" yaml:"destination_port"`
+	DestinationPort string `protobuf:"bytes,4,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"`
 	// identifies the channel end on the receiving chain.
-	DestinationChannel string `protobuf:"bytes,5,opt,name=destination_channel,json=destinationChannel,proto3" json:"destination_channel,omitempty" yaml:"destination_channel"`
+	DestinationChannel string `protobuf:"bytes,5,opt,name=destination_channel,json=destinationChannel,proto3" json:"destination_channel,omitempty"`
 	// actual opaque bytes transferred directly to the application module
 	Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
 	// block height after which the packet times out
-	TimeoutHeight types.Height `protobuf:"bytes,7,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"`
+	TimeoutHeight types.Height `protobuf:"bytes,7,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height"`
 	// block timestamp (in nanoseconds) after which the packet times out
-	TimeoutTimestamp uint64 `protobuf:"varint,8,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"`
+	TimeoutTimestamp uint64 `protobuf:"varint,8,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"`
 }
 
 func (m *Packet) Reset()         { *m = Packet{} }
@@ -305,9 +305,9 @@ var xxx_messageInfo_Packet proto.InternalMessageInfo
 // state as a commitment, acknowledgement, or a receipt.
 type PacketState struct {
 	// channel port identifier.
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// channel unique identifier.
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// packet sequence.
 	Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	// embedded data that represents packet state.
@@ -352,9 +352,9 @@ var xxx_messageInfo_PacketState proto.InternalMessageInfo
 // Destination chains refer to packets by destination port/channel
 type PacketId struct {
 	// channel port identifier
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// channel unique identifier
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// packet sequence
 	Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
 }
@@ -501,65 +501,58 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/channel/v1/channel.proto", fileDescriptor_c3a07336710636a0) }
 
 var fileDescriptor_c3a07336710636a0 = []byte{
-	// 925 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcd, 0x8e, 0x1a, 0x47,
-	0x10, 0x66, 0x60, 0xf8, 0x2b, 0x16, 0x96, 0x6d, 0x67, 0xf1, 0x64, 0x62, 0x33, 0x78, 0x94, 0xc3,
-	0xca, 0x91, 0xc1, 0xeb, 0x58, 0xb1, 0xe2, 0x53, 0x96, 0x1f, 0x6b, 0x47, 0xb1, 0x60, 0x35, 0xb0,
-	0x87, 0xf8, 0x42, 0x60, 0xa6, 0x03, 0x23, 0xc3, 0x34, 0x99, 0x69, 0x58, 0xed, 0x1b, 0x58, 0x5c,
-	0x92, 0x17, 0x40, 0x8a, 0x14, 0x25, 0xaf, 0x90, 0x57, 0xf0, 0xd1, 0xc7, 0x9c, 0x50, 0xb4, 0x7b,
-	0xc8, 0x9d, 0x17, 0x48, 0x34, 0xdd, 0x3d, 0xfc, 0xac, 0xad, 0x3d, 0x26, 0x17, 0x9f, 0xe8, 0xaa,
-	0xef, 0xab, 0xaa, 0x6f, 0xaa, 0x8a, 0x56, 0xc3, 0x03, 0xa7, 0x6f, 0x55, 0x2c, 0xe2, 0xe1, 0x8a,
-	0x35, 0xec, 0xb9, 0x2e, 0x1e, 0x55, 0x66, 0xc7, 0xe1, 0xb1, 0x3c, 0xf1, 0x08, 0x25, 0xe8, 0x8e,
-	0xd3, 0xb7, 0xca, 0x01, 0xa5, 0x1c, 0xfa, 0x67, 0xc7, 0xea, 0x27, 0x03, 0x32, 0x20, 0x0c, 0xaf,
-	0x04, 0x27, 0x4e, 0x55, 0xb5, 0x4d, 0xb6, 0x91, 0x83, 0x5d, 0xca, 0x92, 0xb1, 0x13, 0x27, 0xe8,
-	0xbf, 0x45, 0x21, 0x59, 0xe3, 0x59, 0xd0, 0x63, 0x88, 0xfb, 0xb4, 0x47, 0xb1, 0x22, 0x95, 0xa4,
-	0xa3, 0xdc, 0x13, 0xb5, 0xfc, 0x81, 0x3a, 0xe5, 0x76, 0xc0, 0x30, 0x39, 0x11, 0x7d, 0x05, 0x29,
-	0xe2, 0xd9, 0xd8, 0x73, 0xdc, 0x81, 0x12, 0xbd, 0x25, 0xa8, 0x15, 0x90, 0xcc, 0x35, 0x17, 0x7d,
-	0x0b, 0x7b, 0x16, 0x99, 0xba, 0x14, 0x7b, 0x93, 0x9e, 0x47, 0x2f, 0x95, 0x58, 0x49, 0x3a, 0xca,
-	0x3c, 0x79, 0xf0, 0xc1, 0xd8, 0xda, 0x16, 0xb1, 0x2a, 0xbf, 0x5d, 0x6a, 0x11, 0x73, 0x27, 0x18,
-	0xd5, 0x60, 0xdf, 0x22, 0xae, 0x8b, 0x2d, 0xea, 0x10, 0xb7, 0x3b, 0x24, 0x13, 0x5f, 0x91, 0x4b,
-	0xb1, 0xa3, 0x74, 0x55, 0x5d, 0x2d, 0xb5, 0xc2, 0x65, 0x6f, 0x3c, 0x7a, 0xae, 0xdf, 0x20, 0xe8,
-	0x66, 0x6e, 0xe3, 0x39, 0x25, 0x13, 0x1f, 0x29, 0x90, 0x9c, 0x61, 0xcf, 0x77, 0x88, 0xab, 0xc4,
-	0x4b, 0xd2, 0x51, 0xda, 0x0c, 0xcd, 0xe7, 0xf2, 0x9b, 0x5f, 0xb4, 0x88, 0xfe, 0x77, 0x14, 0x0e,
-	0x0c, 0x1b, 0xbb, 0xd4, 0xf9, 0xc1, 0xc1, 0xf6, 0xc7, 0x8e, 0xdd, 0xd2, 0x31, 0x74, 0x17, 0x92,
-	0x13, 0xe2, 0xd1, 0xae, 0x63, 0x2b, 0x09, 0x86, 0x24, 0x02, 0xd3, 0xb0, 0xd1, 0x7d, 0x00, 0x21,
-	0x33, 0xc0, 0x92, 0x0c, 0x4b, 0x0b, 0x8f, 0x61, 0x8b, 0x4e, 0x5f, 0xc0, 0xde, 0xf6, 0x07, 0xa0,
-	0x2f, 0x36, 0xd9, 0x82, 0x2e, 0xa7, 0xab, 0x68, 0xb5, 0xd4, 0x72, 0x5c, 0xa4, 0x00, 0xf4, 0x75,
-	0x85, 0xa7, 0x3b, 0x15, 0xa2, 0x8c, 0x7f, 0xb8, 0x5a, 0x6a, 0x07, 0xe2, 0xa3, 0xd6, 0x98, 0xfe,
-	0x7e, 0xe1, 0x7f, 0x62, 0x90, 0x38, 0xeb, 0x59, 0xaf, 0x31, 0x45, 0x2a, 0xa4, 0x7c, 0xfc, 0xe3,
-	0x14, 0xbb, 0x16, 0x1f, 0xad, 0x6c, 0xae, 0x6d, 0xf4, 0x0c, 0x32, 0x3e, 0x99, 0x7a, 0x16, 0xee,
-	0x06, 0x35, 0x45, 0x8d, 0xc2, 0x6a, 0xa9, 0x21, 0x5e, 0x63, 0x0b, 0xd4, 0x4d, 0xe0, 0xd6, 0x19,
-	0xf1, 0x28, 0xfa, 0x06, 0x72, 0x02, 0x13, 0x95, 0xd9, 0x10, 0xd3, 0xd5, 0x4f, 0x57, 0x4b, 0xed,
-	0x70, 0x27, 0x56, 0xe0, 0xba, 0x99, 0xe5, 0x8e, 0x70, 0xdd, 0x5e, 0x40, 0xde, 0xc6, 0x3e, 0x75,
-	0xdc, 0x1e, 0x9b, 0x0b, 0xab, 0x2f, 0xb3, 0x1c, 0x9f, 0xad, 0x96, 0xda, 0x5d, 0x9e, 0xe3, 0x26,
-	0x43, 0x37, 0xf7, 0xb7, 0x5c, 0x4c, 0x49, 0x0b, 0xee, 0x6c, 0xb3, 0x42, 0x39, 0x6c, 0x8c, 0xd5,
-	0xe2, 0x6a, 0xa9, 0xa9, 0xef, 0xa7, 0x5a, 0x6b, 0x42, 0x5b, 0xde, 0x50, 0x18, 0x02, 0xd9, 0xee,
-	0xd1, 0x1e, 0x1b, 0xf7, 0x9e, 0xc9, 0xce, 0xe8, 0x7b, 0xc8, 0x51, 0x67, 0x8c, 0xc9, 0x94, 0x76,
-	0x87, 0xd8, 0x19, 0x0c, 0x29, 0x1b, 0x78, 0x66, 0x67, 0xdf, 0xf9, 0x4d, 0x34, 0x3b, 0x2e, 0x9f,
-	0x32, 0x46, 0xf5, 0x7e, 0xb0, 0xac, 0x9b, 0x76, 0xec, 0xc6, 0xeb, 0x66, 0x56, 0x38, 0x38, 0x1b,
-	0x19, 0x70, 0x10, 0x32, 0x82, 0x5f, 0x9f, 0xf6, 0xc6, 0x13, 0x25, 0x15, 0x8c, 0xab, 0x7a, 0x6f,
-	0xb5, 0xd4, 0x94, 0xdd, 0x24, 0x6b, 0x8a, 0x6e, 0xe6, 0x85, 0xaf, 0x13, 0xba, 0xc4, 0x06, 0xfc,
-	0x2e, 0x41, 0x86, 0x6f, 0x00, 0xfb, 0xcf, 0xfe, 0x07, 0xab, 0xb7, 0xb3, 0x69, 0xb1, 0x1b, 0x9b,
-	0x16, 0x76, 0x55, 0xde, 0x74, 0x55, 0x08, 0xfd, 0x49, 0x82, 0x14, 0x17, 0x6a, 0xd8, 0xff, 0xb3,
-	0x4a, 0xa1, 0xa8, 0x05, 0xfb, 0x27, 0xd6, 0x6b, 0x97, 0x5c, 0x8c, 0xb0, 0x3d, 0xc0, 0x63, 0xec,
-	0x52, 0xa4, 0x40, 0xc2, 0xc3, 0xfe, 0x74, 0x44, 0x95, 0xc3, 0xe0, 0x03, 0x4e, 0x23, 0xa6, 0xb0,
-	0x51, 0x01, 0xe2, 0xd8, 0xf3, 0x88, 0xa7, 0x14, 0x82, 0xfa, 0xa7, 0x11, 0x93, 0x9b, 0x55, 0x80,
-	0x94, 0x87, 0xfd, 0x09, 0x71, 0x7d, 0xfc, 0xf0, 0x0f, 0x09, 0xe2, 0x6d, 0x71, 0x65, 0x6a, 0xed,
-	0xce, 0x49, 0xa7, 0xd1, 0x3d, 0x6f, 0x1a, 0x4d, 0xa3, 0x63, 0x9c, 0xbc, 0x34, 0x5e, 0x35, 0xea,
-	0xdd, 0xf3, 0x66, 0xfb, 0xac, 0x51, 0x33, 0x5e, 0x18, 0x8d, 0x7a, 0x3e, 0xa2, 0x1e, 0xcc, 0x17,
-	0xa5, 0xec, 0x0e, 0x01, 0x29, 0x00, 0x3c, 0x2e, 0x70, 0xe6, 0x25, 0x35, 0x35, 0x5f, 0x94, 0xe4,
-	0xe0, 0x8c, 0x8a, 0x90, 0xe5, 0x48, 0xc7, 0xfc, 0xae, 0x75, 0xd6, 0x68, 0xe6, 0xa3, 0x6a, 0x66,
-	0xbe, 0x28, 0x25, 0x85, 0xb9, 0x89, 0x64, 0x60, 0x8c, 0x47, 0x32, 0xe4, 0x1e, 0xec, 0x71, 0xa4,
-	0xf6, 0xb2, 0xd5, 0x6e, 0xd4, 0xf3, 0xb2, 0x0a, 0xf3, 0x45, 0x29, 0xc1, 0x2d, 0x55, 0x7e, 0xf3,
-	0x6b, 0x31, 0xf2, 0xf0, 0x02, 0xe2, 0xec, 0xf6, 0x46, 0x9f, 0x43, 0xa1, 0x65, 0xd6, 0x1b, 0x66,
-	0xb7, 0xd9, 0x6a, 0x36, 0x6e, 0xe8, 0x65, 0x29, 0x03, 0x3f, 0xd2, 0x61, 0x9f, 0xb3, 0xce, 0x9b,
-	0xec, 0xb7, 0x51, 0xcf, 0x4b, 0x6a, 0x76, 0xbe, 0x28, 0xa5, 0xd7, 0x8e, 0x40, 0x30, 0xe7, 0x84,
-	0x0c, 0x21, 0x58, 0x98, 0xbc, 0x70, 0xb5, 0xfd, 0xf6, 0xaa, 0x28, 0xbd, 0xbb, 0x2a, 0x4a, 0x7f,
-	0x5d, 0x15, 0xa5, 0x9f, 0xaf, 0x8b, 0x91, 0x77, 0xd7, 0xc5, 0xc8, 0x9f, 0xd7, 0xc5, 0xc8, 0xab,
-	0xaf, 0x07, 0x0e, 0x1d, 0x4e, 0xfb, 0x65, 0x8b, 0x8c, 0x2b, 0x16, 0xf1, 0xc7, 0xc4, 0xaf, 0x38,
-	0x7d, 0xeb, 0xd1, 0x80, 0x54, 0x66, 0xcf, 0x2a, 0x63, 0x62, 0x4f, 0x47, 0xd8, 0xe7, 0xcf, 0x84,
-	0xc7, 0x4f, 0x1f, 0x85, 0xef, 0x0e, 0x7a, 0x39, 0xc1, 0x7e, 0x3f, 0xc1, 0xde, 0x09, 0x5f, 0xfe,
-	0x1b, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xdd, 0xd7, 0x47, 0x98, 0x08, 0x00, 0x00,
+	// 816 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x55, 0xcd, 0x8e, 0xdb, 0x54,
+	0x14, 0xb6, 0x33, 0xce, 0xdf, 0xc9, 0x64, 0x92, 0xb9, 0x85, 0xc1, 0xb2, 0xc0, 0x71, 0x47, 0x20,
+	0x42, 0x51, 0xe3, 0x4e, 0x41, 0x20, 0xd8, 0xcd, 0x24, 0x86, 0x58, 0x8c, 0x92, 0xc8, 0xc9, 0x2c,
+	0xe8, 0x26, 0x72, 0xec, 0x4b, 0x62, 0x35, 0xf1, 0x35, 0xf6, 0x4d, 0xaa, 0x8a, 0x17, 0x28, 0x59,
+	0xf1, 0x02, 0x91, 0x90, 0x78, 0x08, 0x5e, 0xa1, 0x12, 0x9b, 0x2e, 0xbb, 0x42, 0x68, 0xe6, 0x45,
+	0x90, 0xef, 0xbd, 0x9e, 0x24, 0xd5, 0xa8, 0x0b, 0x24, 0x56, 0x5d, 0xe5, 0x9e, 0xef, 0x7c, 0xe7,
+	0x3b, 0xc7, 0xdf, 0xb1, 0x73, 0xe1, 0x7e, 0x30, 0xf1, 0x4c, 0x8f, 0xc4, 0xd8, 0xf4, 0x66, 0x6e,
+	0x18, 0xe2, 0xb9, 0xb9, 0x3a, 0xcb, 0x8e, 0xad, 0x28, 0x26, 0x94, 0xa0, 0x7b, 0xc1, 0xc4, 0x6b,
+	0xa5, 0x94, 0x56, 0x86, 0xaf, 0xce, 0xb4, 0xf7, 0xa6, 0x64, 0x4a, 0x58, 0xde, 0x4c, 0x4f, 0x9c,
+	0xaa, 0x35, 0xb6, 0x6a, 0xf3, 0x00, 0x87, 0x94, 0x89, 0xb1, 0x13, 0x27, 0x9c, 0xfe, 0x9a, 0x83,
+	0x62, 0x9b, 0xab, 0xa0, 0x47, 0x90, 0x4f, 0xa8, 0x4b, 0xb1, 0x2a, 0x1b, 0x72, 0xf3, 0xe8, 0xb1,
+	0xd6, 0xba, 0xa3, 0x4f, 0x6b, 0x98, 0x32, 0x1c, 0x4e, 0x44, 0x5f, 0x41, 0x89, 0xc4, 0x3e, 0x8e,
+	0x83, 0x70, 0xaa, 0xe6, 0xde, 0x52, 0xd4, 0x4f, 0x49, 0xce, 0x2d, 0x17, 0xfd, 0x00, 0x87, 0x1e,
+	0x59, 0x86, 0x14, 0xc7, 0x91, 0x1b, 0xd3, 0xe7, 0xea, 0x81, 0x21, 0x37, 0x2b, 0x8f, 0xef, 0xdf,
+	0x59, 0xdb, 0xde, 0x21, 0x5e, 0x28, 0x2f, 0xff, 0x6e, 0x48, 0xce, 0x5e, 0x31, 0xfa, 0x14, 0x6a,
+	0x1e, 0x09, 0x43, 0xec, 0xd1, 0x80, 0x84, 0xe3, 0x19, 0x89, 0x12, 0x55, 0x31, 0x0e, 0x9a, 0x65,
+	0xe7, 0x68, 0x0b, 0x77, 0x49, 0x94, 0x20, 0x15, 0x8a, 0x2b, 0x1c, 0x27, 0x01, 0x09, 0xd5, 0xbc,
+	0x21, 0x37, 0xcb, 0x4e, 0x16, 0x7e, 0xab, 0xbc, 0xf8, 0xbd, 0x21, 0x9d, 0xfe, 0x95, 0x83, 0x63,
+	0xdb, 0xc7, 0x21, 0x0d, 0x7e, 0x0a, 0xb0, 0xff, 0xce, 0xbb, 0x82, 0x3e, 0x80, 0x62, 0x44, 0x62,
+	0x3a, 0x0e, 0x7c, 0xb5, 0xc0, 0x32, 0x85, 0x34, 0xb4, 0x7d, 0xf4, 0x11, 0x80, 0x18, 0x25, 0xcd,
+	0x15, 0x59, 0xae, 0x2c, 0x10, 0xdb, 0x17, 0x6e, 0x5e, 0xc2, 0xe1, 0xee, 0x90, 0xbb, 0x6a, 0xf2,
+	0x5b, 0xd4, 0x72, 0x77, 0xab, 0xbd, 0xce, 0x41, 0x61, 0xe0, 0x7a, 0x4f, 0x31, 0x45, 0x1a, 0x94,
+	0x12, 0xfc, 0xf3, 0x12, 0x87, 0x1e, 0xdf, 0x89, 0xe2, 0xdc, 0xc6, 0xa8, 0x01, 0x95, 0x84, 0x2c,
+	0x63, 0x0f, 0x8f, 0x53, 0x71, 0x21, 0x06, 0x1c, 0x1a, 0x90, 0x98, 0xa2, 0x4f, 0xe0, 0x48, 0x10,
+	0x44, 0x07, 0xe6, 0x72, 0xd9, 0xa9, 0x72, 0x34, 0x5b, 0xfa, 0x67, 0x50, 0xf7, 0x71, 0x42, 0x83,
+	0xd0, 0x65, 0xf6, 0x31, 0x31, 0x85, 0x11, 0x6b, 0x3b, 0x38, 0x53, 0x34, 0xe1, 0xde, 0x2e, 0x35,
+	0x93, 0xe5, 0x5e, 0xa2, 0x9d, 0x54, 0xa6, 0x8d, 0x40, 0xf1, 0x5d, 0xea, 0x32, 0x4f, 0x0f, 0x1d,
+	0x76, 0x46, 0xdf, 0xc3, 0x11, 0x0d, 0x16, 0x98, 0x2c, 0xe9, 0x78, 0x86, 0x83, 0xe9, 0x8c, 0x32,
+	0x57, 0x2b, 0x7b, 0x2f, 0x0e, 0xff, 0x6c, 0x57, 0x67, 0xad, 0x2e, 0x63, 0x88, 0xad, 0x57, 0x45,
+	0x1d, 0x07, 0xd1, 0xe7, 0x70, 0x9c, 0x09, 0xa5, 0xbf, 0x09, 0x75, 0x17, 0x91, 0x5a, 0x62, 0x2e,
+	0xd5, 0x45, 0x62, 0x94, 0xe1, 0xc2, 0xda, 0x5f, 0xa0, 0xc2, 0x9d, 0x65, 0x2f, 0xf1, 0x7f, 0xdd,
+	0xd3, 0xde, 0x5a, 0x0e, 0xde, 0x58, 0x4b, 0xf6, 0xc8, 0xca, 0xf6, 0x91, 0x45, 0x73, 0x1f, 0x4a,
+	0xbc, 0xb9, 0xed, 0xff, 0x1f, 0x9d, 0x45, 0x97, 0x3e, 0xd4, 0xce, 0xbd, 0xa7, 0x21, 0x79, 0x36,
+	0xc7, 0xfe, 0x14, 0x2f, 0x70, 0x48, 0x91, 0x0a, 0x85, 0x18, 0x27, 0xcb, 0x39, 0x55, 0xdf, 0x4f,
+	0x87, 0xea, 0x4a, 0x8e, 0x88, 0xd1, 0x09, 0xe4, 0x71, 0x1c, 0x93, 0x58, 0x3d, 0x49, 0x1b, 0x75,
+	0x25, 0x87, 0x87, 0x17, 0x00, 0xa5, 0x18, 0x27, 0x11, 0x09, 0x13, 0xfc, 0xe0, 0x4f, 0x19, 0xf2,
+	0x43, 0xf1, 0xb1, 0x37, 0x86, 0xa3, 0xf3, 0x91, 0x35, 0xbe, 0xea, 0xd9, 0x3d, 0x7b, 0x64, 0x9f,
+	0x5f, 0xda, 0x4f, 0xac, 0xce, 0xf8, 0xaa, 0x37, 0x1c, 0x58, 0x6d, 0xfb, 0x3b, 0xdb, 0xea, 0xd4,
+	0x25, 0xed, 0x78, 0xbd, 0x31, 0xaa, 0x7b, 0x04, 0xa4, 0x02, 0xf0, 0xba, 0x14, 0xac, 0xcb, 0x5a,
+	0x69, 0xbd, 0x31, 0x94, 0xf4, 0x8c, 0x74, 0xa8, 0xf2, 0xcc, 0xc8, 0xf9, 0xb1, 0x3f, 0xb0, 0x7a,
+	0xf5, 0x9c, 0x56, 0x59, 0x6f, 0x8c, 0xa2, 0x08, 0xb7, 0x95, 0x2c, 0x79, 0xc0, 0x2b, 0x59, 0xe6,
+	0x43, 0x38, 0xe4, 0x99, 0xf6, 0x65, 0x7f, 0x68, 0x75, 0xea, 0x8a, 0x06, 0xeb, 0x8d, 0x51, 0xe0,
+	0x91, 0xa6, 0xbc, 0xf8, 0x43, 0x97, 0x1e, 0x3c, 0x83, 0x3c, 0xfb, 0xdf, 0x41, 0x1f, 0xc3, 0x49,
+	0xdf, 0xe9, 0x58, 0xce, 0xb8, 0xd7, 0xef, 0x59, 0x6f, 0xcc, 0xcb, 0x24, 0x53, 0x1c, 0x9d, 0x42,
+	0x8d, 0xb3, 0xae, 0x7a, 0xec, 0xd7, 0xea, 0xd4, 0x65, 0xad, 0xba, 0xde, 0x18, 0xe5, 0x5b, 0x20,
+	0x1d, 0x98, 0x73, 0x32, 0x86, 0x18, 0x58, 0x84, 0xbc, 0xf1, 0xc5, 0xf0, 0xe5, 0xb5, 0x2e, 0xbf,
+	0xba, 0xd6, 0xe5, 0x7f, 0xae, 0x75, 0xf9, 0xb7, 0x1b, 0x5d, 0x7a, 0x75, 0xa3, 0x4b, 0xaf, 0x6f,
+	0x74, 0xe9, 0xc9, 0x37, 0xd3, 0x80, 0xce, 0x96, 0x93, 0x96, 0x47, 0x16, 0xa6, 0x47, 0x92, 0x05,
+	0x49, 0xcc, 0x60, 0xe2, 0x3d, 0x9c, 0x12, 0x73, 0xf5, 0xb5, 0xb9, 0x20, 0xfe, 0x72, 0x8e, 0x13,
+	0x7e, 0x89, 0x3d, 0xfa, 0xf2, 0x61, 0x76, 0x2b, 0xd2, 0xe7, 0x11, 0x4e, 0x26, 0x05, 0x76, 0x8b,
+	0x7d, 0xf1, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x87, 0x4b, 0xef, 0x36, 0x07, 0x00, 0x00,
 }
 
 func (m *Channel) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/04-channel/types/genesis.pb.go b/modules/core/04-channel/types/genesis.pb.go
index 4c6b61988f0..00ea52c8a9b 100644
--- a/modules/core/04-channel/types/genesis.pb.go
+++ b/modules/core/04-channel/types/genesis.pb.go
@@ -29,11 +29,11 @@ type GenesisState struct {
 	Acknowledgements []PacketState       `protobuf:"bytes,2,rep,name=acknowledgements,proto3" json:"acknowledgements"`
 	Commitments      []PacketState       `protobuf:"bytes,3,rep,name=commitments,proto3" json:"commitments"`
 	Receipts         []PacketState       `protobuf:"bytes,4,rep,name=receipts,proto3" json:"receipts"`
-	SendSequences    []PacketSequence    `protobuf:"bytes,5,rep,name=send_sequences,json=sendSequences,proto3" json:"send_sequences" yaml:"send_sequences"`
-	RecvSequences    []PacketSequence    `protobuf:"bytes,6,rep,name=recv_sequences,json=recvSequences,proto3" json:"recv_sequences" yaml:"recv_sequences"`
-	AckSequences     []PacketSequence    `protobuf:"bytes,7,rep,name=ack_sequences,json=ackSequences,proto3" json:"ack_sequences" yaml:"ack_sequences"`
+	SendSequences    []PacketSequence    `protobuf:"bytes,5,rep,name=send_sequences,json=sendSequences,proto3" json:"send_sequences"`
+	RecvSequences    []PacketSequence    `protobuf:"bytes,6,rep,name=recv_sequences,json=recvSequences,proto3" json:"recv_sequences"`
+	AckSequences     []PacketSequence    `protobuf:"bytes,7,rep,name=ack_sequences,json=ackSequences,proto3" json:"ack_sequences"`
 	// the sequence for the next generated channel identifier
-	NextChannelSequence uint64 `protobuf:"varint,8,opt,name=next_channel_sequence,json=nextChannelSequence,proto3" json:"next_channel_sequence,omitempty" yaml:"next_channel_sequence"`
+	NextChannelSequence uint64 `protobuf:"varint,8,opt,name=next_channel_sequence,json=nextChannelSequence,proto3" json:"next_channel_sequence,omitempty"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -128,8 +128,8 @@ func (m *GenesisState) GetNextChannelSequence() uint64 {
 // PacketSequence defines the genesis type necessary to retrieve and store
 // next send and receive sequences.
 type PacketSequence struct {
-	PortId    string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	PortId    string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	Sequence  uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
 }
 
@@ -195,39 +195,35 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/channel/v1/genesis.proto", fileDescriptor_cb06ec201f452595) }
 
 var fileDescriptor_cb06ec201f452595 = []byte{
-	// 507 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0x87, 0xe3, 0x36, 0x4d, 0xd3, 0x6d, 0x13, 0xd1, 0x6d, 0x23, 0x99, 0xa8, 0xd8, 0xc6, 0x48,
-	0x28, 0x12, 0xaa, 0x4d, 0xa1, 0x12, 0x82, 0xa3, 0x39, 0x40, 0x6e, 0x68, 0xcb, 0x09, 0x09, 0x45,
-	0xf6, 0x7a, 0xea, 0xae, 0x12, 0x7b, 0x83, 0x77, 0x13, 0xe8, 0x53, 0xc0, 0x63, 0xf5, 0xd8, 0x23,
-	0x27, 0x0b, 0x25, 0x6f, 0x90, 0x23, 0x27, 0xe4, 0xbf, 0x49, 0xd4, 0x08, 0x51, 0x6e, 0xde, 0x99,
-	0xdf, 0x7c, 0xdf, 0x1c, 0x3c, 0xe8, 0x31, 0xf3, 0xa8, 0x4d, 0x79, 0x0c, 0x36, 0xbd, 0x72, 0xa3,
-	0x08, 0x46, 0xf6, 0xf4, 0xcc, 0x0e, 0x20, 0x02, 0xc1, 0x84, 0x35, 0x8e, 0xb9, 0xe4, 0xf8, 0x88,
-	0x79, 0xd4, 0x4a, 0x23, 0x56, 0x11, 0xb1, 0xa6, 0x67, 0xdd, 0xe3, 0x80, 0x07, 0x3c, 0xeb, 0xdb,
-	0xe9, 0x57, 0x1e, 0xed, 0x6e, 0xa4, 0x95, 0x53, 0x59, 0xc4, 0x9c, 0xef, 0xa0, 0x83, 0x77, 0x39,
-	0xff, 0x42, 0xba, 0x12, 0xf0, 0x67, 0xd4, 0x2c, 0x12, 0x42, 0x55, 0x8c, 0xed, 0xde, 0xfe, 0x8b,
-	0xa7, 0xd6, 0x06, 0xa3, 0xd5, 0xf7, 0x21, 0x92, 0xec, 0x92, 0x81, 0xff, 0x36, 0x2f, 0x3a, 0x0f,
-	0x6f, 0x12, 0xbd, 0xf6, 0x3b, 0xd1, 0x0f, 0xef, 0xb4, 0x48, 0x85, 0xc4, 0x04, 0x3d, 0x70, 0xe9,
-	0x30, 0xe2, 0x5f, 0x47, 0xe0, 0x07, 0x10, 0x42, 0x24, 0x85, 0xba, 0x95, 0x69, 0x8c, 0x8d, 0x9a,
-	0x0f, 0x2e, 0x1d, 0x82, 0xcc, 0x56, 0x73, 0xea, 0xa9, 0x80, 0xdc, 0x99, 0xc7, 0xef, 0xd1, 0x3e,
-	0xe5, 0x61, 0xc8, 0x64, 0x8e, 0xdb, 0xbe, 0x17, 0x6e, 0x75, 0x14, 0x3b, 0xa8, 0x19, 0x03, 0x05,
-	0x36, 0x96, 0x42, 0xad, 0xdf, 0x0b, 0x53, 0xcd, 0x61, 0x86, 0xda, 0x02, 0x22, 0x7f, 0x20, 0xe0,
-	0xcb, 0x04, 0x22, 0x0a, 0x42, 0xdd, 0xc9, 0x48, 0x4f, 0xfe, 0x46, 0x2a, 0xb2, 0xce, 0xa3, 0x14,
-	0xb6, 0x48, 0xf4, 0xce, 0xb5, 0x1b, 0x8e, 0xde, 0x98, 0xeb, 0x20, 0x93, 0xb4, 0xd2, 0x42, 0x19,
-	0xce, 0x54, 0x31, 0xd0, 0xe9, 0x8a, 0xaa, 0xf1, 0xdf, 0xaa, 0x75, 0x90, 0x49, 0x5a, 0x69, 0x61,
-	0xa9, 0xba, 0x44, 0x2d, 0x97, 0x0e, 0x57, 0x4c, 0xbb, 0xff, 0x6e, 0x3a, 0x29, 0x4c, 0xc7, 0xb9,
-	0x69, 0x8d, 0x63, 0x92, 0x03, 0x97, 0x0e, 0x97, 0x9e, 0x8f, 0xa8, 0x13, 0xc1, 0x37, 0x39, 0x28,
-	0x68, 0x55, 0x50, 0x6d, 0x1a, 0x4a, 0xaf, 0xee, 0x18, 0x8b, 0x44, 0x3f, 0xc9, 0x31, 0x1b, 0x63,
-	0x26, 0x39, 0x4a, 0xeb, 0xc5, 0x7f, 0x57, 0x62, 0xcd, 0xef, 0x0a, 0x6a, 0xaf, 0x2f, 0x85, 0x9f,
-	0xa1, 0xdd, 0x31, 0x8f, 0xe5, 0x80, 0xf9, 0xaa, 0x62, 0x28, 0xbd, 0x3d, 0x07, 0x2f, 0x12, 0xbd,
-	0x9d, 0xa3, 0x8b, 0x86, 0x49, 0x1a, 0xe9, 0x57, 0xdf, 0xc7, 0xe7, 0x08, 0x95, 0x26, 0xe6, 0xab,
-	0x5b, 0x59, 0xbe, 0xb3, 0x48, 0xf4, 0xc3, 0x3c, 0xbf, 0xec, 0x99, 0x64, 0xaf, 0x78, 0xf4, 0x7d,
-	0xdc, 0x45, 0xcd, 0x6a, 0xfd, 0xed, 0x74, 0x7d, 0x52, 0xbd, 0x9d, 0x8b, 0x9b, 0x99, 0xa6, 0xdc,
-	0xce, 0x34, 0xe5, 0xd7, 0x4c, 0x53, 0x7e, 0xcc, 0xb5, 0xda, 0xed, 0x5c, 0xab, 0xfd, 0x9c, 0x6b,
-	0xb5, 0x4f, 0xaf, 0x03, 0x26, 0xaf, 0x26, 0x9e, 0x45, 0x79, 0x68, 0x53, 0x2e, 0x42, 0x2e, 0x6c,
-	0xe6, 0xd1, 0xd3, 0x80, 0xdb, 0xd3, 0x57, 0x76, 0xc8, 0xfd, 0xc9, 0x08, 0x44, 0x7e, 0xd4, 0xcf,
-	0xcf, 0x4f, 0xcb, 0xbb, 0x96, 0xd7, 0x63, 0x10, 0x5e, 0x23, 0xbb, 0xe9, 0x97, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0xcc, 0x89, 0x91, 0x33, 0x46, 0x04, 0x00, 0x00,
+	// 447 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0xd3, 0x4d, 0x6f, 0xd3, 0x30,
+	0x18, 0x07, 0xf0, 0x66, 0x2d, 0x5d, 0xe7, 0xbd, 0x08, 0x3c, 0x10, 0xa1, 0x12, 0x59, 0x19, 0x12,
+	0xea, 0x65, 0x31, 0x1b, 0x48, 0x88, 0x6b, 0x38, 0x40, 0x2f, 0x68, 0xca, 0x6e, 0x48, 0xa8, 0x4a,
+	0xec, 0x87, 0xcc, 0x4a, 0x63, 0x87, 0xd8, 0x0d, 0xf0, 0x2d, 0xf8, 0x58, 0x3b, 0xee, 0xc8, 0x69,
+	0x42, 0xed, 0x87, 0x40, 0xe2, 0x84, 0xe2, 0xbc, 0xac, 0xa8, 0xd5, 0xa4, 0xdc, 0x6a, 0x3f, 0xcf,
+	0xff, 0xf7, 0xef, 0x21, 0x46, 0xcf, 0x78, 0x48, 0x09, 0x95, 0x19, 0x10, 0x7a, 0x19, 0x08, 0x01,
+	0x33, 0x92, 0x9f, 0x92, 0x08, 0x04, 0x28, 0xae, 0xdc, 0x34, 0x93, 0x5a, 0xe2, 0x43, 0x1e, 0x52,
+	0xb7, 0x58, 0x71, 0xab, 0x15, 0x37, 0x3f, 0x1d, 0x3e, 0x8c, 0x64, 0x24, 0xcd, 0x9c, 0x14, 0xbf,
+	0xca, 0xd5, 0xe1, 0x46, 0xad, 0x4e, 0x99, 0x95, 0xe3, 0x3f, 0x3d, 0xb4, 0xf7, 0xbe, 0xf4, 0x2f,
+	0x74, 0xa0, 0x01, 0x7f, 0x46, 0x83, 0x6a, 0x43, 0xd9, 0xd6, 0xa8, 0x3b, 0xde, 0x3d, 0x7b, 0xe1,
+	0x6e, 0x68, 0x74, 0x27, 0x0c, 0x84, 0xe6, 0x5f, 0x38, 0xb0, 0x77, 0xe5, 0xa5, 0xf7, 0xe4, 0xea,
+	0xe6, 0xa8, 0xf3, 0xf7, 0xe6, 0xe8, 0xc1, 0xda, 0xc8, 0x6f, 0x48, 0xec, 0xa3, 0xfb, 0x01, 0x8d,
+	0x85, 0xfc, 0x36, 0x03, 0x16, 0x41, 0x02, 0x42, 0x2b, 0x7b, 0xcb, 0xd4, 0x8c, 0x36, 0xd6, 0x9c,
+	0x07, 0x34, 0x06, 0x6d, 0xfe, 0x9a, 0xd7, 0x2b, 0x0a, 0xfc, 0xb5, 0x3c, 0xfe, 0x80, 0x76, 0xa9,
+	0x4c, 0x12, 0xae, 0x4b, 0xae, 0xdb, 0x8a, 0x5b, 0x8d, 0x62, 0x0f, 0x0d, 0x32, 0xa0, 0xc0, 0x53,
+	0xad, 0xec, 0x5e, 0x2b, 0xa6, 0xc9, 0xe1, 0x73, 0x74, 0xa0, 0x40, 0xb0, 0xa9, 0x82, 0xaf, 0x73,
+	0x10, 0x14, 0x94, 0x7d, 0xcf, 0x48, 0xcf, 0xef, 0x92, 0xaa, 0xdd, 0x0a, 0xdb, 0x2f, 0x80, 0xfa,
+	0xce, 0x88, 0x19, 0xd0, 0x7c, 0x45, 0xec, 0xb7, 0x16, 0x0b, 0xe0, 0x56, 0xfc, 0x88, 0xf6, 0x03,
+	0x1a, 0xaf, 0x80, 0xdb, 0x6d, 0xc1, 0xbd, 0x80, 0xc6, 0xb7, 0xde, 0x19, 0x7a, 0x24, 0xe0, 0xbb,
+	0x9e, 0x56, 0xa9, 0x06, 0xb6, 0x07, 0x23, 0x6b, 0xdc, 0xf3, 0x0f, 0x8b, 0x61, 0xf5, 0x2d, 0xd4,
+	0xa1, 0x63, 0x86, 0x0e, 0xfe, 0x97, 0xf1, 0x63, 0xb4, 0x9d, 0xca, 0x4c, 0x4f, 0x39, 0xb3, 0xad,
+	0x91, 0x35, 0xde, 0xf1, 0xfb, 0xc5, 0x71, 0xc2, 0xf0, 0x53, 0x84, 0x6a, 0x99, 0x33, 0x7b, 0xcb,
+	0xcc, 0x76, 0xaa, 0x9b, 0x09, 0xc3, 0x43, 0x34, 0x68, 0x0a, 0xbb, 0xa6, 0xb0, 0x39, 0x7b, 0x17,
+	0x57, 0x0b, 0xc7, 0xba, 0x5e, 0x38, 0xd6, 0xef, 0x85, 0x63, 0xfd, 0x5c, 0x3a, 0x9d, 0xeb, 0xa5,
+	0xd3, 0xf9, 0xb5, 0x74, 0x3a, 0x9f, 0xde, 0x46, 0x5c, 0x5f, 0xce, 0x43, 0x97, 0xca, 0x84, 0x50,
+	0xa9, 0x12, 0xa9, 0x08, 0x0f, 0xe9, 0x49, 0x24, 0x49, 0xfe, 0x86, 0x24, 0x92, 0xcd, 0x67, 0xa0,
+	0xca, 0xc7, 0xf3, 0xf2, 0xf5, 0x49, 0xfd, 0x7e, 0xf4, 0x8f, 0x14, 0x54, 0xd8, 0x37, 0x6f, 0xe7,
+	0xd5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x3b, 0xcc, 0xcc, 0xae, 0x03, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go
index cd1d8fdb256..c285e22fee0 100644
--- a/modules/core/04-channel/types/tx.pb.go
+++ b/modules/core/04-channel/types/tx.pb.go
@@ -64,7 +64,7 @@ func (ResponseResultType) EnumDescriptor() ([]byte, []int) {
 // MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It
 // is called by a relayer on Chain A.
 type MsgChannelOpenInit struct {
-	PortId  string  `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId  string  `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	Channel Channel `protobuf:"bytes,2,opt,name=channel,proto3" json:"channel"`
 	Signer  string  `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"`
 }
@@ -104,7 +104,7 @@ var xxx_messageInfo_MsgChannelOpenInit proto.InternalMessageInfo
 
 // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type.
 type MsgChannelOpenInitResponse struct {
-	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	Version   string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 }
 
@@ -159,14 +159,14 @@ func (m *MsgChannelOpenInitResponse) GetVersion() string {
 // on Chain B. The version field within the Channel field has been deprecated. Its
 // value will be ignored by core IBC.
 type MsgChannelOpenTry struct {
-	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
+	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// Deprecated: this field is unused. Crossing hello's are no longer supported in core IBC.
-	PreviousChannelId string `protobuf:"bytes,2,opt,name=previous_channel_id,json=previousChannelId,proto3" json:"previous_channel_id,omitempty" yaml:"previous_channel_id"` // Deprecated: Do not use.
+	PreviousChannelId string `protobuf:"bytes,2,opt,name=previous_channel_id,json=previousChannelId,proto3" json:"previous_channel_id,omitempty"` // Deprecated: Do not use.
 	// NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC.
 	Channel             Channel      `protobuf:"bytes,3,opt,name=channel,proto3" json:"channel"`
-	CounterpartyVersion string       `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"`
-	ProofInit           []byte       `protobuf:"bytes,5,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"`
-	ProofHeight         types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	CounterpartyVersion string       `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty"`
+	ProofInit           []byte       `protobuf:"bytes,5,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"`
+	ProofHeight         types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer              string       `protobuf:"bytes,7,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -206,7 +206,7 @@ var xxx_messageInfo_MsgChannelOpenTry proto.InternalMessageInfo
 // MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type.
 type MsgChannelOpenTryResponse struct {
 	Version   string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 }
 
 func (m *MsgChannelOpenTryResponse) Reset()         { *m = MsgChannelOpenTryResponse{} }
@@ -259,12 +259,12 @@ func (m *MsgChannelOpenTryResponse) GetChannelId() string {
 // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
 // the change of channel state to TRYOPEN on Chain B.
 type MsgChannelOpenAck struct {
-	PortId                string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId             string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
-	CounterpartyChannelId string       `protobuf:"bytes,3,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty" yaml:"counterparty_channel_id"`
-	CounterpartyVersion   string       `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"`
-	ProofTry              []byte       `protobuf:"bytes,5,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty" yaml:"proof_try"`
-	ProofHeight           types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	PortId                string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId             string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	CounterpartyChannelId string       `protobuf:"bytes,3,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty"`
+	CounterpartyVersion   string       `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty"`
+	ProofTry              []byte       `protobuf:"bytes,5,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty"`
+	ProofHeight           types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer                string       `protobuf:"bytes,7,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -341,10 +341,10 @@ var xxx_messageInfo_MsgChannelOpenAckResponse proto.InternalMessageInfo
 // MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to
 // acknowledge the change of channel state to OPEN on Chain A.
 type MsgChannelOpenConfirm struct {
-	PortId      string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId   string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
-	ProofAck    []byte       `protobuf:"bytes,3,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"`
-	ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	PortId      string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId   string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	ProofAck    []byte       `protobuf:"bytes,3,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty"`
+	ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer      string       `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -422,8 +422,8 @@ var xxx_messageInfo_MsgChannelOpenConfirmResponse proto.InternalMessageInfo
 // MsgChannelCloseInit defines a msg sent by a Relayer to Chain A
 // to close a channel with Chain B.
 type MsgChannelCloseInit struct {
-	PortId    string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
+	PortId    string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	Signer    string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -500,10 +500,10 @@ var xxx_messageInfo_MsgChannelCloseInitResponse proto.InternalMessageInfo
 // MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B
 // to acknowledge the change of channel state to CLOSED on Chain A.
 type MsgChannelCloseConfirm struct {
-	PortId      string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
-	ChannelId   string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
-	ProofInit   []byte       `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"`
-	ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	PortId      string       `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
+	ChannelId   string       `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	ProofInit   []byte       `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"`
+	ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer      string       `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -581,8 +581,8 @@ var xxx_messageInfo_MsgChannelCloseConfirmResponse proto.InternalMessageInfo
 // MsgRecvPacket receives incoming IBC packet
 type MsgRecvPacket struct {
 	Packet          Packet       `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"`
-	ProofCommitment []byte       `protobuf:"bytes,2,opt,name=proof_commitment,json=proofCommitment,proto3" json:"proof_commitment,omitempty" yaml:"proof_commitment"`
-	ProofHeight     types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	ProofCommitment []byte       `protobuf:"bytes,2,opt,name=proof_commitment,json=proofCommitment,proto3" json:"proof_commitment,omitempty"`
+	ProofHeight     types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer          string       `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -660,9 +660,9 @@ var xxx_messageInfo_MsgRecvPacketResponse proto.InternalMessageInfo
 // MsgTimeout receives timed-out packet
 type MsgTimeout struct {
 	Packet           Packet       `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"`
-	ProofUnreceived  []byte       `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty" yaml:"proof_unreceived"`
-	ProofHeight      types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
-	NextSequenceRecv uint64       `protobuf:"varint,4,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty" yaml:"next_sequence_recv"`
+	ProofUnreceived  []byte       `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"`
+	ProofHeight      types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
+	NextSequenceRecv uint64       `protobuf:"varint,4,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"`
 	Signer           string       `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -740,10 +740,10 @@ var xxx_messageInfo_MsgTimeoutResponse proto.InternalMessageInfo
 // MsgTimeoutOnClose timed-out packet upon counterparty channel closure.
 type MsgTimeoutOnClose struct {
 	Packet           Packet       `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"`
-	ProofUnreceived  []byte       `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty" yaml:"proof_unreceived"`
-	ProofClose       []byte       `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty" yaml:"proof_close"`
-	ProofHeight      types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
-	NextSequenceRecv uint64       `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty" yaml:"next_sequence_recv"`
+	ProofUnreceived  []byte       `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"`
+	ProofClose       []byte       `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty"`
+	ProofHeight      types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
+	NextSequenceRecv uint64       `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"`
 	Signer           string       `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -822,8 +822,8 @@ var xxx_messageInfo_MsgTimeoutOnCloseResponse proto.InternalMessageInfo
 type MsgAcknowledgement struct {
 	Packet          Packet       `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"`
 	Acknowledgement []byte       `protobuf:"bytes,2,opt,name=acknowledgement,proto3" json:"acknowledgement,omitempty"`
-	ProofAcked      []byte       `protobuf:"bytes,3,opt,name=proof_acked,json=proofAcked,proto3" json:"proof_acked,omitempty" yaml:"proof_acked"`
-	ProofHeight     types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"`
+	ProofAcked      []byte       `protobuf:"bytes,3,opt,name=proof_acked,json=proofAcked,proto3" json:"proof_acked,omitempty"`
+	ProofHeight     types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"`
 	Signer          string       `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
@@ -925,89 +925,80 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) }
 
 var fileDescriptor_bc4637e0ac3fc7b7 = []byte{
-	// 1300 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdf, 0x6f, 0xda, 0xd6,
-	0x17, 0xc7, 0x40, 0x21, 0x39, 0xf4, 0x9b, 0x10, 0x93, 0xa4, 0xc4, 0x24, 0x98, 0xaf, 0x1f, 0x9a,
-	0x28, 0x53, 0xa0, 0x49, 0x3b, 0x55, 0x8d, 0x26, 0x4d, 0x81, 0x51, 0x2d, 0xda, 0x92, 0x20, 0x43,
-	0x26, 0x2d, 0x9b, 0x86, 0xc0, 0xdc, 0x12, 0x0b, 0xb0, 0x99, 0x6d, 0x68, 0xf9, 0x0f, 0xaa, 0x3c,
-	0xf5, 0xb9, 0x52, 0xa4, 0x4e, 0x7b, 0x9a, 0xf6, 0xd0, 0xfd, 0x19, 0x7d, 0xec, 0xdb, 0xaa, 0x3d,
-	0xa0, 0x29, 0x79, 0xd9, 0x33, 0x7f, 0xc1, 0xe4, 0xeb, 0x6b, 0x63, 0xc0, 0x56, 0x9c, 0x34, 0x49,
-	0xf7, 0x76, 0xef, 0x3d, 0x9f, 0x7b, 0xce, 0xb9, 0x9f, 0xf3, 0xb9, 0x3f, 0x6c, 0x58, 0x16, 0xab,
-	0x42, 0x46, 0x90, 0x15, 0x94, 0x11, 0x8e, 0x2b, 0x92, 0x84, 0x9a, 0x99, 0xee, 0x66, 0x46, 0x7b,
-	0x91, 0x6e, 0x2b, 0xb2, 0x26, 0xd3, 0x31, 0xb1, 0x2a, 0xa4, 0x75, 0x6b, 0x9a, 0x58, 0xd3, 0xdd,
-	0x4d, 0x66, 0xbe, 0x2e, 0xd7, 0x65, 0x6c, 0xcf, 0xe8, 0x2d, 0x03, 0xca, 0xb0, 0x43, 0x47, 0x4d,
-	0x11, 0x49, 0x9a, 0xee, 0xc7, 0x68, 0x11, 0xc0, 0xff, 0x9d, 0x22, 0x99, 0x6e, 0x31, 0x84, 0xfb,
-	0x85, 0x02, 0x7a, 0x4f, 0xad, 0xe7, 0x8c, 0xc1, 0x83, 0x36, 0x92, 0x76, 0x25, 0x51, 0xa3, 0x3f,
-	0x83, 0x70, 0x5b, 0x56, 0xb4, 0xb2, 0x58, 0x8b, 0x53, 0x29, 0x6a, 0x6d, 0x3a, 0x4b, 0x0f, 0xfa,
-	0xec, 0x4c, 0xaf, 0xd2, 0x6a, 0x6e, 0x73, 0xc4, 0xc0, 0xf1, 0x21, 0xbd, 0xb5, 0x5b, 0xa3, 0xbf,
-	0x80, 0x30, 0x71, 0x1a, 0xf7, 0xa7, 0xa8, 0xb5, 0xc8, 0xd6, 0x72, 0xda, 0x61, 0x11, 0x69, 0x12,
-	0x23, 0x1b, 0x7c, 0xd7, 0x67, 0x7d, 0xbc, 0x39, 0x85, 0x5e, 0x84, 0x90, 0x2a, 0xd6, 0x25, 0xa4,
-	0xc4, 0x03, 0x7a, 0x24, 0x9e, 0xf4, 0xb6, 0xa7, 0x5e, 0xbe, 0x61, 0x7d, 0xff, 0xbc, 0x61, 0x7d,
-	0x5c, 0x13, 0x98, 0xc9, 0x14, 0x79, 0xa4, 0xb6, 0x65, 0x49, 0x45, 0xf4, 0x23, 0x00, 0xe2, 0x6a,
-	0x98, 0xed, 0xc2, 0xa0, 0xcf, 0xce, 0x19, 0xd9, 0x0e, 0x6d, 0x1c, 0x3f, 0x4d, 0x3a, 0xbb, 0x35,
-	0x3a, 0x0e, 0xe1, 0x2e, 0x52, 0x54, 0x51, 0x96, 0x70, 0xce, 0xd3, 0xbc, 0xd9, 0xe5, 0x3e, 0x04,
-	0x60, 0x6e, 0x34, 0x5c, 0x49, 0xe9, 0x5d, 0x8e, 0x90, 0x02, 0xc4, 0xda, 0x0a, 0xea, 0x8a, 0x72,
-	0x47, 0x2d, 0xdb, 0x72, 0xc3, 0x81, 0xb2, 0xa9, 0x41, 0x9f, 0x65, 0xc8, 0xc4, 0x49, 0x10, 0x17,
-	0xa7, 0xf8, 0x39, 0x73, 0x3c, 0x67, 0xa5, 0x6b, 0xa3, 0x38, 0x70, 0x79, 0x8a, 0x79, 0x98, 0x17,
-	0xe4, 0x8e, 0xa4, 0x21, 0xa5, 0x5d, 0x51, 0xb4, 0x5e, 0xd9, 0x5c, 0x79, 0x10, 0x27, 0xc4, 0x0e,
-	0xfa, 0x6c, 0x82, 0x90, 0xe5, 0x80, 0xe2, 0xf8, 0x98, 0x7d, 0xf8, 0x3b, 0x63, 0x54, 0xa7, 0xbd,
-	0xad, 0xc8, 0xf2, 0xb3, 0xb2, 0x28, 0x89, 0x5a, 0xfc, 0x4e, 0x8a, 0x5a, 0xbb, 0x6b, 0xa7, 0x7d,
-	0x68, 0xe3, 0xf8, 0x69, 0xdc, 0xc1, 0xba, 0x3a, 0x82, 0xbb, 0x86, 0xe5, 0x18, 0x89, 0xf5, 0x63,
-	0x2d, 0x1e, 0xc2, 0x8b, 0x61, 0x6c, 0x8b, 0x31, 0xf4, 0xdb, 0xdd, 0x4c, 0x7f, 0x8d, 0x11, 0xd9,
-	0x84, 0xbe, 0x94, 0x41, 0x9f, 0x8d, 0xd9, 0xfd, 0x1a, 0xb3, 0x39, 0x3e, 0x82, 0xbb, 0x06, 0xd2,
-	0x26, 0xa4, 0xb0, 0x8b, 0x90, 0x1a, 0xb0, 0x34, 0x51, 0x59, 0x4b, 0x47, 0x36, 0x45, 0x50, 0x23,
-	0x8a, 0x18, 0x53, 0x98, 0xdf, 0x9b, 0xc2, 0xb8, 0x3f, 0x27, 0x74, 0xb4, 0x23, 0x34, 0x2e, 0xa7,
-	0xa3, 0x2b, 0x05, 0xa6, 0x8f, 0xe0, 0xde, 0x48, 0x1d, 0x6d, 0x2e, 0xf0, 0x0e, 0xcb, 0x72, 0x83,
-	0x3e, 0x9b, 0x74, 0x28, 0xb8, 0xdd, 0xdf, 0x82, 0xdd, 0x32, 0xd4, 0xe1, 0x4d, 0x28, 0x69, 0x13,
-	0x0c, 0x81, 0x94, 0x35, 0xa5, 0x47, 0x84, 0x34, 0x3f, 0xe8, 0xb3, 0x51, 0x7b, 0xc1, 0x35, 0xa5,
-	0xc7, 0xf1, 0x53, 0xb8, 0xad, 0xef, 0xc6, 0x4f, 0x2b, 0xa3, 0xc4, 0xb8, 0x8c, 0x76, 0x84, 0x86,
-	0x29, 0x23, 0xee, 0x77, 0x3f, 0x2c, 0x8c, 0x5a, 0x73, 0xb2, 0xf4, 0x4c, 0x54, 0x5a, 0xb7, 0x51,
-	0x7a, 0x8b, 0xca, 0x8a, 0xd0, 0xc0, 0xc5, 0x76, 0xa0, 0xb2, 0x22, 0x34, 0x4c, 0x2a, 0x75, 0x41,
-	0x8e, 0x53, 0x19, 0xbc, 0x11, 0x2a, 0xef, 0xb8, 0x50, 0xc9, 0xc2, 0x8a, 0x23, 0x59, 0x16, 0x9d,
-	0xaf, 0x29, 0x88, 0x0d, 0x11, 0xb9, 0xa6, 0xac, 0xa2, 0xcb, 0x5f, 0x50, 0x57, 0x23, 0xf3, 0xe2,
-	0x8b, 0x69, 0x05, 0x12, 0x0e, 0xb9, 0x59, 0xb9, 0xbf, 0xf5, 0xc3, 0xe2, 0x98, 0xfd, 0x16, 0xb5,
-	0x30, 0x7a, 0x40, 0x07, 0xae, 0x78, 0x40, 0xdf, 0xae, 0x1c, 0x52, 0x90, 0x74, 0x26, 0xcc, 0xe2,
-	0xf4, 0x95, 0x1f, 0xfe, 0xb7, 0xa7, 0xd6, 0x79, 0x24, 0x74, 0x0b, 0x15, 0xa1, 0x81, 0x34, 0xfa,
-	0x09, 0x84, 0xda, 0xb8, 0x85, 0x99, 0x8c, 0x6c, 0x25, 0x1c, 0x6f, 0x46, 0x03, 0x4c, 0x2e, 0x46,
-	0x32, 0x81, 0x7e, 0x0a, 0x51, 0x23, 0x5d, 0x41, 0x6e, 0xb5, 0x44, 0xad, 0x85, 0x24, 0x0d, 0xd3,
-	0x7b, 0x37, 0x9b, 0x18, 0xf4, 0xd9, 0x7b, 0xf6, 0x05, 0x0d, 0x11, 0x1c, 0x3f, 0x8b, 0x87, 0x72,
-	0xd6, 0xc8, 0x04, 0x69, 0x81, 0x1b, 0x21, 0x2d, 0xe8, 0x42, 0xda, 0x4f, 0xf8, 0xc0, 0x19, 0x32,
-	0x62, 0xdd, 0x68, 0x5f, 0x42, 0x48, 0x41, 0x6a, 0xa7, 0x69, 0x30, 0x33, 0xb3, 0xb5, 0xea, 0xc8,
-	0x8c, 0x09, 0xe7, 0x31, 0xb4, 0xd4, 0x6b, 0x23, 0x9e, 0x4c, 0xdb, 0x0e, 0xea, 0x31, 0xb8, 0xbf,
-	0xfc, 0x00, 0x7b, 0x6a, 0xbd, 0x24, 0xb6, 0x90, 0xdc, 0xb9, 0x1e, 0xbe, 0x3b, 0x92, 0x82, 0x04,
-	0x24, 0x76, 0x51, 0xcd, 0x8d, 0xef, 0x21, 0xc2, 0xe4, 0xfb, 0xd0, 0x1a, 0xb9, 0x51, 0xbe, 0xbf,
-	0x01, 0x5a, 0x42, 0x2f, 0xb4, 0xb2, 0x8a, 0x7e, 0xee, 0x20, 0x49, 0x40, 0x65, 0x05, 0x09, 0x5d,
-	0xcc, 0x7d, 0x30, 0xbb, 0x32, 0xe8, 0xb3, 0x4b, 0x86, 0x87, 0x49, 0x0c, 0xc7, 0x47, 0xf5, 0xc1,
-	0x22, 0x19, 0xd3, 0xeb, 0xe1, 0x41, 0xf1, 0x3f, 0xe0, 0xe7, 0x37, 0xe1, 0xf6, 0xba, 0x2b, 0xf7,
-	0xda, 0x78, 0x82, 0x10, 0xef, 0x07, 0x12, 0xde, 0x51, 0xff, 0x85, 0x02, 0x3e, 0x86, 0x08, 0xd9,
-	0x56, 0x7a, 0x46, 0xe4, 0x70, 0x5a, 0x1c, 0xf4, 0x59, 0x7a, 0x64, 0xcf, 0xe9, 0x46, 0x8e, 0x37,
-	0x8e, 0x31, 0x23, 0xf7, 0x9b, 0x3c, 0x9e, 0x9c, 0x2b, 0x7f, 0xe7, 0x63, 0x2b, 0x1f, 0x72, 0xa9,
-	0x7c, 0x15, 0xbf, 0x22, 0x46, 0x6b, 0x73, 0xdd, 0x02, 0xf8, 0xc3, 0x8f, 0xe5, 0xb5, 0x23, 0x34,
-	0x24, 0xf9, 0x79, 0x13, 0xd5, 0xea, 0x08, 0x9f, 0x57, 0x1f, 0xa1, 0x80, 0x35, 0x98, 0xad, 0x8c,
-	0x7a, 0x33, 0x04, 0xc0, 0x8f, 0x0f, 0x0f, 0x6b, 0xac, 0x4f, 0xac, 0xb9, 0xd5, 0x18, 0x1b, 0xcd,
-	0x1a, 0xef, 0xe8, 0x9d, 0x4f, 0x7c, 0x05, 0x09, 0xf8, 0x63, 0x73, 0x8c, 0xb1, 0x6b, 0xae, 0xcb,
-	0xfa, 0x6f, 0x14, 0xd0, 0x93, 0x20, 0xfa, 0x73, 0x48, 0xf1, 0xf9, 0x62, 0xe1, 0x60, 0xbf, 0x98,
-	0x2f, 0xf3, 0xf9, 0xe2, 0xe1, 0xb7, 0xa5, 0x72, 0xe9, 0xfb, 0x42, 0xbe, 0x7c, 0xb8, 0x5f, 0x2c,
-	0xe4, 0x73, 0xbb, 0x4f, 0x77, 0xf3, 0x5f, 0x45, 0x7d, 0xcc, 0xec, 0xc9, 0x69, 0x2a, 0x62, 0x1b,
-	0xa2, 0x57, 0x61, 0xc9, 0x71, 0xda, 0xfe, 0xc1, 0x41, 0x21, 0x4a, 0x31, 0x53, 0x27, 0xa7, 0xa9,
-	0xa0, 0xde, 0xa6, 0x37, 0x60, 0xd9, 0x11, 0x58, 0x3c, 0xcc, 0xe5, 0xf2, 0xc5, 0x62, 0xd4, 0xcf,
-	0x44, 0x4e, 0x4e, 0x53, 0x61, 0xd2, 0x65, 0x82, 0x2f, 0x7f, 0x4d, 0xfa, 0xb6, 0xde, 0x4e, 0x41,
-	0x60, 0x4f, 0xad, 0xd3, 0x0d, 0x98, 0x1d, 0xff, 0x4b, 0xe0, 0xbc, 0xfa, 0xc9, 0x6f, 0x75, 0x26,
-	0xe3, 0x11, 0x68, 0xf1, 0x7c, 0x0c, 0x33, 0x63, 0x1f, 0xe0, 0xf7, 0x3d, 0xb8, 0x28, 0x29, 0x3d,
-	0x26, 0xed, 0x0d, 0xe7, 0x12, 0x49, 0x7f, 0x11, 0x7b, 0x89, 0xb4, 0x23, 0x34, 0x3c, 0x45, 0xb2,
-	0x7d, 0x19, 0xd0, 0x1a, 0xd0, 0x0e, 0x5f, 0x05, 0xeb, 0x1e, 0xbc, 0x10, 0x2c, 0xb3, 0xe5, 0x1d,
-	0x6b, 0x45, 0x95, 0x20, 0x3a, 0xf1, 0x78, 0x5e, 0xbb, 0xc0, 0x8f, 0x85, 0x64, 0x1e, 0x78, 0x45,
-	0x5a, 0xf1, 0x9e, 0x43, 0xcc, 0xf1, 0xc1, 0xeb, 0xc5, 0x91, 0xb9, 0xce, 0x87, 0x97, 0x00, 0x5b,
-	0x81, 0x7f, 0x04, 0xb0, 0xbd, 0x0a, 0x39, 0x37, 0x17, 0x43, 0x0c, 0xb3, 0x7e, 0x31, 0xc6, 0xf2,
-	0x5e, 0x84, 0xb0, 0xf9, 0x00, 0x62, 0xdd, 0xa6, 0x11, 0x00, 0xb3, 0x7a, 0x01, 0xc0, 0xae, 0xbd,
-	0xb1, 0xbb, 0xf9, 0xfe, 0x05, 0x53, 0x09, 0xce, 0x5d, 0x7b, 0x2e, 0xf7, 0x49, 0x03, 0x66, 0xc7,
-	0x2f, 0x01, 0xd7, 0x2c, 0xc7, 0x80, 0xee, 0x9b, 0xd7, 0xe5, 0x90, 0xcc, 0x16, 0xdf, 0x9d, 0x25,
-	0xa9, 0xf7, 0x67, 0x49, 0xea, 0xef, 0xb3, 0x24, 0xf5, 0xea, 0x3c, 0xe9, 0x7b, 0x7f, 0x9e, 0xf4,
-	0x7d, 0x38, 0x4f, 0xfa, 0x8e, 0x9e, 0xd4, 0x45, 0xed, 0xb8, 0x53, 0x4d, 0x0b, 0x72, 0x2b, 0x23,
-	0xc8, 0x6a, 0x4b, 0x56, 0x33, 0x62, 0x55, 0xd8, 0xa8, 0xcb, 0x99, 0xee, 0xe3, 0x4c, 0x4b, 0xae,
-	0x75, 0x9a, 0x48, 0x35, 0x7e, 0x58, 0x3e, 0x78, 0xb4, 0x61, 0xfe, 0xb3, 0xd4, 0x7a, 0x6d, 0xa4,
-	0x56, 0x43, 0xf8, 0x7f, 0xe5, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02, 0xf0, 0xc5, 0x4c,
-	0x3e, 0x15, 0x00, 0x00,
+	// 1166 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x6e, 0xdb, 0x46,
+	0x17, 0x16, 0x65, 0x59, 0xb2, 0x8f, 0xfc, 0xc7, 0x0a, 0x9d, 0x8b, 0x42, 0xdb, 0x92, 0x7e, 0x2d,
+	0x62, 0xd7, 0xad, 0xa5, 0x58, 0xe9, 0x05, 0x09, 0x0a, 0x14, 0xb6, 0xaa, 0xa2, 0x06, 0xea, 0x0b,
+	0x28, 0xb9, 0x40, 0x2f, 0x28, 0x61, 0x8d, 0x26, 0x34, 0x21, 0x89, 0xc3, 0x92, 0x94, 0x12, 0x2d,
+	0xbb, 0x6a, 0x60, 0xa0, 0x40, 0x5f, 0xc0, 0x40, 0x80, 0xae, 0xba, 0xca, 0xbe, 0x4f, 0x90, 0x65,
+	0x80, 0x02, 0x6d, 0x17, 0x45, 0x51, 0xd8, 0x9b, 0x3e, 0x46, 0xc1, 0xe1, 0x90, 0xa2, 0x28, 0x32,
+	0x62, 0x62, 0xd5, 0x3b, 0xf2, 0x9c, 0x6f, 0xce, 0xe5, 0xfb, 0xe6, 0x46, 0xc2, 0x8a, 0xd2, 0x44,
+	0x65, 0x44, 0x74, 0x5c, 0x46, 0x27, 0xc7, 0xaa, 0x8a, 0x3b, 0xe5, 0xfe, 0x56, 0xd9, 0x7c, 0x52,
+	0xd2, 0x74, 0x62, 0x12, 0x7e, 0x49, 0x69, 0xa2, 0x92, 0xe5, 0x2d, 0x31, 0x6f, 0xa9, 0xbf, 0x25,
+	0xdc, 0x90, 0x89, 0x4c, 0xa8, 0xbf, 0x6c, 0x3d, 0xd9, 0x50, 0x21, 0x3f, 0x0c, 0xd4, 0x51, 0xb0,
+	0x6a, 0x5a, 0x71, 0xec, 0x27, 0x06, 0xf8, 0x7f, 0x50, 0x26, 0x27, 0x2c, 0x85, 0x14, 0x7f, 0xe0,
+	0x80, 0xdf, 0x33, 0xe4, 0xaa, 0x6d, 0x3c, 0xd0, 0xb0, 0xba, 0xab, 0x2a, 0x26, 0x7f, 0x1b, 0x52,
+	0x1a, 0xd1, 0x4d, 0x49, 0x69, 0x65, 0xb9, 0x02, 0xb7, 0x3e, 0x2f, 0x26, 0xad, 0xd7, 0xdd, 0x16,
+	0xff, 0x21, 0xa4, 0x58, 0x80, 0x6c, 0xbc, 0xc0, 0xad, 0xa7, 0x2b, 0x2b, 0xa5, 0x80, 0x82, 0x4b,
+	0x2c, 0xde, 0x4e, 0xe2, 0xc5, 0x5f, 0xf9, 0x98, 0xe8, 0x0c, 0xe1, 0x6f, 0x41, 0xd2, 0x50, 0x64,
+	0x15, 0xeb, 0xd9, 0x19, 0x3b, 0xaa, 0xfd, 0xf6, 0x70, 0xee, 0xe9, 0xb3, 0x7c, 0xec, 0x9f, 0x67,
+	0xf9, 0x58, 0xf1, 0x08, 0x84, 0xf1, 0x72, 0x44, 0x6c, 0x68, 0x44, 0x35, 0x30, 0xbf, 0x0a, 0xc0,
+	0x42, 0x0d, 0x2b, 0x9b, 0x67, 0x96, 0xdd, 0x16, 0x9f, 0x85, 0x54, 0x1f, 0xeb, 0x86, 0x42, 0x54,
+	0x5a, 0xdc, 0xbc, 0xe8, 0xbc, 0x16, 0x7f, 0x8f, 0xc3, 0xf5, 0xd1, 0xb8, 0x0d, 0x7d, 0x10, 0xde,
+	0x65, 0x05, 0x96, 0x34, 0x1d, 0xf7, 0x15, 0xd2, 0x33, 0x24, 0x4f, 0x42, 0x1a, 0x74, 0x27, 0x9e,
+	0xe5, 0xc4, 0xeb, 0x8e, 0xbb, 0xea, 0x26, 0xf7, 0x30, 0x33, 0xf3, 0xfa, 0xcc, 0x6c, 0xc1, 0x0d,
+	0x44, 0x7a, 0xaa, 0x89, 0x75, 0xed, 0x58, 0x37, 0x07, 0x92, 0xd3, 0x47, 0x82, 0xd6, 0xb5, 0xe4,
+	0xf5, 0x7d, 0x6e, 0xbb, 0x2c, 0x32, 0x34, 0x9d, 0x90, 0x47, 0x92, 0xa2, 0x2a, 0x66, 0x76, 0xb6,
+	0xc0, 0xad, 0x2f, 0x88, 0xf3, 0xd4, 0x42, 0x25, 0xac, 0xc2, 0x82, 0xed, 0x3e, 0xc1, 0x8a, 0x7c,
+	0x62, 0x66, 0x93, 0xb4, 0x28, 0xc1, 0x53, 0x94, 0x3d, 0x55, 0xfa, 0x5b, 0xa5, 0x4f, 0x29, 0x82,
+	0x95, 0x94, 0xa6, 0xa3, 0x6c, 0x93, 0x47, 0xb0, 0x54, 0x88, 0x60, 0x0d, 0xb8, 0x33, 0x46, 0xac,
+	0xab, 0x97, 0x47, 0x10, 0x6e, 0x44, 0x10, 0x9f, 0x92, 0x71, 0x9f, 0x92, 0xc5, 0x5f, 0xc6, 0xf4,
+	0xda, 0x46, 0xed, 0x70, 0xbd, 0x5e, 0x1d, 0x8d, 0x7f, 0x1f, 0x6e, 0x8f, 0x90, 0xeb, 0xc1, 0xda,
+	0xf3, 0xf0, 0xa6, 0xd7, 0x3d, 0x94, 0xf4, 0x0d, 0x44, 0x59, 0x06, 0x5b, 0x02, 0xc9, 0xd4, 0x07,
+	0x4c, 0x93, 0x39, 0x6a, 0xb0, 0xe6, 0xdb, 0x15, 0x49, 0xb2, 0xec, 0x97, 0x64, 0x1b, 0xb5, 0x1d,
+	0x49, 0x8a, 0xbf, 0x72, 0x70, 0x73, 0xd4, 0x5b, 0x25, 0xea, 0x23, 0x45, 0xef, 0xbe, 0x31, 0xbb,
+	0x6e, 0xcb, 0xc7, 0xa8, 0x4d, 0xf9, 0x74, 0x5a, 0xb6, 0x24, 0xf3, 0xb7, 0x9c, 0xb8, 0x5c, 0xcb,
+	0xb3, 0x21, 0x2d, 0xe7, 0x61, 0x35, 0xb0, 0x29, 0xb7, 0x6d, 0x02, 0x4b, 0x43, 0x40, 0xb5, 0x43,
+	0x0c, 0xfc, 0xea, 0x7d, 0x6e, 0x42, 0xcf, 0x93, 0x37, 0xb2, 0x55, 0x58, 0x0e, 0x48, 0xe8, 0xd6,
+	0xf3, 0x1b, 0x07, 0xb7, 0x7c, 0xfe, 0xcb, 0xea, 0x30, 0xba, 0x1f, 0xcc, 0x4c, 0xda, 0x0f, 0xfe,
+	0x23, 0x25, 0x0a, 0x90, 0x0b, 0xee, 0xcb, 0x6d, 0xfd, 0x4f, 0x0e, 0xfe, 0xb7, 0x67, 0xc8, 0x22,
+	0x46, 0xfd, 0xc3, 0x63, 0xd4, 0xc6, 0x26, 0xff, 0x00, 0x92, 0x1a, 0x7d, 0xa2, 0x0d, 0xa7, 0x2b,
+	0xcb, 0x81, 0x3b, 0xa7, 0x0d, 0x66, 0x55, 0xb1, 0x01, 0xfc, 0x5b, 0x90, 0xb1, 0xbb, 0x42, 0xa4,
+	0xdb, 0x55, 0xcc, 0x2e, 0x56, 0x4d, 0xca, 0xcc, 0x82, 0xb8, 0x48, 0xed, 0x55, 0xd7, 0x3c, 0x46,
+	0xc0, 0xcc, 0xe5, 0x08, 0x48, 0x84, 0x10, 0xf0, 0x0d, 0x5d, 0x5f, 0xc3, 0xee, 0xdc, 0xcd, 0xf0,
+	0x23, 0x48, 0xea, 0xd8, 0xe8, 0x75, 0xec, 0x2e, 0xaf, 0x55, 0xd6, 0x02, 0xbb, 0x74, 0xe0, 0x22,
+	0x85, 0x36, 0x06, 0x1a, 0x16, 0xd9, 0xb0, 0x87, 0x09, 0x2b, 0x47, 0xf1, 0xfb, 0x38, 0xc0, 0x9e,
+	0x21, 0x37, 0x94, 0x2e, 0x26, 0xbd, 0xe9, 0x70, 0xd7, 0x53, 0x75, 0x8c, 0xb0, 0xd2, 0xc7, 0xad,
+	0x11, 0xee, 0x8e, 0x5c, 0xf3, 0x74, 0xb8, 0x7b, 0x07, 0x78, 0x15, 0x3f, 0x31, 0x25, 0x03, 0x7f,
+	0xdb, 0xc3, 0x2a, 0xc2, 0x92, 0x8e, 0x51, 0x9f, 0xf2, 0x98, 0x10, 0x33, 0x96, 0xa7, 0xce, 0x1c,
+	0x16, 0x79, 0x11, 0xa6, 0xda, 0x57, 0xf4, 0xea, 0xc2, 0x88, 0x98, 0x36, 0xcd, 0xcf, 0xed, 0x13,
+	0x88, 0x45, 0x3f, 0x50, 0xe9, 0x54, 0xbe, 0x22, 0xb6, 0xf3, 0x90, 0x66, 0x93, 0xda, 0x4a, 0xca,
+	0x96, 0xb2, 0xbd, 0xb8, 0xed, 0x32, 0xa6, 0xb2, 0x96, 0x83, 0xe5, 0x98, 0x9d, 0x28, 0x47, 0x32,
+	0x44, 0x8e, 0x26, 0x3d, 0x76, 0x46, 0x09, 0x9b, 0xb6, 0x2a, 0xdf, 0xc5, 0xa9, 0xe6, 0xdb, 0xa8,
+	0xad, 0x92, 0xc7, 0x1d, 0xdc, 0x92, 0x31, 0x5d, 0xda, 0x97, 0x90, 0x65, 0x1d, 0x16, 0x8f, 0x47,
+	0xa3, 0x39, 0xaa, 0xf8, 0xcc, 0x43, 0x55, 0xac, 0x81, 0xad, 0x11, 0x55, 0xb6, 0x2d, 0xcb, 0x55,
+	0xed, 0xb0, 0x88, 0x5e, 0x91, 0x7d, 0x14, 0x4c, 0x99, 0xe8, 0x8d, 0x9f, 0x39, 0xe0, 0xc7, 0x41,
+	0xfc, 0x7b, 0x50, 0x10, 0x6b, 0xf5, 0xc3, 0x83, 0xfd, 0x7a, 0x4d, 0x12, 0x6b, 0xf5, 0xa3, 0xcf,
+	0x1a, 0x52, 0xe3, 0x8b, 0xc3, 0x9a, 0x74, 0xb4, 0x5f, 0x3f, 0xac, 0x55, 0x77, 0x3f, 0xd9, 0xad,
+	0x7d, 0x9c, 0x89, 0x09, 0x8b, 0xa7, 0x67, 0x85, 0xb4, 0xc7, 0xc4, 0xaf, 0xc1, 0x9d, 0xc0, 0x61,
+	0xfb, 0x07, 0x07, 0x87, 0x19, 0x4e, 0x98, 0x3b, 0x3d, 0x2b, 0x24, 0xac, 0x67, 0x7e, 0x13, 0x56,
+	0x02, 0x81, 0xf5, 0xa3, 0x6a, 0xb5, 0x56, 0xaf, 0x67, 0xe2, 0x42, 0xfa, 0xf4, 0xac, 0x90, 0x62,
+	0xaf, 0x42, 0xe2, 0xe9, 0x4f, 0xb9, 0x58, 0xe5, 0xf9, 0x1c, 0xcc, 0xec, 0x19, 0x32, 0xdf, 0x86,
+	0x45, 0xff, 0x77, 0x4c, 0x70, 0xf7, 0xe3, 0x5f, 0x18, 0x42, 0x39, 0x22, 0xd0, 0xe5, 0xf9, 0x04,
+	0xae, 0xf9, 0xbe, 0x26, 0xee, 0x46, 0x08, 0xd1, 0xd0, 0x07, 0x42, 0x29, 0x1a, 0x2e, 0x24, 0x93,
+	0x75, 0xa9, 0x8a, 0x92, 0x69, 0x1b, 0xb5, 0x23, 0x65, 0xf2, 0xdc, 0x0d, 0x79, 0x13, 0xf8, 0x80,
+	0x7b, 0xe1, 0x46, 0x84, 0x28, 0x0c, 0x2b, 0x54, 0xa2, 0x63, 0xdd, 0xac, 0x2a, 0x64, 0xc6, 0xee,
+	0x65, 0xeb, 0x13, 0xe2, 0xb8, 0x48, 0xe1, 0x5e, 0x54, 0xa4, 0x9b, 0xef, 0x31, 0x2c, 0x05, 0x5d,
+	0xbb, 0xde, 0x8e, 0x12, 0xc8, 0xe9, 0xf3, 0xfe, 0x6b, 0x80, 0xdd, 0xc4, 0x5f, 0x03, 0x78, 0x2e,
+	0x3d, 0xc5, 0xb0, 0x10, 0x43, 0x8c, 0xb0, 0x31, 0x19, 0xe3, 0x46, 0xaf, 0x43, 0xca, 0xb9, 0x13,
+	0xe4, 0xc3, 0x86, 0x31, 0x80, 0xb0, 0x36, 0x01, 0xe0, 0x9d, 0x7b, 0xbe, 0x13, 0xf0, 0xee, 0x84,
+	0xa1, 0x0c, 0x17, 0x3e, 0xf7, 0x42, 0x0e, 0x88, 0x36, 0x2c, 0xfa, 0x77, 0xf5, 0xd0, 0x2a, 0x7d,
+	0xc0, 0xf0, 0xc5, 0x1b, 0xb2, 0x49, 0xee, 0xd4, 0x5f, 0x9c, 0xe7, 0xb8, 0x97, 0xe7, 0x39, 0xee,
+	0xef, 0xf3, 0x1c, 0xf7, 0xe3, 0x45, 0x2e, 0xf6, 0xf2, 0x22, 0x17, 0xfb, 0xe3, 0x22, 0x17, 0xfb,
+	0xf2, 0x81, 0xac, 0x98, 0x27, 0xbd, 0x66, 0x09, 0x91, 0x6e, 0x19, 0x11, 0xa3, 0x4b, 0x8c, 0xb2,
+	0xd2, 0x44, 0x9b, 0x32, 0x29, 0xf7, 0x3f, 0x28, 0x77, 0x49, 0xab, 0xd7, 0xc1, 0x86, 0xfd, 0x4b,
+	0xe5, 0xde, 0xbb, 0x9b, 0xce, 0x5f, 0x15, 0x73, 0xa0, 0x61, 0xa3, 0x99, 0xa4, 0x7f, 0x54, 0xee,
+	0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x55, 0x0e, 0xc5, 0x69, 0xe0, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/core/23-commitment/types/commitment.pb.go b/modules/core/23-commitment/types/commitment.pb.go
index 190710ffbe1..06bb149a828 100644
--- a/modules/core/23-commitment/types/commitment.pb.go
+++ b/modules/core/23-commitment/types/commitment.pb.go
@@ -67,7 +67,7 @@ var xxx_messageInfo_MerkleRoot proto.InternalMessageInfo
 // The constructed key from the Path and the key will be append(Path.KeyPath,
 // append(Path.KeyPrefix, key...))
 type MerklePrefix struct {
-	KeyPrefix []byte `protobuf:"bytes,1,opt,name=key_prefix,json=keyPrefix,proto3" json:"key_prefix,omitempty" yaml:"key_prefix"`
+	KeyPrefix []byte `protobuf:"bytes,1,opt,name=key_prefix,json=keyPrefix,proto3" json:"key_prefix,omitempty"`
 }
 
 func (m *MerklePrefix) Reset()         { *m = MerklePrefix{} }
@@ -114,7 +114,7 @@ func (m *MerklePrefix) GetKeyPrefix() []byte {
 // arbitrary structured object (defined by a commitment type).
 // MerklePath is represented from root-to-leaf
 type MerklePath struct {
-	KeyPath []string `protobuf:"bytes,1,rep,name=key_path,json=keyPath,proto3" json:"key_path,omitempty" yaml:"key_path"`
+	KeyPath []string `protobuf:"bytes,1,rep,name=key_path,json=keyPath,proto3" json:"key_path,omitempty"`
 }
 
 func (m *MerklePath) Reset()      { *m = MerklePath{} }
@@ -217,29 +217,27 @@ func init() {
 }
 
 var fileDescriptor_7921d88972a41469 = []byte{
-	// 346 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcd, 0x4a, 0xc3, 0x40,
-	0x10, 0xc7, 0x13, 0x2c, 0xd5, 0x6e, 0x0b, 0x62, 0xfc, 0x40, 0x8a, 0xa4, 0x25, 0x07, 0xed, 0xa5,
-	0xbb, 0xb4, 0x15, 0x94, 0xe2, 0x29, 0x0a, 0x9e, 0x84, 0x92, 0x83, 0x07, 0x2f, 0x92, 0xac, 0xdb,
-	0x24, 0xb4, 0x71, 0x42, 0x76, 0x1b, 0xcc, 0x1b, 0x78, 0xf4, 0xe8, 0xd1, 0xc7, 0xf1, 0xd8, 0xa3,
-	0xa7, 0x22, 0xed, 0x1b, 0xf4, 0x09, 0x64, 0x77, 0xad, 0xe6, 0x36, 0xc3, 0xfc, 0xe6, 0xe3, 0xff,
-	0x1f, 0x74, 0x16, 0x07, 0x94, 0x50, 0xc8, 0x18, 0xa1, 0x90, 0x24, 0xb1, 0x48, 0xd8, 0xb3, 0x20,
-	0x79, 0xaf, 0x94, 0xe1, 0x34, 0x03, 0x01, 0xd6, 0x51, 0x1c, 0x50, 0x2c, 0x41, 0x5c, 0x2a, 0xe5,
-	0xbd, 0xe6, 0x41, 0x08, 0x21, 0x28, 0x84, 0xc8, 0x48, 0xd3, 0xcd, 0x13, 0x0a, 0x3c, 0x01, 0x4e,
-	0x62, 0xca, 0xfb, 0x03, 0x39, 0x2f, 0xcd, 0x00, 0xc6, 0x5c, 0x57, 0x9d, 0x53, 0x84, 0xee, 0x58,
-	0x36, 0x99, 0x32, 0x0f, 0x40, 0x58, 0x16, 0xaa, 0x44, 0x3e, 0x8f, 0x8e, 0xcd, 0xb6, 0xd9, 0x69,
-	0x78, 0x2a, 0x1e, 0x56, 0x5e, 0x3f, 0x5a, 0x86, 0x73, 0x83, 0x1a, 0x9a, 0x1b, 0x65, 0x6c, 0x1c,
-	0xbf, 0x58, 0xe7, 0x08, 0x4d, 0x58, 0xf1, 0x98, 0xaa, 0x4c, 0xf3, 0xee, 0xe1, 0x7a, 0xd1, 0xda,
-	0x2b, 0xfc, 0x64, 0x3a, 0x74, 0xfe, 0x6b, 0x8e, 0x57, 0x9b, 0xb0, 0x42, 0x77, 0x39, 0xee, 0x66,
-	0xdb, 0xc8, 0x17, 0x91, 0x85, 0xd1, 0x8e, 0xe2, 0x7c, 0x21, 0x37, 0x6e, 0x75, 0x6a, 0xee, 0xfe,
-	0x7a, 0xd1, 0xda, 0x2d, 0x4d, 0xf0, 0x45, 0xe4, 0x78, 0xdb, 0xb2, 0xdf, 0x17, 0xd1, 0xb0, 0xf2,
-	0x2e, 0x2f, 0xb9, 0x45, 0xf5, 0xcd, 0x25, 0x00, 0x63, 0xeb, 0x12, 0x55, 0xb5, 0x20, 0x35, 0xa2,
-	0xde, 0x6f, 0x63, 0xad, 0x17, 0x2b, 0xbd, 0x38, 0xef, 0xe1, 0xeb, 0x3f, 0x93, 0x54, 0x87, 0xf7,
-	0xcb, 0xbb, 0xf7, 0x9f, 0x4b, 0xdb, 0x9c, 0x2f, 0x6d, 0xf3, 0x7b, 0x69, 0x9b, 0x6f, 0x2b, 0xdb,
-	0x98, 0xaf, 0x6c, 0xe3, 0x6b, 0x65, 0x1b, 0x0f, 0x57, 0x61, 0x2c, 0xa2, 0x59, 0x20, 0xed, 0x25,
-	0x1b, 0xf7, 0x02, 0xda, 0x0d, 0x81, 0xe4, 0x17, 0x24, 0x81, 0xa7, 0xd9, 0x94, 0x71, 0xfd, 0xa9,
-	0xfe, 0xa0, 0x5b, 0x7a, 0x96, 0x28, 0x52, 0xc6, 0x83, 0xaa, 0x72, 0x76, 0xf0, 0x13, 0x00, 0x00,
-	0xff, 0xff, 0x90, 0xe5, 0x86, 0x50, 0xd0, 0x01, 0x00, 0x00,
+	// 316 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x31, 0x4f, 0xc3, 0x30,
+	0x10, 0x85, 0x13, 0x51, 0x15, 0xea, 0x76, 0xb2, 0x10, 0x82, 0x0a, 0x4c, 0xd5, 0x01, 0xba, 0xc4,
+	0x56, 0xdb, 0x01, 0x54, 0x31, 0xc1, 0xc0, 0x84, 0x54, 0x65, 0x60, 0x60, 0x41, 0x89, 0x71, 0x13,
+	0xab, 0x0d, 0x17, 0xc5, 0x6e, 0x44, 0xff, 0x01, 0x23, 0x23, 0x23, 0x3f, 0x87, 0xb1, 0x23, 0x23,
+	0x6a, 0xff, 0x08, 0xb2, 0xdd, 0xa0, 0x6c, 0x77, 0x7a, 0x9f, 0x9f, 0xfc, 0xde, 0xa1, 0x4b, 0x19,
+	0x73, 0xc6, 0xa1, 0x10, 0x8c, 0x43, 0x96, 0x49, 0x9d, 0x89, 0x57, 0xcd, 0xca, 0x61, 0x6d, 0xa3,
+	0x79, 0x01, 0x1a, 0xf0, 0x91, 0x8c, 0x39, 0x35, 0x20, 0xad, 0x49, 0xe5, 0xb0, 0x7b, 0x98, 0x40,
+	0x02, 0x16, 0x61, 0x66, 0x72, 0x74, 0xf7, 0x94, 0x83, 0xca, 0x40, 0x31, 0xc9, 0xd5, 0x68, 0x6c,
+	0xfc, 0xf2, 0x02, 0x60, 0xa6, 0x9c, 0xda, 0xbf, 0x40, 0xe8, 0x41, 0x14, 0xf3, 0x85, 0x08, 0x01,
+	0x34, 0xc6, 0xa8, 0x91, 0x46, 0x2a, 0x3d, 0xf6, 0x7b, 0xfe, 0xa0, 0x13, 0xda, 0x79, 0xd2, 0x78,
+	0xff, 0x3a, 0xf7, 0xfa, 0x01, 0xea, 0x38, 0x6e, 0x5a, 0x88, 0x99, 0x7c, 0xc3, 0x67, 0x08, 0xcd,
+	0xc5, 0xea, 0x39, 0xb7, 0xdb, 0x8e, 0x6f, 0xcd, 0xc5, 0xca, 0xc9, 0xfd, 0xa0, 0xb2, 0x9d, 0x46,
+	0x3a, 0xc5, 0x27, 0xe8, 0xc0, 0xc2, 0x91, 0x36, 0xd6, 0x7b, 0x83, 0x56, 0xb8, 0x6f, 0xd0, 0x48,
+	0xa7, 0x93, 0xc6, 0xa7, 0x71, 0xbf, 0x47, 0xed, 0xca, 0x1d, 0x60, 0x86, 0xaf, 0x51, 0xd3, 0x7d,
+	0xd2, 0xd2, 0xed, 0x51, 0x8f, 0xba, 0x0c, 0xd4, 0x66, 0xa0, 0xe5, 0x90, 0xde, 0xfd, 0x07, 0xb7,
+	0x2f, 0xc2, 0x1d, 0x7f, 0xfb, 0xf8, 0xbd, 0x21, 0xfe, 0x7a, 0x43, 0xfc, 0xdf, 0x0d, 0xf1, 0x3f,
+	0xb6, 0xc4, 0x5b, 0x6f, 0x89, 0xf7, 0xb3, 0x25, 0xde, 0xd3, 0x4d, 0x22, 0x75, 0xba, 0x8c, 0x4d,
+	0x65, 0xac, 0x6a, 0x24, 0xe6, 0x41, 0x02, 0xac, 0xbc, 0x62, 0x19, 0xbc, 0x2c, 0x17, 0x42, 0xb9,
+	0xf6, 0x47, 0xe3, 0xa0, 0x76, 0x00, 0xbd, 0xca, 0x85, 0x8a, 0x9b, 0xb6, 0xad, 0xf1, 0x5f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x74, 0x07, 0xaf, 0xf3, 0xa4, 0x01, 0x00, 0x00,
 }
 
 func (m *MerkleRoot) Marshal() (dAtA []byte, err error) {
diff --git a/modules/core/types/genesis.pb.go b/modules/core/types/genesis.pb.go
index 05dea516395..6e7ea86d410 100644
--- a/modules/core/types/genesis.pb.go
+++ b/modules/core/types/genesis.pb.go
@@ -29,11 +29,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // GenesisState defines the ibc module's genesis state.
 type GenesisState struct {
 	// ICS002 - Clients genesis state
-	ClientGenesis types.GenesisState `protobuf:"bytes,1,opt,name=client_genesis,json=clientGenesis,proto3" json:"client_genesis" yaml:"client_genesis"`
+	ClientGenesis types.GenesisState `protobuf:"bytes,1,opt,name=client_genesis,json=clientGenesis,proto3" json:"client_genesis"`
 	// ICS003 - Connections genesis state
-	ConnectionGenesis types1.GenesisState `protobuf:"bytes,2,opt,name=connection_genesis,json=connectionGenesis,proto3" json:"connection_genesis" yaml:"connection_genesis"`
+	ConnectionGenesis types1.GenesisState `protobuf:"bytes,2,opt,name=connection_genesis,json=connectionGenesis,proto3" json:"connection_genesis"`
 	// ICS004 - Channel genesis state
-	ChannelGenesis types2.GenesisState `protobuf:"bytes,3,opt,name=channel_genesis,json=channelGenesis,proto3" json:"channel_genesis" yaml:"channel_genesis"`
+	ChannelGenesis types2.GenesisState `protobuf:"bytes,3,opt,name=channel_genesis,json=channelGenesis,proto3" json:"channel_genesis"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -97,28 +97,26 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/types/v1/genesis.proto", fileDescriptor_b9a49c5663e6fc59) }
 
 var fileDescriptor_b9a49c5663e6fc59 = []byte{
-	// 324 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xb1, 0x4e, 0xeb, 0x30,
-	0x14, 0x86, 0x93, 0x5e, 0xe9, 0x0e, 0x01, 0x8a, 0x1a, 0x01, 0x82, 0x4a, 0xb8, 0x6d, 0xd4, 0x81,
-	0x05, 0x5b, 0x85, 0x01, 0x89, 0xb1, 0x0b, 0xcc, 0x61, 0x63, 0x41, 0x89, 0x31, 0xa9, 0x51, 0xe2,
-	0x53, 0xd5, 0x6e, 0xa4, 0xbe, 0x05, 0x8f, 0xd5, 0xb1, 0x23, 0x62, 0xa8, 0x50, 0xf2, 0x06, 0x3c,
-	0x01, 0x6a, 0x6c, 0x92, 0x54, 0xde, 0xa2, 0xff, 0x7c, 0xe7, 0xff, 0x8e, 0x92, 0x78, 0x03, 0x1e,
-	0x53, 0x42, 0x61, 0xc1, 0x88, 0x5a, 0xcd, 0x99, 0x24, 0xf9, 0x84, 0x24, 0x4c, 0x30, 0xc9, 0x25,
-	0x9e, 0x2f, 0x40, 0x81, 0xdf, 0xe3, 0x31, 0xc5, 0x3b, 0x00, 0x57, 0x00, 0xce, 0x27, 0xfd, 0x93,
-	0x04, 0x12, 0xa8, 0xa6, 0x64, 0xf7, 0xa4, 0xc1, 0xfe, 0xb0, 0x6e, 0xa2, 0x29, 0x67, 0x42, 0x59,
-	0x55, 0xfd, 0x71, 0x43, 0x80, 0x10, 0x8c, 0x2a, 0x0e, 0xc2, 0xa6, 0x46, 0x0d, 0x35, 0x8b, 0x84,
-	0x60, 0xa9, 0x85, 0x04, 0x5f, 0x1d, 0xef, 0xf0, 0x41, 0x27, 0x4f, 0x2a, 0x52, 0xcc, 0x7f, 0xf3,
-	0xba, 0x5a, 0xfa, 0x62, 0xc0, 0x73, 0x77, 0xe8, 0x5e, 0x1d, 0xdc, 0x0c, 0x71, 0x7d, 0xbd, 0x9e,
-	0xe3, 0x7c, 0x82, 0xdb, 0x9b, 0xd3, 0xcb, 0xf5, 0x76, 0xe0, 0xfc, 0x6c, 0x07, 0xa7, 0xab, 0x28,
-	0x4b, 0xef, 0x83, 0xfd, 0x96, 0x20, 0x3c, 0xd2, 0x81, 0x59, 0xf1, 0x73, 0xcf, 0x6f, 0x4e, 0xaf,
-	0x5d, 0x9d, 0xca, 0x35, 0x6e, 0xb9, 0x6a, 0xc6, 0xf2, 0x8d, 0x8c, 0xef, 0xc2, 0xf8, 0xac, 0xb6,
-	0x20, 0xec, 0x35, 0xe1, 0x9f, 0xf7, 0xdd, 0x3b, 0x36, 0x2f, 0xa3, 0x96, 0xfe, 0xab, 0xa4, 0xa3,
-	0x96, 0x54, 0x03, 0x96, 0x11, 0x19, 0xe3, 0x99, 0x31, 0xee, 0xf7, 0x04, 0x61, 0xd7, 0x24, 0x66,
-	0x69, 0xfa, 0xb8, 0x2e, 0x90, 0xbb, 0x29, 0x90, 0xfb, 0x5d, 0x20, 0xf7, 0xa3, 0x44, 0xce, 0xa6,
-	0x44, 0xce, 0x67, 0x89, 0x9c, 0x67, 0x9c, 0x70, 0x35, 0x5b, 0xc6, 0x98, 0x42, 0x46, 0x28, 0xc8,
-	0x0c, 0x24, 0xe1, 0x31, 0xbd, 0x4e, 0x80, 0xe4, 0x77, 0x24, 0x83, 0xd7, 0x65, 0xca, 0x64, 0xeb,
-	0x5f, 0x8a, 0xff, 0x57, 0x5f, 0xeb, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xb9, 0x8a, 0x1b,
-	0x64, 0x02, 0x00, 0x00,
+	// 293 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x4e, 0xeb, 0x30,
+	0x14, 0x40, 0x93, 0xbe, 0x27, 0x86, 0x00, 0x45, 0x8d, 0x18, 0x50, 0x06, 0x37, 0x45, 0x1d, 0x58,
+	0xb0, 0x15, 0x18, 0xd8, 0xbb, 0xc0, 0x82, 0x84, 0x60, 0x82, 0x05, 0x35, 0xc6, 0x72, 0x2d, 0x25,
+	0xbe, 0x55, 0xed, 0x46, 0xe2, 0x17, 0x98, 0xf8, 0xac, 0x8e, 0x1d, 0x99, 0x10, 0x4a, 0x7e, 0x04,
+	0xd5, 0x36, 0x4e, 0xa4, 0xa8, 0x5b, 0x94, 0x73, 0x7c, 0x7c, 0x6d, 0x47, 0x63, 0x91, 0x53, 0x42,
+	0x61, 0xc5, 0x88, 0x7e, 0x5f, 0x32, 0x45, 0xaa, 0x8c, 0x70, 0x26, 0x99, 0x12, 0x0a, 0x2f, 0x57,
+	0xa0, 0x21, 0x1e, 0x89, 0x9c, 0xe2, 0x9d, 0x80, 0x8d, 0x80, 0xab, 0x2c, 0x39, 0xe5, 0xc0, 0xc1,
+	0x50, 0xb2, 0xfb, 0xb2, 0x62, 0x92, 0xfa, 0x12, 0x2d, 0x04, 0x93, 0xba, 0x97, 0x4a, 0xa6, 0xad,
+	0x01, 0x52, 0x32, 0xaa, 0x05, 0xc8, 0xbe, 0x35, 0x69, 0xad, 0xc5, 0x5c, 0x4a, 0x56, 0xf4, 0x94,
+	0xf3, 0x8f, 0x41, 0x74, 0x74, 0x6b, 0xff, 0x3c, 0xe9, 0xb9, 0x66, 0xf1, 0x7d, 0x34, 0xb4, 0x9b,
+	0xbe, 0x3a, 0xf1, 0x2c, 0x4c, 0xc3, 0x8b, 0xc3, 0xab, 0x14, 0xfb, 0xe9, 0x2d, 0xc7, 0x55, 0x86,
+	0xbb, 0x2b, 0x67, 0xff, 0x37, 0xdf, 0xe3, 0xe0, 0xf1, 0xd8, 0x52, 0x47, 0xe2, 0xe7, 0x28, 0x6e,
+	0x27, 0xf4, 0xc9, 0x81, 0x49, 0x4e, 0x3b, 0x49, 0xef, 0xec, 0xc9, 0x8e, 0x5a, 0xe3, 0x2f, 0xfd,
+	0x10, 0x9d, 0xb8, 0x63, 0xf9, 0xee, 0x3f, 0xd3, 0x9d, 0x74, 0xba, 0x56, 0xd8, 0x13, 0x1d, 0x3a,
+	0xec, 0xd0, 0xec, 0x6e, 0x53, 0xa3, 0x70, 0x5b, 0xa3, 0xf0, 0xa7, 0x46, 0xe1, 0x67, 0x83, 0x82,
+	0x6d, 0x83, 0x82, 0xaf, 0x06, 0x05, 0x2f, 0x98, 0x0b, 0xbd, 0x58, 0xe7, 0x98, 0x42, 0x49, 0x28,
+	0xa8, 0x12, 0x14, 0x11, 0x39, 0xbd, 0xe4, 0x40, 0xaa, 0x1b, 0x52, 0xc2, 0xdb, 0xba, 0x60, 0xaa,
+	0xf3, 0xf6, 0xf9, 0x81, 0xb9, 0xdd, 0xeb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xc7, 0x25,
+	0x5b, 0x14, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/light-clients/06-solomachine/solomachine.pb.go b/modules/light-clients/06-solomachine/solomachine.pb.go
index f2152041bdf..91b84289abe 100644
--- a/modules/light-clients/06-solomachine/solomachine.pb.go
+++ b/modules/light-clients/06-solomachine/solomachine.pb.go
@@ -30,8 +30,8 @@ type ClientState struct {
 	// latest sequence of the client state
 	Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"`
 	// frozen sequence of the solo machine
-	IsFrozen       bool            `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty" yaml:"is_frozen"`
-	ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"`
+	IsFrozen       bool            `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty"`
+	ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
 }
 
 func (m *ClientState) Reset()         { *m = ClientState{} }
@@ -72,7 +72,7 @@ var xxx_messageInfo_ClientState proto.InternalMessageInfo
 // consensus state.
 type ConsensusState struct {
 	// public key of the solo machine
-	PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" yaml:"public_key"`
+	PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
 	// diversifier allows the same public key to be re-used across different solo
 	// machine clients (potentially on different chains) without being considered
 	// misbehaviour.
@@ -117,8 +117,8 @@ var xxx_messageInfo_ConsensusState proto.InternalMessageInfo
 type Header struct {
 	Timestamp      uint64     `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	Signature      []byte     `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
-	NewPublicKey   *types.Any `protobuf:"bytes,3,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty" yaml:"new_public_key"`
-	NewDiversifier string     `protobuf:"bytes,4,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"`
+	NewPublicKey   *types.Any `protobuf:"bytes,3,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"`
+	NewDiversifier string     `protobuf:"bytes,4,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"`
 }
 
 func (m *Header) Reset()         { *m = Header{} }
@@ -158,8 +158,8 @@ var xxx_messageInfo_Header proto.InternalMessageInfo
 // of a sequence and two signatures over different messages at that sequence.
 type Misbehaviour struct {
 	Sequence     uint64            `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"`
-	SignatureOne *SignatureAndData `protobuf:"bytes,2,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"`
-	SignatureTwo *SignatureAndData `protobuf:"bytes,3,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"`
+	SignatureOne *SignatureAndData `protobuf:"bytes,2,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty"`
+	SignatureTwo *SignatureAndData `protobuf:"bytes,3,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty"`
 }
 
 func (m *Misbehaviour) Reset()         { *m = Misbehaviour{} }
@@ -240,7 +240,7 @@ var xxx_messageInfo_SignatureAndData proto.InternalMessageInfo
 // TimestampedSignatureData contains the signature data and the timestamp of the
 // signature.
 type TimestampedSignatureData struct {
-	SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty" yaml:"signature_data"`
+	SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty"`
 	Timestamp     uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 }
 
@@ -327,9 +327,9 @@ var xxx_messageInfo_SignBytes proto.InternalMessageInfo
 // HeaderData returns the SignBytes data for update verification.
 type HeaderData struct {
 	// header public key
-	NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty" yaml:"new_pub_key"`
+	NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty"`
 	// header diversifier
-	NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"`
+	NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"`
 }
 
 func (m *HeaderData) Reset()         { *m = HeaderData{} }
@@ -381,52 +381,46 @@ func init() {
 }
 
 var fileDescriptor_264187157b9220a4 = []byte{
-	// 709 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
-	0x14, 0xce, 0xa4, 0xbe, 0x55, 0x33, 0xc9, 0x4d, 0x7b, 0xad, 0xb4, 0x4a, 0xa3, 0xab, 0x38, 0xf2,
-	0xaa, 0x9b, 0xda, 0xb7, 0xad, 0x74, 0x91, 0xca, 0x86, 0xa6, 0x15, 0x42, 0x50, 0x04, 0x72, 0xcb,
-	0x86, 0x4d, 0x34, 0x76, 0x26, 0xce, 0x08, 0x7b, 0x26, 0x64, 0xc6, 0x89, 0x82, 0x58, 0xb0, 0x64,
-	0xc9, 0x02, 0xf6, 0x08, 0x89, 0x77, 0x61, 0xd9, 0x65, 0x57, 0x11, 0x6a, 0x25, 0x1e, 0x20, 0x4f,
-	0x80, 0x3c, 0x76, 0xe2, 0x9f, 0x96, 0x54, 0x42, 0xec, 0xe6, 0x9c, 0x39, 0x3f, 0xdf, 0xf7, 0xcd,
-	0x39, 0x36, 0xdc, 0x23, 0xb6, 0x63, 0x7a, 0xc4, 0xed, 0x0b, 0xc7, 0x23, 0x98, 0x0a, 0x6e, 0x72,
-	0xe6, 0x31, 0x1f, 0x39, 0x7d, 0x42, 0xb1, 0x39, 0x3a, 0x48, 0x9b, 0xc6, 0x60, 0xc8, 0x04, 0x53,
-	0x35, 0x62, 0x3b, 0x46, 0x3a, 0xc5, 0x48, 0xc7, 0x8c, 0x0e, 0x1a, 0x35, 0x97, 0xb9, 0x4c, 0xc6,
-	0x9a, 0xe1, 0x29, 0x4a, 0x6b, 0x6c, 0xbb, 0x8c, 0xb9, 0x1e, 0x36, 0xa5, 0x65, 0x07, 0x3d, 0x13,
-	0xd1, 0x49, 0x74, 0xa5, 0x5f, 0x02, 0x58, 0x3e, 0x96, 0xb5, 0xce, 0x04, 0x12, 0x58, 0x6d, 0xc0,
-	0x35, 0x8e, 0x5f, 0x07, 0x98, 0x3a, 0xb8, 0x0e, 0x5a, 0x60, 0x47, 0xb1, 0x16, 0xb6, 0xba, 0x07,
-	0x4b, 0x84, 0x77, 0x7a, 0x43, 0xf6, 0x06, 0xd3, 0x7a, 0xb1, 0x05, 0x76, 0xd6, 0xda, 0xb5, 0xd9,
-	0x54, 0xdb, 0x98, 0x20, 0xdf, 0x3b, 0xd4, 0x17, 0x57, 0xba, 0xb5, 0x46, 0xf8, 0x43, 0x79, 0x54,
-	0x05, 0x5c, 0x77, 0x18, 0xe5, 0x98, 0xf2, 0x80, 0x77, 0x78, 0xd8, 0xa1, 0xbe, 0xd2, 0x02, 0x3b,
-	0xe5, 0x7d, 0xd3, 0xb8, 0x83, 0x8a, 0x71, 0x3c, 0xcf, 0x93, 0xc0, 0xda, 0x8d, 0xd9, 0x54, 0xdb,
-	0x8a, 0x3a, 0xe5, 0x2a, 0xea, 0x56, 0xd5, 0xc9, 0xc4, 0x1e, 0x2a, 0xef, 0x3f, 0x6b, 0x05, 0xfd,
-	0x0b, 0x80, 0xd5, 0x6c, 0x11, 0xf5, 0x31, 0x84, 0x83, 0xc0, 0xf6, 0x88, 0xd3, 0x79, 0x85, 0x27,
-	0x92, 0x5f, 0x79, 0xbf, 0x66, 0x44, 0xea, 0x18, 0x73, 0x75, 0x8c, 0x23, 0x3a, 0x69, 0x6f, 0xce,
-	0xa6, 0xda, 0x3f, 0x51, 0xbb, 0x24, 0x43, 0xb7, 0x4a, 0x91, 0xf1, 0x04, 0x4f, 0xd4, 0x16, 0x2c,
-	0x77, 0xc9, 0x08, 0x0f, 0x39, 0xe9, 0x11, 0x3c, 0x94, 0x7a, 0x94, 0xac, 0xb4, 0x4b, 0xfd, 0x17,
-	0x96, 0x04, 0xf1, 0x31, 0x17, 0xc8, 0x1f, 0x48, 0xda, 0x8a, 0x95, 0x38, 0x62, 0x90, 0x3f, 0x00,
-	0x5c, 0x7d, 0x84, 0x51, 0x37, 0x1f, 0x0e, 0x72, 0xe1, 0xe1, 0x2d, 0x27, 0x2e, 0x45, 0x22, 0x18,
-	0x62, 0xd9, 0xac, 0x62, 0x25, 0x0e, 0xf5, 0x05, 0xac, 0x52, 0x3c, 0xee, 0xa4, 0xc8, 0xad, 0x2c,
-	0x21, 0xb7, 0x3d, 0x9b, 0x6a, 0x9b, 0x11, 0xb9, 0x6c, 0x96, 0x6e, 0x55, 0x28, 0x1e, 0x3f, 0x5f,
-	0x70, 0x3c, 0x86, 0xeb, 0x61, 0x40, 0x9a, 0xa7, 0x12, 0xf2, 0x4c, 0xbf, 0x46, 0x2e, 0x40, 0xb7,
-	0x42, 0x24, 0x27, 0x89, 0x23, 0x26, 0xfa, 0xb1, 0x08, 0x2b, 0x4f, 0x09, 0xb7, 0x71, 0x1f, 0x8d,
-	0x08, 0x0b, 0x86, 0x4b, 0x27, 0x6d, 0x00, 0xff, 0x5e, 0x70, 0xeb, 0x30, 0x1a, 0x11, 0x2e, 0xef,
-	0xef, 0xdd, 0x39, 0x34, 0x67, 0xf3, 0xac, 0x23, 0xda, 0x3d, 0x41, 0x02, 0xb5, 0xeb, 0xb3, 0xa9,
-	0x56, 0x8b, 0x80, 0x66, 0x2a, 0xea, 0x56, 0x65, 0x61, 0x3f, 0xa3, 0xb9, 0x8e, 0x62, 0xcc, 0x62,
-	0xfd, 0xfe, 0x54, 0x47, 0x31, 0x66, 0xe9, 0x8e, 0xe7, 0x63, 0x16, 0xcb, 0xf2, 0x16, 0x6e, 0xe4,
-	0x2b, 0x64, 0x9f, 0x1a, 0xe4, 0x9f, 0x5a, 0x85, 0xca, 0x00, 0x89, 0x7e, 0x3c, 0x03, 0xf2, 0x1c,
-	0xfa, 0xba, 0x48, 0x20, 0x09, 0xba, 0x62, 0xc9, 0x73, 0x76, 0x9c, 0x94, 0xdb, 0xa7, 0xef, 0x1d,
-	0x80, 0xf5, 0xf3, 0xb9, 0x0f, 0x77, 0x17, 0x48, 0x24, 0x8c, 0x07, 0xb0, 0x9a, 0x10, 0x90, 0xe5,
-	0x25, 0x96, 0xf4, 0xf4, 0x64, 0xef, 0x75, 0x2b, 0xd1, 0xf0, 0xe4, 0x06, 0x84, 0xe2, 0xed, 0x10,
-	0x3e, 0x01, 0x58, 0x0a, 0xfb, 0xb6, 0x27, 0x02, 0xf3, 0xa5, 0x43, 0xb1, 0xb4, 0x5a, 0x7e, 0x1d,
-	0x57, 0x6e, 0xae, 0xe3, 0x5c, 0x38, 0xe5, 0x16, 0xe1, 0xfe, 0x4a, 0x84, 0x8b, 0x71, 0x7d, 0x05,
-	0x10, 0x46, 0x8b, 0x29, 0xa9, 0x9c, 0xc2, 0x72, 0xbc, 0x2a, 0x77, 0x7e, 0x3a, 0xb6, 0x66, 0x53,
-	0x4d, 0xcd, 0x6c, 0x57, 0xfc, 0xed, 0x88, 0x56, 0xeb, 0x17, 0x7b, 0x55, 0xfc, 0xbd, 0xbd, 0x6a,
-	0xf7, 0xbe, 0x5d, 0x35, 0xc1, 0xc5, 0x55, 0x13, 0x7c, 0xbf, 0x6a, 0x82, 0x0f, 0xd7, 0xcd, 0xc2,
-	0xc5, 0x75, 0xb3, 0x70, 0x79, 0xdd, 0x2c, 0xbc, 0x3c, 0x75, 0x89, 0xe8, 0x07, 0xb6, 0xe1, 0x30,
-	0xdf, 0x74, 0x18, 0xf7, 0x19, 0x37, 0x89, 0xed, 0xec, 0xba, 0xcc, 0x1c, 0xdd, 0x33, 0x7d, 0xd6,
-	0x0d, 0x3c, 0xcc, 0xa3, 0xff, 0xcf, 0xee, 0xfc, 0x07, 0xf4, 0xdf, 0xff, 0xbb, 0xa9, 0xf1, 0xbe,
-	0x9f, 0x3a, 0xdb, 0xab, 0x92, 0xe3, 0xc1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0xe1, 0xf5,
-	0xc9, 0xb6, 0x06, 0x00, 0x00,
+	// 619 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0xce, 0xb6, 0xfe, 0x55, 0xcd, 0x3a, 0xbf, 0x14, 0x59, 0x3d, 0x84, 0x82, 0xdc, 0xa8, 0x12,
+	0xa2, 0x97, 0xd8, 0x34, 0x41, 0x20, 0x95, 0x53, 0xdb, 0x08, 0x21, 0x01, 0x02, 0xb9, 0x15, 0x42,
+	0x5c, 0xa2, 0xb5, 0xbd, 0x71, 0x56, 0xd8, 0xbb, 0xa9, 0x77, 0x9d, 0x28, 0x88, 0x07, 0x40, 0xe2,
+	0xc2, 0x85, 0x3b, 0x27, 0xae, 0xbc, 0x06, 0xc7, 0x1e, 0x39, 0x56, 0xc9, 0x8b, 0x20, 0xaf, 0xed,
+	0xd8, 0x71, 0xd3, 0xe4, 0xc0, 0x6d, 0x66, 0x3c, 0xf3, 0xed, 0xf7, 0xcd, 0x1f, 0xc3, 0x23, 0x62,
+	0x3b, 0xa6, 0x4f, 0xbc, 0x81, 0x70, 0x7c, 0x82, 0xa9, 0xe0, 0x26, 0x67, 0x3e, 0x0b, 0x90, 0x33,
+	0x20, 0x14, 0x9b, 0xa3, 0x4e, 0xd1, 0x35, 0x86, 0x21, 0x13, 0x4c, 0xdb, 0x27, 0xb6, 0x63, 0x14,
+	0x4b, 0x8c, 0x62, 0xce, 0xa8, 0xb3, 0xb7, 0xeb, 0x31, 0x8f, 0xc9, 0x5c, 0x33, 0xb6, 0x92, 0xb2,
+	0xbd, 0xbb, 0x1e, 0x63, 0x9e, 0x8f, 0x4d, 0xe9, 0xd9, 0x51, 0xdf, 0x44, 0x74, 0x92, 0x7c, 0x3a,
+	0xf8, 0x09, 0xa0, 0x7a, 0x26, 0xb1, 0xce, 0x05, 0x12, 0x58, 0xdb, 0x83, 0xdb, 0x1c, 0x5f, 0x46,
+	0x98, 0x3a, 0xb8, 0x01, 0x9a, 0xe0, 0x50, 0xb1, 0xe6, 0xbe, 0x76, 0x0f, 0x56, 0x09, 0xef, 0xf5,
+	0x43, 0xf6, 0x09, 0xd3, 0xc6, 0x46, 0x13, 0x1c, 0x6e, 0x5b, 0xdb, 0x84, 0x3f, 0x97, 0xbe, 0xf6,
+	0x1e, 0xee, 0x38, 0x8c, 0x72, 0x4c, 0x79, 0xc4, 0x7b, 0x3c, 0xc6, 0x6a, 0x6c, 0x36, 0xc1, 0xa1,
+	0xda, 0x36, 0x8d, 0x35, 0xa4, 0x8d, 0xb3, 0xac, 0x4e, 0x52, 0xb0, 0xea, 0xce, 0x82, 0x7f, 0xac,
+	0x7c, 0xf9, 0xb1, 0x5f, 0x39, 0xf8, 0x0a, 0x60, 0x7d, 0x31, 0x51, 0xeb, 0x40, 0x38, 0x8c, 0x6c,
+	0x9f, 0x38, 0xbd, 0x8f, 0x78, 0x22, 0xd9, 0xaa, 0xed, 0x5d, 0x23, 0xd1, 0x6a, 0x64, 0x5a, 0x8d,
+	0x13, 0x3a, 0xb1, 0xaa, 0x49, 0xde, 0x4b, 0x3c, 0xd1, 0x9a, 0x50, 0x75, 0xc9, 0x08, 0x87, 0x9c,
+	0xf4, 0x09, 0x0e, 0xa5, 0x8c, 0xaa, 0x55, 0x0c, 0x69, 0xf7, 0x61, 0x55, 0x90, 0x00, 0x73, 0x81,
+	0x82, 0xa1, 0xd4, 0xa0, 0x58, 0x79, 0x20, 0x65, 0xf3, 0x0b, 0xc0, 0xad, 0x17, 0x18, 0xb9, 0xe5,
+	0x74, 0x50, 0x4a, 0x8f, 0xbf, 0x72, 0xe2, 0x51, 0x24, 0xa2, 0x10, 0xcb, 0xc7, 0x6a, 0x56, 0x1e,
+	0xd0, 0x8e, 0x61, 0x9d, 0xe2, 0x71, 0xaf, 0xa0, 0x62, 0x73, 0x85, 0x8a, 0x1a, 0xc5, 0xe3, 0xb7,
+	0x73, 0x21, 0x0f, 0xe1, 0x4e, 0x5c, 0x5b, 0x14, 0xa3, 0x48, 0x31, 0x31, 0x64, 0x37, 0x8f, 0xa6,
+	0x8c, 0xaf, 0x01, 0xac, 0xbd, 0x26, 0xdc, 0xc6, 0x03, 0x34, 0x22, 0x2c, 0x0a, 0x57, 0x4e, 0xfa,
+	0x1d, 0xfc, 0x7f, 0x4e, 0xb2, 0xc7, 0x68, 0xc2, 0x5c, 0x6d, 0x1f, 0xad, 0x1d, 0xe5, 0x79, 0x56,
+	0x75, 0x42, 0xdd, 0x2e, 0x12, 0xc8, 0xaa, 0xcd, 0x71, 0xde, 0xd0, 0x12, 0xae, 0x18, 0xb3, 0x54,
+	0xee, 0x3f, 0xe1, 0x5e, 0x8c, 0x59, 0x2a, 0xf1, 0x33, 0xbc, 0x53, 0xce, 0x5b, 0xec, 0x3f, 0x28,
+	0xf7, 0x5f, 0x83, 0xca, 0x10, 0x89, 0x41, 0x3a, 0x18, 0x69, 0xc7, 0x31, 0x17, 0x09, 0x24, 0xa9,
+	0xd5, 0x2c, 0x69, 0x2f, 0xce, 0x58, 0x59, 0xbe, 0x12, 0x18, 0x36, 0x2e, 0xb2, 0x10, 0x76, 0xe7,
+	0x44, 0x24, 0x8b, 0x07, 0xb0, 0x9e, 0xeb, 0x96, 0xe8, 0x09, 0x95, 0xbc, 0x1b, 0xdd, 0x1b, 0xcf,
+	0x6c, 0x2c, 0x7f, 0xe6, 0x3b, 0x80, 0xd5, 0x18, 0xfc, 0x74, 0x22, 0x30, 0x5f, 0x39, 0xc4, 0x95,
+	0x68, 0xe5, 0x3b, 0xd8, 0xbc, 0x79, 0x07, 0x59, 0x73, 0x94, 0x25, 0xcd, 0xf9, 0x2f, 0x6f, 0x4e,
+	0xca, 0xeb, 0x12, 0xc2, 0xe4, 0x20, 0xa4, 0x92, 0xc7, 0x50, 0x4d, 0x17, 0x7b, 0xfd, 0x6d, 0x26,
+	0x5b, 0x7d, 0xcb, 0x4a, 0x6f, 0xdc, 0xbe, 0xd2, 0xa7, 0xfd, 0xdf, 0x53, 0x1d, 0x5c, 0x4d, 0x75,
+	0x70, 0x3d, 0xd5, 0xc1, 0xb7, 0x99, 0x5e, 0xb9, 0x9a, 0xe9, 0x95, 0x3f, 0x33, 0xbd, 0xf2, 0xe1,
+	0x95, 0x47, 0xc4, 0x20, 0xb2, 0x0d, 0x87, 0x05, 0xa6, 0xc3, 0x78, 0xc0, 0xb8, 0x49, 0x6c, 0xa7,
+	0xe5, 0x31, 0x73, 0xf4, 0xd4, 0x0c, 0x98, 0x1b, 0xf9, 0x98, 0x27, 0xbf, 0xde, 0x56, 0xf6, 0xef,
+	0x7d, 0xf4, 0xa4, 0x55, 0xd8, 0xb9, 0x67, 0x05, 0xdb, 0xde, 0x92, 0x7c, 0x3b, 0x7f, 0x03, 0x00,
+	0x00, 0xff, 0xff, 0x7a, 0x66, 0xd4, 0xda, 0xb1, 0x05, 0x00, 0x00,
 }
 
 func (m *ClientState) Marshal() (dAtA []byte, err error) {
diff --git a/modules/light-clients/07-tendermint/tendermint.pb.go b/modules/light-clients/07-tendermint/tendermint.pb.go
index 169630c8cf9..e88522af74f 100644
--- a/modules/light-clients/07-tendermint/tendermint.pb.go
+++ b/modules/light-clients/07-tendermint/tendermint.pb.go
@@ -37,20 +37,20 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // and a possible frozen height.
 type ClientState struct {
 	ChainId    string   `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
-	TrustLevel Fraction `protobuf:"bytes,2,opt,name=trust_level,json=trustLevel,proto3" json:"trust_level" yaml:"trust_level"`
+	TrustLevel Fraction `protobuf:"bytes,2,opt,name=trust_level,json=trustLevel,proto3" json:"trust_level"`
 	// duration of the period since the LastestTimestamp during which the
 	// submitted headers are valid for upgrade
-	TrustingPeriod time.Duration `protobuf:"bytes,3,opt,name=trusting_period,json=trustingPeriod,proto3,stdduration" json:"trusting_period" yaml:"trusting_period"`
+	TrustingPeriod time.Duration `protobuf:"bytes,3,opt,name=trusting_period,json=trustingPeriod,proto3,stdduration" json:"trusting_period"`
 	// duration of the staking unbonding period
-	UnbondingPeriod time.Duration `protobuf:"bytes,4,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period" yaml:"unbonding_period"`
+	UnbondingPeriod time.Duration `protobuf:"bytes,4,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period"`
 	// defines how much new (untrusted) header's Time can drift into the future.
-	MaxClockDrift time.Duration `protobuf:"bytes,5,opt,name=max_clock_drift,json=maxClockDrift,proto3,stdduration" json:"max_clock_drift" yaml:"max_clock_drift"`
+	MaxClockDrift time.Duration `protobuf:"bytes,5,opt,name=max_clock_drift,json=maxClockDrift,proto3,stdduration" json:"max_clock_drift"`
 	// Block height when the client was frozen due to a misbehaviour
-	FrozenHeight types.Height `protobuf:"bytes,6,opt,name=frozen_height,json=frozenHeight,proto3" json:"frozen_height" yaml:"frozen_height"`
+	FrozenHeight types.Height `protobuf:"bytes,6,opt,name=frozen_height,json=frozenHeight,proto3" json:"frozen_height"`
 	// Latest height the client was updated to
-	LatestHeight types.Height `protobuf:"bytes,7,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height" yaml:"latest_height"`
+	LatestHeight types.Height `protobuf:"bytes,7,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height"`
 	// Proof specifications used in verifying counterparty state
-	ProofSpecs []*_go.ProofSpec `protobuf:"bytes,8,rep,name=proof_specs,json=proofSpecs,proto3" json:"proof_specs,omitempty" yaml:"proof_specs"`
+	ProofSpecs []*_go.ProofSpec `protobuf:"bytes,8,rep,name=proof_specs,json=proofSpecs,proto3" json:"proof_specs,omitempty"`
 	// Path at which next upgraded client will be committed.
 	// Each element corresponds to the key for a single CommitmentProof in the
 	// chained proof. NOTE: ClientState must stored under
@@ -58,11 +58,11 @@ type ClientState struct {
 	// under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using
 	// the default upgrade module, upgrade_path should be []string{"upgrade",
 	// "upgradedIBCState"}`
-	UpgradePath []string `protobuf:"bytes,9,rep,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty" yaml:"upgrade_path"`
+	UpgradePath []string `protobuf:"bytes,9,rep,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty"`
 	// allow_update_after_expiry is deprecated
-	AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty" yaml:"allow_update_after_expiry"` // Deprecated: Do not use.
+	AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty"` // Deprecated: Do not use.
 	// allow_update_after_misbehaviour is deprecated
-	AllowUpdateAfterMisbehaviour bool `protobuf:"varint,11,opt,name=allow_update_after_misbehaviour,json=allowUpdateAfterMisbehaviour,proto3" json:"allow_update_after_misbehaviour,omitempty" yaml:"allow_update_after_misbehaviour"` // Deprecated: Do not use.
+	AllowUpdateAfterMisbehaviour bool `protobuf:"varint,11,opt,name=allow_update_after_misbehaviour,json=allowUpdateAfterMisbehaviour,proto3" json:"allow_update_after_misbehaviour,omitempty"` // Deprecated: Do not use.
 }
 
 func (m *ClientState) Reset()         { *m = ClientState{} }
@@ -105,7 +105,7 @@ type ConsensusState struct {
 	Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
 	// commitment root (i.e app hash)
 	Root               types1.MerkleRoot                                `protobuf:"bytes,2,opt,name=root,proto3" json:"root"`
-	NextValidatorsHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"next_validators_hash,omitempty" yaml:"next_validators_hash"`
+	NextValidatorsHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"next_validators_hash,omitempty"`
 }
 
 func (m *ConsensusState) Reset()         { *m = ConsensusState{} }
@@ -145,9 +145,9 @@ var xxx_messageInfo_ConsensusState proto.InternalMessageInfo
 // that implements Misbehaviour interface expected by ICS-02
 type Misbehaviour struct {
 	// ClientID is deprecated
-	ClientId string  `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use.
-	Header1  *Header `protobuf:"bytes,2,opt,name=header_1,json=header1,proto3" json:"header_1,omitempty" yaml:"header_1"`
-	Header2  *Header `protobuf:"bytes,3,opt,name=header_2,json=header2,proto3" json:"header_2,omitempty" yaml:"header_2"`
+	ClientId string  `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: Do not use.
+	Header1  *Header `protobuf:"bytes,2,opt,name=header_1,json=header1,proto3" json:"header_1,omitempty"`
+	Header2  *Header `protobuf:"bytes,3,opt,name=header_2,json=header2,proto3" json:"header_2,omitempty"`
 }
 
 func (m *Misbehaviour) Reset()         { *m = Misbehaviour{} }
@@ -196,10 +196,10 @@ var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo
 // hash to TrustedConsensusState.NextValidatorsHash since that is the last
 // trusted validator set at the TrustedHeight.
 type Header struct {
-	*types2.SignedHeader `protobuf:"bytes,1,opt,name=signed_header,json=signedHeader,proto3,embedded=signed_header" json:"signed_header,omitempty" yaml:"signed_header"`
-	ValidatorSet         *types2.ValidatorSet `protobuf:"bytes,2,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty" yaml:"validator_set"`
-	TrustedHeight        types.Height         `protobuf:"bytes,3,opt,name=trusted_height,json=trustedHeight,proto3" json:"trusted_height" yaml:"trusted_height"`
-	TrustedValidators    *types2.ValidatorSet `protobuf:"bytes,4,opt,name=trusted_validators,json=trustedValidators,proto3" json:"trusted_validators,omitempty" yaml:"trusted_validators"`
+	*types2.SignedHeader `protobuf:"bytes,1,opt,name=signed_header,json=signedHeader,proto3,embedded=signed_header" json:"signed_header,omitempty"`
+	ValidatorSet         *types2.ValidatorSet `protobuf:"bytes,2,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"`
+	TrustedHeight        types.Height         `protobuf:"bytes,3,opt,name=trusted_height,json=trustedHeight,proto3" json:"trusted_height"`
+	TrustedValidators    *types2.ValidatorSet `protobuf:"bytes,4,opt,name=trusted_validators,json=trustedValidators,proto3" json:"trusted_validators,omitempty"`
 }
 
 func (m *Header) Reset()         { *m = Header{} }
@@ -323,76 +323,66 @@ func init() {
 }
 
 var fileDescriptor_c6d6cf2b288949be = []byte{
-	// 1091 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xe3, 0xc4,
-	0x17, 0x6f, 0xda, 0x7e, 0xdb, 0x64, 0x92, 0x6e, 0xf7, 0x6b, 0x4a, 0x37, 0x2d, 0xdd, 0x38, 0x32,
-	0x52, 0xe9, 0x81, 0xda, 0x9b, 0xf4, 0xb0, 0x52, 0xe1, 0x82, 0xbb, 0xa0, 0xee, 0x8a, 0x95, 0x2a,
-	0x07, 0x38, 0x20, 0x21, 0x33, 0xb1, 0x27, 0xf1, 0x68, 0x6d, 0x8f, 0xe5, 0x19, 0x87, 0x96, 0x3b,
-	0x12, 0x37, 0xf6, 0x88, 0x38, 0xed, 0x9f, 0xb3, 0xc7, 0x1e, 0x39, 0x19, 0xd4, 0xfe, 0x07, 0x39,
-	0x70, 0xe0, 0x84, 0xe6, 0x87, 0x7f, 0xa4, 0xdb, 0xa5, 0x5a, 0x2e, 0xd1, 0xbc, 0xf7, 0x3e, 0xef,
-	0xf3, 0xc9, 0xbc, 0x79, 0xf3, 0xc6, 0xc0, 0xc2, 0x63, 0xcf, 0x0a, 0xf1, 0x34, 0x60, 0x5e, 0x88,
-	0x51, 0xcc, 0xa8, 0xc5, 0x50, 0xec, 0xa3, 0x34, 0xc2, 0x31, 0xb3, 0x66, 0x83, 0x9a, 0x65, 0x26,
-	0x29, 0x61, 0x44, 0xeb, 0xe1, 0xb1, 0x67, 0xd6, 0x13, 0xcc, 0x1a, 0x64, 0x36, 0xd8, 0xed, 0xd7,
-	0xf2, 0xd9, 0x45, 0x82, 0xa8, 0x35, 0x83, 0x21, 0xf6, 0x21, 0x23, 0xa9, 0x64, 0xd8, 0xdd, 0x7b,
-	0x03, 0x21, 0x7e, 0x8b, 0xa8, 0x47, 0x68, 0x44, 0xa8, 0x85, 0x3d, 0x3a, 0x3c, 0xe2, 0xff, 0x20,
-	0x49, 0x09, 0x99, 0x14, 0xd1, 0xde, 0x94, 0x90, 0x69, 0x88, 0x2c, 0x61, 0x8d, 0xb3, 0x89, 0xe5,
-	0x67, 0x29, 0x64, 0x98, 0xc4, 0x2a, 0xae, 0xdf, 0x8c, 0x33, 0x1c, 0x21, 0xca, 0x60, 0x94, 0x14,
-	0x00, 0xbe, 0x5f, 0x8f, 0xa4, 0xc8, 0x92, 0x7f, 0x9f, 0x2b, 0xc8, 0x95, 0x02, 0x7c, 0x54, 0x01,
-	0x48, 0x14, 0x61, 0x16, 0x15, 0xa0, 0xd2, 0x52, 0xc0, 0xad, 0x29, 0x99, 0x12, 0xb1, 0xb4, 0xf8,
-	0x4a, 0x7a, 0x8d, 0xbf, 0xd6, 0x41, 0xfb, 0x44, 0xf0, 0x8d, 0x18, 0x64, 0x48, 0xdb, 0x01, 0x4d,
-	0x2f, 0x80, 0x38, 0x76, 0xb1, 0xdf, 0x6d, 0xf4, 0x1b, 0x07, 0x2d, 0x67, 0x5d, 0xd8, 0x4f, 0x7d,
-	0x0d, 0x81, 0x36, 0x4b, 0x33, 0xca, 0xdc, 0x10, 0xcd, 0x50, 0xd8, 0x5d, 0xee, 0x37, 0x0e, 0xda,
-	0xc3, 0x03, 0xf3, 0xdf, 0xeb, 0x6b, 0x7e, 0x91, 0x42, 0x8f, 0x6f, 0xd8, 0xde, 0x7d, 0x9d, 0xeb,
-	0x4b, 0xf3, 0x5c, 0xd7, 0x2e, 0x60, 0x14, 0x1e, 0x1b, 0x35, 0x2a, 0xc3, 0x01, 0xc2, 0xfa, 0x92,
-	0x1b, 0xda, 0x04, 0x6c, 0x0a, 0x0b, 0xc7, 0x53, 0x37, 0x41, 0x29, 0x26, 0x7e, 0x77, 0x45, 0x48,
-	0xed, 0x98, 0xb2, 0x58, 0x66, 0x51, 0x2c, 0xf3, 0x89, 0x2a, 0xa6, 0x6d, 0x28, 0xee, 0xed, 0x1a,
-	0x77, 0x95, 0x6f, 0xfc, 0xfa, 0x87, 0xde, 0x70, 0xee, 0x15, 0xde, 0x33, 0xe1, 0xd4, 0x30, 0xb8,
-	0x9f, 0xc5, 0x63, 0x12, 0xfb, 0x35, 0xa1, 0xd5, 0xbb, 0x84, 0x3e, 0x54, 0x42, 0x0f, 0xa4, 0xd0,
-	0x4d, 0x02, 0xa9, 0xb4, 0x59, 0xba, 0x95, 0x14, 0x02, 0x9b, 0x11, 0x3c, 0x77, 0xbd, 0x90, 0x78,
-	0x2f, 0x5c, 0x3f, 0xc5, 0x13, 0xd6, 0xfd, 0xdf, 0x3b, 0x6e, 0xe9, 0x46, 0xbe, 0x14, 0xda, 0x88,
-	0xe0, 0xf9, 0x09, 0x77, 0x3e, 0xe1, 0x3e, 0xed, 0x3b, 0xb0, 0x31, 0x49, 0xc9, 0x8f, 0x28, 0x76,
-	0x03, 0xc4, 0x0f, 0xa4, 0xbb, 0x26, 0x44, 0x76, 0xc5, 0x11, 0xf1, 0x16, 0x31, 0x55, 0xe7, 0xcc,
-	0x06, 0xe6, 0xa9, 0x40, 0xd8, 0x7b, 0x4a, 0x65, 0x4b, 0xaa, 0x2c, 0xa4, 0x1b, 0x4e, 0x47, 0xda,
-	0x12, 0xcb, 0xe9, 0x43, 0xc8, 0x10, 0x65, 0x05, 0xfd, 0xfa, 0xbb, 0xd2, 0x2f, 0xa4, 0x1b, 0x4e,
-	0x47, 0xda, 0x8a, 0x7e, 0x04, 0xda, 0xe2, 0xea, 0xb8, 0x34, 0x41, 0x1e, 0xed, 0x36, 0xfb, 0x2b,
-	0x82, 0x5c, 0x5e, 0x2f, 0x53, 0x5c, 0x2f, 0xce, 0x7c, 0xc6, 0x31, 0xa3, 0x04, 0x79, 0xf6, 0x76,
-	0xd5, 0x4c, 0xb5, 0x44, 0xc3, 0x01, 0x49, 0x01, 0xa1, 0xda, 0x31, 0xe8, 0x64, 0xc9, 0x34, 0x85,
-	0x3e, 0x72, 0x13, 0xc8, 0x82, 0x6e, 0xab, 0xbf, 0x72, 0xd0, 0xb2, 0x1f, 0xcc, 0x73, 0xfd, 0x3d,
-	0x75, 0x82, 0xb5, 0xa8, 0xe1, 0xb4, 0x95, 0x79, 0x06, 0x59, 0xa0, 0x41, 0xb0, 0x03, 0xc3, 0x90,
-	0xfc, 0xe0, 0x66, 0x89, 0x0f, 0x19, 0x72, 0xe1, 0x84, 0xa1, 0xd4, 0x45, 0xe7, 0x09, 0x4e, 0x2f,
-	0xba, 0xa0, 0xdf, 0x38, 0x68, 0xda, 0xfb, 0xf3, 0x5c, 0xef, 0x4b, 0xa2, 0xb7, 0x42, 0x8d, 0x6e,
-	0xc3, 0xd9, 0x16, 0xd1, 0xaf, 0x45, 0xf0, 0x33, 0x1e, 0xfb, 0x5c, 0x84, 0x34, 0x0a, 0xf4, 0x5b,
-	0xf2, 0x22, 0x4c, 0xc7, 0x28, 0x80, 0x33, 0x4c, 0xb2, 0xb4, 0xdb, 0x16, 0x42, 0x1f, 0xcf, 0x73,
-	0x7d, 0xff, 0xad, 0x42, 0xf5, 0x04, 0x2e, 0xb7, 0x77, 0x53, 0xee, 0x79, 0x0d, 0x70, 0xbc, 0xfa,
-	0xf3, 0x2b, 0x7d, 0xc9, 0x78, 0xb5, 0x0c, 0xee, 0x9d, 0x90, 0x98, 0xa2, 0x98, 0x66, 0x54, 0xde,
-	0x7d, 0x1b, 0xb4, 0xca, 0xf1, 0x23, 0x2e, 0x3f, 0xaf, 0xff, 0xcd, 0x06, 0xfd, 0xaa, 0x40, 0xd8,
-	0x4d, 0x7e, 0xb8, 0x2f, 0x79, 0x1f, 0x56, 0x69, 0xda, 0xa7, 0x60, 0x35, 0x25, 0x84, 0xa9, 0xe9,
-	0x60, 0xd4, 0x7a, 0xa3, 0x9a, 0x47, 0xb3, 0x81, 0xf9, 0x1c, 0xa5, 0x2f, 0x42, 0xe4, 0x10, 0xc2,
-	0xec, 0x55, 0x4e, 0xe3, 0x88, 0x2c, 0xed, 0xa7, 0x06, 0xd8, 0x8a, 0xd1, 0x39, 0x73, 0xcb, 0x19,
-	0x4c, 0xdd, 0x00, 0xd2, 0x40, 0x4c, 0x80, 0x8e, 0x3d, 0x9a, 0xe7, 0xfa, 0x07, 0xb2, 0x0a, 0xb7,
-	0xa1, 0x8c, 0xbf, 0x73, 0xfd, 0xd1, 0x14, 0xb3, 0x20, 0x1b, 0x73, 0x39, 0x3e, 0x02, 0x11, 0x1b,
-	0x4f, 0x58, 0xb5, 0x08, 0xf1, 0x98, 0x5a, 0xe3, 0x0b, 0x86, 0xa8, 0x79, 0x8a, 0xce, 0x6d, 0xbe,
-	0x70, 0x34, 0x4e, 0xf5, 0x4d, 0xc9, 0x74, 0x0a, 0x69, 0xa0, 0x4a, 0xf4, 0xcb, 0x32, 0xe8, 0xd4,
-	0x2b, 0xa7, 0x1d, 0x81, 0x96, 0x6c, 0xf1, 0x72, 0x3a, 0x8a, 0x26, 0xbc, 0x2f, 0xff, 0x52, 0x19,
-	0xe2, 0x47, 0xd0, 0x94, 0xd6, 0x53, 0x5f, 0x83, 0xa0, 0x19, 0x20, 0xe8, 0xa3, 0xd4, 0x1d, 0xa8,
-	0xaa, 0xec, 0xdf, 0x35, 0x33, 0x4f, 0x05, 0xde, 0xee, 0x5d, 0xe5, 0xfa, 0xba, 0x5c, 0x0f, 0xe6,
-	0xb9, 0xbe, 0x29, 0x65, 0x0a, 0x32, 0xc3, 0x59, 0x97, 0xcb, 0x41, 0x4d, 0x62, 0xa8, 0x66, 0xe5,
-	0x7f, 0x90, 0x18, 0xbe, 0x21, 0x31, 0x2c, 0x25, 0x86, 0xaa, 0x22, 0xbf, 0xad, 0x80, 0x35, 0x89,
-	0xd6, 0x20, 0xd8, 0xa0, 0x78, 0x1a, 0x23, 0xdf, 0x95, 0x10, 0xd5, 0x30, 0xbd, 0xba, 0x8e, 0x7c,
-	0x27, 0x47, 0x02, 0xa6, 0x04, 0xf7, 0x2e, 0x73, 0xbd, 0x51, 0x4d, 0x84, 0x05, 0x0a, 0xc3, 0xe9,
-	0xd0, 0x1a, 0x96, 0x0f, 0x9c, 0xf2, 0x84, 0x5d, 0x8a, 0x8a, 0xa6, 0xba, 0x45, 0xa2, 0x3c, 0xbe,
-	0x11, 0x62, 0x76, 0xb7, 0xa2, 0x5f, 0x48, 0x37, 0x9c, 0xce, 0xac, 0x86, 0xd3, 0xbe, 0x07, 0xf2,
-	0x49, 0x10, 0xfa, 0x62, 0xa0, 0xad, 0xdc, 0x39, 0xd0, 0x1e, 0xaa, 0x81, 0xf6, 0x7e, 0xed, 0xa1,
-	0x29, 0xf3, 0x0d, 0x67, 0x43, 0x39, 0xd4, 0x48, 0x0b, 0x81, 0x56, 0x20, 0xaa, 0x56, 0x55, 0x8f,
-	0xcc, 0x5d, 0xbb, 0x78, 0x38, 0xcf, 0xf5, 0x9d, 0x45, 0x95, 0x8a, 0xc3, 0x70, 0xfe, 0xaf, 0x9c,
-	0x55, 0xe3, 0x1a, 0xcf, 0x40, 0xb3, 0x78, 0x6c, 0xb5, 0x3d, 0xd0, 0x8a, 0xb3, 0x08, 0xa5, 0x3c,
-	0x22, 0x4e, 0x66, 0xd5, 0xa9, 0x1c, 0x5a, 0x1f, 0xb4, 0x7d, 0x14, 0x93, 0x08, 0xc7, 0x22, 0xbe,
-	0x2c, 0xe2, 0x75, 0x97, 0xed, 0xbf, 0xbe, 0xea, 0x35, 0x2e, 0xaf, 0x7a, 0x8d, 0x3f, 0xaf, 0x7a,
-	0x8d, 0x97, 0xd7, 0xbd, 0xa5, 0xcb, 0xeb, 0xde, 0xd2, 0xef, 0xd7, 0xbd, 0xa5, 0x6f, 0x9f, 0x2d,
-	0x5c, 0x30, 0xf9, 0xe9, 0x33, 0xf6, 0x0e, 0xa7, 0xc4, 0x9a, 0x3d, 0xb6, 0x22, 0xe2, 0x67, 0x21,
-	0xa2, 0xf2, 0x03, 0xed, 0xb0, 0xf8, 0x42, 0x7b, 0xf4, 0xf8, 0xb0, 0xda, 0xeb, 0x27, 0xd5, 0x72,
-	0xbc, 0x26, 0xa6, 0xca, 0xd1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x98, 0x66, 0xe1, 0xee, 0xd5,
-	0x09, 0x00, 0x00,
+	// 943 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6f, 0xe3, 0xc4,
+	0x1b, 0xc7, 0xe3, 0x34, 0xdb, 0x26, 0x93, 0x64, 0xfb, 0xfb, 0x8d, 0x56, 0xc8, 0xad, 0xaa, 0x24,
+	0xf4, 0x00, 0xb9, 0xd4, 0xde, 0x64, 0x91, 0x56, 0x62, 0xe1, 0x40, 0xba, 0x0b, 0xed, 0xb2, 0x85,
+	0xca, 0x05, 0x0e, 0x5c, 0xac, 0xb1, 0x3d, 0xb1, 0x47, 0x6b, 0x7b, 0xac, 0x99, 0x71, 0x48, 0x39,
+	0x71, 0xe4, 0xb8, 0x47, 0x8e, 0xbc, 0x04, 0x5e, 0xc6, 0x1e, 0x7b, 0x41, 0xe2, 0x54, 0x50, 0xfa,
+	0x2e, 0x38, 0xa1, 0xf9, 0xe3, 0xc4, 0x94, 0x15, 0x5b, 0x71, 0x89, 0x9e, 0x99, 0xe7, 0xfb, 0x7c,
+	0x32, 0xf3, 0xfc, 0x19, 0x03, 0x97, 0x04, 0xa1, 0x9b, 0x92, 0x38, 0x11, 0x61, 0x4a, 0x70, 0x2e,
+	0xb8, 0x2b, 0x70, 0x1e, 0x61, 0x96, 0x91, 0x5c, 0xb8, 0x8b, 0x49, 0x6d, 0xe5, 0x14, 0x8c, 0x0a,
+	0x0a, 0x07, 0x24, 0x08, 0x9d, 0x7a, 0x80, 0x53, 0x93, 0x2c, 0x26, 0xfb, 0xa3, 0x5a, 0xbc, 0xb8,
+	0x2c, 0x30, 0x77, 0x17, 0x28, 0x25, 0x11, 0x12, 0x94, 0x69, 0xc2, 0xfe, 0xc1, 0x3f, 0x14, 0xea,
+	0xb7, 0xf2, 0x86, 0x94, 0x67, 0x94, 0xbb, 0x24, 0xe4, 0xd3, 0x47, 0xf2, 0x04, 0x05, 0xa3, 0x74,
+	0x5e, 0x79, 0x07, 0x31, 0xa5, 0x71, 0x8a, 0x5d, 0xb5, 0x0a, 0xca, 0xb9, 0x1b, 0x95, 0x0c, 0x09,
+	0x42, 0x73, 0xe3, 0x1f, 0xde, 0xf6, 0x0b, 0x92, 0x61, 0x2e, 0x50, 0x56, 0x54, 0x02, 0x79, 0xdf,
+	0x90, 0x32, 0xec, 0xea, 0xe3, 0xcb, 0x7f, 0xd0, 0x96, 0x11, 0xbc, 0xbf, 0x11, 0xd0, 0x2c, 0x23,
+	0x22, 0xab, 0x44, 0xeb, 0x95, 0x11, 0x3e, 0x88, 0x69, 0x4c, 0x95, 0xe9, 0x4a, 0x4b, 0xef, 0x1e,
+	0xae, 0xee, 0x81, 0xee, 0xb1, 0xe2, 0x5d, 0x08, 0x24, 0x30, 0xdc, 0x03, 0xed, 0x30, 0x41, 0x24,
+	0xf7, 0x49, 0x64, 0x5b, 0x23, 0x6b, 0xdc, 0xf1, 0x76, 0xd4, 0xfa, 0x34, 0x82, 0x5f, 0x82, 0xae,
+	0x60, 0x25, 0x17, 0x7e, 0x8a, 0x17, 0x38, 0xb5, 0x9b, 0x23, 0x6b, 0xdc, 0x9d, 0x8e, 0x9d, 0x7f,
+	0xcf, 0xaf, 0xf3, 0x29, 0x43, 0xa1, 0xbc, 0xf0, 0xac, 0xf5, 0xfa, 0x7a, 0xd8, 0xf0, 0x80, 0x42,
+	0xbc, 0x90, 0x04, 0xf8, 0x02, 0xec, 0xaa, 0x15, 0xc9, 0x63, 0xbf, 0xc0, 0x8c, 0xd0, 0xc8, 0xde,
+	0x52, 0xd0, 0x3d, 0x47, 0xa7, 0xc5, 0xa9, 0xd2, 0xe2, 0x3c, 0x35, 0x69, 0x9b, 0xb5, 0x25, 0xe5,
+	0xa7, 0xdf, 0x87, 0x96, 0x77, 0xbf, 0x8a, 0x3d, 0x57, 0xa1, 0xf0, 0x0b, 0xf0, 0xbf, 0x32, 0x0f,
+	0x68, 0x1e, 0xd5, 0x70, 0xad, 0xbb, 0xe3, 0x76, 0xd7, 0xc1, 0x86, 0xf7, 0x39, 0xd8, 0xcd, 0xd0,
+	0xd2, 0x0f, 0x53, 0x1a, 0xbe, 0xf4, 0x23, 0x46, 0xe6, 0xc2, 0xbe, 0x77, 0x77, 0x5c, 0x3f, 0x43,
+	0xcb, 0x63, 0x19, 0xfa, 0x54, 0x46, 0xc2, 0x67, 0xa0, 0x3f, 0x67, 0xf4, 0x7b, 0x9c, 0xfb, 0x09,
+	0x96, 0xb9, 0xb2, 0xb7, 0x15, 0x6a, 0x5f, 0x65, 0x4f, 0x56, 0xcf, 0x31, 0x45, 0x5d, 0x4c, 0x9c,
+	0x13, 0xa5, 0x30, 0xf9, 0xea, 0xe9, 0x30, 0xbd, 0x27, 0x31, 0x29, 0x12, 0x98, 0x8b, 0x0a, 0xb3,
+	0x73, 0x57, 0x8c, 0x0e, 0x33, 0x98, 0x27, 0xa0, 0xab, 0xba, 0xd4, 0xe7, 0x05, 0x0e, 0xb9, 0xdd,
+	0x1e, 0x6d, 0x29, 0x88, 0xee, 0x64, 0x47, 0x75, 0xb2, 0x24, 0x9c, 0x4b, 0xcd, 0x45, 0x81, 0x43,
+	0x0f, 0x14, 0x95, 0xc9, 0xe1, 0xbb, 0xa0, 0x57, 0x16, 0x31, 0x43, 0x11, 0xf6, 0x0b, 0x24, 0x12,
+	0xbb, 0x33, 0xda, 0x1a, 0x77, 0xbc, 0xae, 0xd9, 0x3b, 0x47, 0x22, 0x81, 0x1f, 0x83, 0x3d, 0x94,
+	0xa6, 0xf4, 0x3b, 0xbf, 0x2c, 0x22, 0x24, 0xb0, 0x8f, 0xe6, 0x02, 0x33, 0x1f, 0x2f, 0x0b, 0xc2,
+	0x2e, 0x6d, 0x30, 0xb2, 0xc6, 0xed, 0x59, 0xd3, 0xb6, 0xbc, 0x77, 0x94, 0xe8, 0x6b, 0xa5, 0xf9,
+	0x44, 0x4a, 0x9e, 0x29, 0x05, 0x3c, 0x05, 0xc3, 0x37, 0x84, 0x67, 0x84, 0x07, 0x38, 0x41, 0x0b,
+	0x42, 0x4b, 0x66, 0x77, 0xd7, 0x90, 0x83, 0xdb, 0x90, 0xb3, 0x9a, 0xee, 0xc3, 0xd6, 0x8f, 0x3f,
+	0x0f, 0x1b, 0x87, 0x3f, 0x34, 0xc1, 0xfd, 0x63, 0x9a, 0x73, 0x9c, 0xf3, 0x92, 0xeb, 0x3e, 0x9f,
+	0x81, 0xce, 0x7a, 0xd4, 0x54, 0xa3, 0xcb, 0x04, 0xdc, 0xae, 0xeb, 0x57, 0x95, 0x42, 0x17, 0xf6,
+	0x95, 0x2c, 0xec, 0x26, 0x0c, 0x7e, 0x04, 0x5a, 0x8c, 0x52, 0x61, 0x26, 0xe1, 0xb0, 0x56, 0x84,
+	0xcd, 0xec, 0x2d, 0x26, 0xce, 0x19, 0x66, 0x2f, 0x53, 0xec, 0x51, 0x5a, 0x15, 0x43, 0x45, 0xc1,
+	0x39, 0x78, 0x90, 0xe3, 0xa5, 0xf0, 0xd7, 0xcf, 0x0d, 0xf7, 0x13, 0xc4, 0x13, 0x35, 0x02, 0xbd,
+	0xd9, 0x07, 0x7f, 0x5e, 0x0f, 0x1f, 0xc6, 0x44, 0x24, 0x65, 0x20, 0x71, 0x72, 0x9c, 0xb1, 0x08,
+	0xe6, 0x62, 0x63, 0xa4, 0x24, 0xe0, 0x6e, 0x70, 0x29, 0x30, 0x77, 0x4e, 0xf0, 0x72, 0x26, 0x0d,
+	0x0f, 0x4a, 0xe2, 0x37, 0x6b, 0xe0, 0x09, 0xe2, 0x89, 0x49, 0xc1, 0xaf, 0x16, 0xe8, 0xd5, 0x33,
+	0x03, 0x87, 0xa0, 0xa3, 0x7b, 0x65, 0x3d, 0xe9, 0x2a, 0x9d, 0x6d, 0xbd, 0x79, 0x2a, 0xe7, 0xa9,
+	0x9d, 0x60, 0x14, 0x61, 0xe6, 0x4f, 0xcc, 0x0d, 0xdf, 0x7b, 0xdb, 0xac, 0x9f, 0x28, 0xfd, 0xac,
+	0xbb, 0xba, 0x1e, 0xee, 0x68, 0x7b, 0xe2, 0xed, 0x68, 0xc8, 0xa4, 0xc6, 0x9b, 0x9a, 0x31, 0xff,
+	0x0f, 0xbc, 0x69, 0xc5, 0x9b, 0x9a, 0x7b, 0xfd, 0xd2, 0x04, 0xdb, 0xda, 0x05, 0x4f, 0x41, 0x9f,
+	0x93, 0x38, 0xc7, 0x91, 0xaf, 0x25, 0xa6, 0xac, 0x83, 0x3a, 0x54, 0xbf, 0xdc, 0x17, 0x4a, 0x66,
+	0xe8, 0xad, 0xab, 0xeb, 0xa1, 0xe5, 0xf5, 0x78, 0x6d, 0x0f, 0x1e, 0x83, 0xfe, 0xba, 0x2c, 0x3e,
+	0xc7, 0x55, 0x89, 0xdf, 0x80, 0x5a, 0x27, 0xfb, 0x02, 0x0b, 0xaf, 0xb7, 0xa8, 0xad, 0xe0, 0x67,
+	0x40, 0x3f, 0x51, 0xea, 0x40, 0x6a, 0x5a, 0xb7, 0xee, 0x38, 0xad, 0x7d, 0x13, 0x67, 0xc6, 0xf5,
+	0x0c, 0xc0, 0x0a, 0xb4, 0x69, 0x16, 0xf3, 0xb6, 0xbd, 0xed, 0x48, 0xff, 0x37, 0x91, 0x9b, 0xa6,
+	0x38, 0x7c, 0x0e, 0xda, 0xd5, 0xa3, 0x0c, 0x0f, 0x40, 0x27, 0x2f, 0x33, 0xcc, 0xa4, 0x47, 0xe5,
+	0xab, 0xe5, 0x6d, 0x36, 0xe0, 0x08, 0x74, 0x23, 0x9c, 0xd3, 0x8c, 0xe4, 0xca, 0xdf, 0x54, 0xfe,
+	0xfa, 0xd6, 0x2c, 0x7a, 0xbd, 0x1a, 0x58, 0x57, 0xab, 0x81, 0xf5, 0xc7, 0x6a, 0x60, 0xbd, 0xba,
+	0x19, 0x34, 0xae, 0x6e, 0x06, 0x8d, 0xdf, 0x6e, 0x06, 0x8d, 0x6f, 0x9f, 0xff, 0xad, 0x79, 0xf5,
+	0x27, 0x32, 0x08, 0x8f, 0x62, 0xea, 0x2e, 0x1e, 0xbb, 0x19, 0x8d, 0xca, 0x14, 0x73, 0xfd, 0x21,
+	0x3f, 0xaa, 0xbe, 0xe4, 0x0f, 0x1f, 0x1f, 0x6d, 0x2e, 0xf3, 0x64, 0x63, 0x06, 0xdb, 0x6a, 0x22,
+	0x1f, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0x87, 0x33, 0x96, 0x16, 0xfd, 0x07, 0x00, 0x00,
 }
 
 func (m *ClientState) Marshal() (dAtA []byte, err error) {
diff --git a/proto/ibc/applications/fee/v1/ack.proto b/proto/ibc/applications/fee/v1/ack.proto
index ec1342bbf23..53519a2bb82 100644
--- a/proto/ibc/applications/fee/v1/ack.proto
+++ b/proto/ibc/applications/fee/v1/ack.proto
@@ -4,14 +4,12 @@ package ibc.applications.fee.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
 
-import "gogoproto/gogo.proto";
-
 // IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware
 message IncentivizedAcknowledgement {
   // the underlying app acknowledgement bytes
-  bytes app_acknowledgement = 1 [(gogoproto.moretags) = "yaml:\"app_acknowledgement\""];
+  bytes app_acknowledgement = 1;
   // the relayer address which submits the recv packet message
-  string forward_relayer_address = 2 [(gogoproto.moretags) = "yaml:\"forward_relayer_address\""];
+  string forward_relayer_address = 2;
   // success flag of the base application callback
-  bool underlying_app_success = 3 [(gogoproto.moretags) = "yaml:\"underlying_app_successl\""];
+  bool underlying_app_success = 3;
 }
diff --git a/proto/ibc/applications/fee/v1/fee.proto b/proto/ibc/applications/fee/v1/fee.proto
index 1a025ddca1c..6cdfdd39082 100644
--- a/proto/ibc/applications/fee/v1/fee.proto
+++ b/proto/ibc/applications/fee/v1/fee.proto
@@ -11,23 +11,14 @@ import "ibc/core/channel/v1/channel.proto";
 // Fee defines the ICS29 receive, acknowledgement and timeout fees
 message Fee {
   // the packet receive fee
-  repeated cosmos.base.v1beta1.Coin recv_fee = 1 [
-    (gogoproto.moretags)     = "yaml:\"recv_fee\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin recv_fee = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
   // the packet acknowledgement fee
-  repeated cosmos.base.v1beta1.Coin ack_fee = 2 [
-    (gogoproto.moretags)     = "yaml:\"ack_fee\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin ack_fee = 2
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
   // the packet timeout fee
-  repeated cosmos.base.v1beta1.Coin timeout_fee = 3 [
-    (gogoproto.moretags)     = "yaml:\"timeout_fee\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin timeout_fee = 3
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
 }
 
 // PacketFee contains ICS29 relayer fees, refund address and optional list of permitted relayers
@@ -35,7 +26,7 @@ message PacketFee {
   // fee encapsulates the recv, ack and timeout fees associated with an IBC packet
   Fee fee = 1 [(gogoproto.nullable) = false];
   // the refund address for unspent fees
-  string refund_address = 2 [(gogoproto.moretags) = "yaml:\"refund_address\""];
+  string refund_address = 2;
   // optional list of relayers permitted to receive fees
   repeated string relayers = 3;
 }
@@ -43,14 +34,13 @@ message PacketFee {
 // PacketFees contains a list of type PacketFee
 message PacketFees {
   // list of packet fees
-  repeated PacketFee packet_fees = 1 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false];
+  repeated PacketFee packet_fees = 1 [(gogoproto.nullable) = false];
 }
 
 // IdentifiedPacketFees contains a list of type PacketFee and associated PacketId
 message IdentifiedPacketFees {
   // unique packet identifier comprised of the channel ID, port ID and sequence
-  ibc.core.channel.v1.PacketId packet_id = 1
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""];
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
   // list of packet fees
-  repeated PacketFee packet_fees = 2 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false];
+  repeated PacketFee packet_fees = 2 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/applications/fee/v1/genesis.proto b/proto/ibc/applications/fee/v1/genesis.proto
index 6bba6cff632..59e3c5d6e12 100644
--- a/proto/ibc/applications/fee/v1/genesis.proto
+++ b/proto/ibc/applications/fee/v1/genesis.proto
@@ -11,34 +11,29 @@ import "ibc/core/channel/v1/channel.proto";
 // GenesisState defines the ICS29 fee middleware genesis state
 message GenesisState {
   // list of identified packet fees
-  repeated IdentifiedPacketFees identified_fees = 1
-      [(gogoproto.moretags) = "yaml:\"identified_fees\"", (gogoproto.nullable) = false];
+  repeated IdentifiedPacketFees identified_fees = 1 [(gogoproto.nullable) = false];
   // list of fee enabled channels
-  repeated FeeEnabledChannel fee_enabled_channels = 2
-      [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false];
+  repeated FeeEnabledChannel fee_enabled_channels = 2 [(gogoproto.nullable) = false];
   // list of registered payees
-  repeated RegisteredPayee registered_payees = 3
-      [(gogoproto.moretags) = "yaml:\"registered_payees\"", (gogoproto.nullable) = false];
+  repeated RegisteredPayee registered_payees = 3 [(gogoproto.nullable) = false];
   // list of registered counterparty payees
-  repeated RegisteredCounterpartyPayee registered_counterparty_payees = 4
-      [(gogoproto.moretags) = "yaml:\"registered_counterparty_payees\"", (gogoproto.nullable) = false];
+  repeated RegisteredCounterpartyPayee registered_counterparty_payees = 4 [(gogoproto.nullable) = false];
   // list of forward relayer addresses
-  repeated ForwardRelayerAddress forward_relayers = 5
-      [(gogoproto.moretags) = "yaml:\"forward_relayers\"", (gogoproto.nullable) = false];
+  repeated ForwardRelayerAddress forward_relayers = 5 [(gogoproto.nullable) = false];
 }
 
 // FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
 message FeeEnabledChannel {
   // unique port identifier
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // unique channel identifier
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
 }
 
 // RegisteredPayee contains the relayer address and payee address for a specific channel
 message RegisteredPayee {
   // unique channel identifier
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 1;
   // the relayer address
   string relayer = 2;
   // the payee address
@@ -49,11 +44,11 @@ message RegisteredPayee {
 // for recv fee distribution)
 message RegisteredCounterpartyPayee {
   // unique channel identifier
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 1;
   // the relayer address
   string relayer = 2;
   // the counterparty payee address
-  string counterparty_payee = 3 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+  string counterparty_payee = 3;
 }
 
 // ForwardRelayerAddress contains the forward relayer address and PacketId used for async acknowledgements
@@ -61,6 +56,5 @@ message ForwardRelayerAddress {
   // the forward relayer address
   string address = 1;
   // unique packet identifer comprised of the channel ID, port ID and sequence
-  ibc.core.channel.v1.PacketId packet_id = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""];
+  ibc.core.channel.v1.PacketId packet_id = 2 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/applications/fee/v1/metadata.proto b/proto/ibc/applications/fee/v1/metadata.proto
index 0c0a72c9ca5..f505034c879 100644
--- a/proto/ibc/applications/fee/v1/metadata.proto
+++ b/proto/ibc/applications/fee/v1/metadata.proto
@@ -4,13 +4,11 @@ package ibc.applications.fee.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types";
 
-import "gogoproto/gogo.proto";
-
 // Metadata defines the ICS29 channel specific metadata encoded into the channel version bytestring
 // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning
 message Metadata {
   // fee_version defines the ICS29 fee version
-  string fee_version = 1 [(gogoproto.moretags) = "yaml:\"fee_version\""];
+  string fee_version = 1;
   // app_version defines the underlying application version, which may or may not be a JSON encoded bytestring
-  string app_version = 2 [(gogoproto.moretags) = "yaml:\"app_version\""];
+  string app_version = 2;
 }
diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto
index bcf6622b34b..faa40f9230e 100644
--- a/proto/ibc/applications/fee/v1/query.proto
+++ b/proto/ibc/applications/fee/v1/query.proto
@@ -129,11 +129,8 @@ message QueryTotalRecvFeesRequest {
 // QueryTotalRecvFeesResponse defines the response type for the TotalRecvFees rpc
 message QueryTotalRecvFeesResponse {
   // the total packet receive fees
-  repeated cosmos.base.v1beta1.Coin recv_fees = 1 [
-    (gogoproto.moretags)     = "yaml:\"recv_fees\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin recv_fees = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
 }
 
 // QueryTotalAckFeesRequest defines the request type for the TotalAckFees rpc
@@ -145,11 +142,8 @@ message QueryTotalAckFeesRequest {
 // QueryTotalAckFeesResponse defines the response type for the TotalAckFees rpc
 message QueryTotalAckFeesResponse {
   // the total packet acknowledgement fees
-  repeated cosmos.base.v1beta1.Coin ack_fees = 1 [
-    (gogoproto.moretags)     = "yaml:\"ack_fees\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin ack_fees = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
 }
 
 // QueryTotalTimeoutFeesRequest defines the request type for the TotalTimeoutFees rpc
@@ -161,17 +155,14 @@ message QueryTotalTimeoutFeesRequest {
 // QueryTotalTimeoutFeesResponse defines the response type for the TotalTimeoutFees rpc
 message QueryTotalTimeoutFeesResponse {
   // the total packet timeout fees
-  repeated cosmos.base.v1beta1.Coin timeout_fees = 1 [
-    (gogoproto.moretags)     = "yaml:\"timeout_fees\"",
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  repeated cosmos.base.v1beta1.Coin timeout_fees = 1
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
 }
 
 // QueryPayeeRequest defines the request type for the Payee rpc
 message QueryPayeeRequest {
   // unique channel identifier
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 1;
   // the relayer address to which the distribution address is registered
   string relayer = 2;
 }
@@ -179,13 +170,13 @@ message QueryPayeeRequest {
 // QueryPayeeResponse defines the response type for the Payee rpc
 message QueryPayeeResponse {
   // the payee address to which packet fees are paid out
-  string payee_address = 1 [(gogoproto.moretags) = "yaml:\"payee_address\""];
+  string payee_address = 1;
 }
 
 // QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
 message QueryCounterpartyPayeeRequest {
   // unique channel identifier
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 1;
   // the relayer address to which the counterparty is registered
   string relayer = 2;
 }
@@ -193,7 +184,7 @@ message QueryCounterpartyPayeeRequest {
 // QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
 message QueryCounterpartyPayeeResponse {
   // the counterparty payee address used to compensate forward relaying
-  string counterparty_payee = 1 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+  string counterparty_payee = 1;
 }
 
 // QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc
@@ -207,8 +198,7 @@ message QueryFeeEnabledChannelsRequest {
 // QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc
 message QueryFeeEnabledChannelsResponse {
   // list of fee enabled channels
-  repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1
-      [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false];
+  repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1 [(gogoproto.nullable) = false];
   // pagination defines the pagination in the response.
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
@@ -216,13 +206,13 @@ message QueryFeeEnabledChannelsResponse {
 // QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc
 message QueryFeeEnabledChannelRequest {
   // unique port identifier
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // unique channel identifier
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
 }
 
 // QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc
 message QueryFeeEnabledChannelResponse {
   // boolean flag representing the fee enabled channel status
-  bool fee_enabled = 1 [(gogoproto.moretags) = "yaml:\"fee_enabled\""];
+  bool fee_enabled = 1;
 }
diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto
index 3a46de74ebe..e1c4751325b 100644
--- a/proto/ibc/applications/fee/v1/tx.proto
+++ b/proto/ibc/applications/fee/v1/tx.proto
@@ -43,9 +43,9 @@ message MsgRegisterPayee {
   option (gogoproto.goproto_getters) = false;
 
   // unique port identifier
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // unique channel identifier
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
   // the relayer address
   string relayer = 3;
   // the payee address
@@ -61,13 +61,13 @@ message MsgRegisterCounterpartyPayee {
   option (gogoproto.goproto_getters) = false;
 
   // unique port identifier
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // unique channel identifier
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
   // the relayer address
   string relayer = 3;
   // the counterparty payee address
-  string counterparty_payee = 4 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
+  string counterparty_payee = 4;
 }
 
 // MsgRegisterCounterpartyPayeeResponse defines the response type for the RegisterCounterpartyPayee rpc
@@ -83,9 +83,9 @@ message MsgPayPacketFee {
   // fee encapsulates the recv, ack and timeout fees associated with an IBC packet
   ibc.applications.fee.v1.Fee fee = 1 [(gogoproto.nullable) = false];
   // the source port unique identifier
-  string source_port_id = 2 [(gogoproto.moretags) = "yaml:\"source_port_id\""];
+  string source_port_id = 2;
   // the source channel unique identifer
-  string source_channel_id = 3 [(gogoproto.moretags) = "yaml:\"source_channel_id\""];
+  string source_channel_id = 3;
   // account address to refund fee if necessary
   string signer = 4;
   // optional list of relayers permitted to the receive packet fees
@@ -102,10 +102,9 @@ message MsgPayPacketFeeAsync {
   option (gogoproto.goproto_getters) = false;
 
   // unique packet identifier comprised of the channel ID, port ID and sequence
-  ibc.core.channel.v1.PacketId packet_id = 1
-      [(gogoproto.moretags) = "yaml:\"packet_id\"", (gogoproto.nullable) = false];
+  ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false];
   // the packet fee associated with a particular IBC packet
-  PacketFee packet_fee = 2 [(gogoproto.moretags) = "yaml:\"packet_fee\"", (gogoproto.nullable) = false];
+  PacketFee packet_fee = 2 [(gogoproto.nullable) = false];
 }
 
 // MsgPayPacketFeeAsyncResponse defines the response type for the PayPacketFeeAsync rpc
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto b/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
index a505b4637ef..d32d69fe2b4 100644
--- a/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
+++ b/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
@@ -4,11 +4,9 @@ package ibc.applications.interchain_accounts.controller.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types";
 
-import "gogoproto/gogo.proto";
-
 // Params defines the set of on-chain interchain accounts parameters.
 // The following parameters may be used to disable the controller submodule.
 message Params {
   // controller_enabled enables or disables the controller submodule.
-  bool controller_enabled = 1 [(gogoproto.moretags) = "yaml:\"controller_enabled\""];
+  bool controller_enabled = 1;
 }
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/query.proto b/proto/ibc/applications/interchain_accounts/controller/v1/query.proto
index 8c237a1525f..0fb70d82479 100644
--- a/proto/ibc/applications/interchain_accounts/controller/v1/query.proto
+++ b/proto/ibc/applications/interchain_accounts/controller/v1/query.proto
@@ -5,7 +5,6 @@ package ibc.applications.interchain_accounts.controller.v1;
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types";
 
 import "ibc/applications/interchain_accounts/controller/v1/controller.proto";
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
 // Query provides defines the gRPC querier service.
@@ -25,7 +24,7 @@ service Query {
 // QueryInterchainAccountRequest is the request type for the Query/InterchainAccount RPC method.
 message QueryInterchainAccountRequest {
   string owner         = 1;
-  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id = 2;
 }
 
 // QueryInterchainAccountResponse the response type for the Query/InterchainAccount RPC method.
diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
index 284ffe70576..c0585eee806 100644
--- a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
+++ b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@@ -21,14 +21,14 @@ message MsgRegisterInterchainAccount {
   option (gogoproto.goproto_getters) = false;
 
   string owner         = 1;
-  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id = 2;
   string version       = 3;
 }
 
 // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount
 message MsgRegisterInterchainAccountResponse {
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
-  string port_id    = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string channel_id = 1;
+  string port_id    = 2;
 }
 
 // MsgSendTx defines the payload for Msg/SendTx
@@ -36,13 +36,12 @@ message MsgSendTx {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string owner         = 1;
-  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data = 3
-      [(gogoproto.moretags) = "yaml:\"packet_data\"", (gogoproto.nullable) = false];
+  string                                                              owner         = 1;
+  string                                                              connection_id = 2;
+  ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data   = 3 [(gogoproto.nullable) = false];
   // Relative timeout timestamp provided will be added to the current block time during transaction execution.
   // The timeout timestamp must be non-zero.
-  uint64 relative_timeout = 4 [(gogoproto.moretags) = "yaml:\"relative_timeout\""];
+  uint64 relative_timeout = 4;
 }
 
 // MsgSendTxResponse defines the response for MsgSendTx
diff --git a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
index 2fed3763ff3..63da034544f 100644
--- a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
+++ b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
@@ -10,44 +10,38 @@ import "ibc/applications/interchain_accounts/host/v1/host.proto";
 
 // GenesisState defines the interchain accounts genesis state
 message GenesisState {
-  ControllerGenesisState controller_genesis_state = 1
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"controller_genesis_state\""];
-  HostGenesisState host_genesis_state = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"host_genesis_state\""];
+  ControllerGenesisState controller_genesis_state = 1 [(gogoproto.nullable) = false];
+  HostGenesisState       host_genesis_state       = 2 [(gogoproto.nullable) = false];
 }
 
 // ControllerGenesisState defines the interchain accounts controller genesis state
 message ControllerGenesisState {
-  repeated ActiveChannel active_channels = 1
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""];
-  repeated RegisteredInterchainAccount interchain_accounts = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""];
-  repeated string                                           ports  = 3;
-  ibc.applications.interchain_accounts.controller.v1.Params params = 4 [(gogoproto.nullable) = false];
+  repeated ActiveChannel                                    active_channels     = 1 [(gogoproto.nullable) = false];
+  repeated RegisteredInterchainAccount                      interchain_accounts = 2 [(gogoproto.nullable) = false];
+  repeated string                                           ports               = 3;
+  ibc.applications.interchain_accounts.controller.v1.Params params              = 4 [(gogoproto.nullable) = false];
 }
 
 // HostGenesisState defines the interchain accounts host genesis state
 message HostGenesisState {
-  repeated ActiveChannel active_channels = 1
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""];
-  repeated RegisteredInterchainAccount interchain_accounts = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""];
-  string                                              port   = 3;
-  ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false];
+  repeated ActiveChannel                              active_channels     = 1 [(gogoproto.nullable) = false];
+  repeated RegisteredInterchainAccount                interchain_accounts = 2 [(gogoproto.nullable) = false];
+  string                                              port                = 3;
+  ibc.applications.interchain_accounts.host.v1.Params params              = 4 [(gogoproto.nullable) = false];
 }
 
 // ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to
 // indicate if the channel is middleware enabled
 message ActiveChannel {
-  string connection_id         = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  string port_id               = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string channel_id            = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""];
-  bool   is_middleware_enabled = 4 [(gogoproto.moretags) = "yaml:\"is_middleware_enabled\""];
+  string connection_id         = 1;
+  string port_id               = 2;
+  string channel_id            = 3;
+  bool   is_middleware_enabled = 4;
 }
 
 // RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address
 message RegisteredInterchainAccount {
-  string connection_id   = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  string port_id         = 2 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string account_address = 3 [(gogoproto.moretags) = "yaml:\"account_address\""];
+  string connection_id   = 1;
+  string port_id         = 2;
+  string account_address = 3;
 }
\ No newline at end of file
diff --git a/proto/ibc/applications/interchain_accounts/host/v1/host.proto b/proto/ibc/applications/interchain_accounts/host/v1/host.proto
index 18cc1d13da3..51e557113a5 100644
--- a/proto/ibc/applications/interchain_accounts/host/v1/host.proto
+++ b/proto/ibc/applications/interchain_accounts/host/v1/host.proto
@@ -4,13 +4,11 @@ package ibc.applications.interchain_accounts.host.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types";
 
-import "gogoproto/gogo.proto";
-
 // Params defines the set of on-chain interchain accounts parameters.
 // The following parameters may be used to disable the host submodule.
 message Params {
   // host_enabled enables or disables the host submodule.
-  bool host_enabled = 1 [(gogoproto.moretags) = "yaml:\"host_enabled\""];
+  bool host_enabled = 1;
   // allow_messages defines a list of sdk message typeURLs allowed to be executed on a host chain.
-  repeated string allow_messages = 2 [(gogoproto.moretags) = "yaml:\"allow_messages\""];
+  repeated string allow_messages = 2;
 }
diff --git a/proto/ibc/applications/interchain_accounts/v1/account.proto b/proto/ibc/applications/interchain_accounts/v1/account.proto
index d60c27a9c29..9db1022dde4 100644
--- a/proto/ibc/applications/interchain_accounts/v1/account.proto
+++ b/proto/ibc/applications/interchain_accounts/v1/account.proto
@@ -14,7 +14,6 @@ message InterchainAccount {
   option (gogoproto.goproto_stringer)        = false;
   option (cosmos_proto.implements_interface) = "ibc.applications.interchain_accounts.v1.InterchainAccountI";
 
-  cosmos.auth.v1beta1.BaseAccount base_account = 1
-      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
-  string account_owner = 2 [(gogoproto.moretags) = "yaml:\"account_owner\""];
+  cosmos.auth.v1beta1.BaseAccount base_account  = 1 [(gogoproto.embed) = true];
+  string                          account_owner = 2;
 }
diff --git a/proto/ibc/applications/interchain_accounts/v1/metadata.proto b/proto/ibc/applications/interchain_accounts/v1/metadata.proto
index 9ea7eeca337..78964dbadd0 100644
--- a/proto/ibc/applications/interchain_accounts/v1/metadata.proto
+++ b/proto/ibc/applications/interchain_accounts/v1/metadata.proto
@@ -4,17 +4,15 @@ package ibc.applications.interchain_accounts.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types";
 
-import "gogoproto/gogo.proto";
-
 // Metadata defines a set of protocol specific data encoded into the ICS27 channel version bytestring
 // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning
 message Metadata {
   // version defines the ICS27 protocol version
   string version = 1;
   // controller_connection_id is the connection identifier associated with the controller chain
-  string controller_connection_id = 2 [(gogoproto.moretags) = "yaml:\"controller_connection_id\""];
+  string controller_connection_id = 2;
   // host_connection_id is the connection identifier associated with the host chain
-  string host_connection_id = 3 [(gogoproto.moretags) = "yaml:\"host_connection_id\""];
+  string host_connection_id = 3;
   // address defines the interchain account address to be fulfilled upon the OnChanOpenTry handshake step
   // NOTE: the address field is empty on the OnChanOpenInit handshake step
   string address = 4;
diff --git a/proto/ibc/applications/transfer/v1/authz.proto b/proto/ibc/applications/transfer/v1/authz.proto
index 8b27ac9cf7d..b0ee1d9cd55 100644
--- a/proto/ibc/applications/transfer/v1/authz.proto
+++ b/proto/ibc/applications/transfer/v1/authz.proto
@@ -11,9 +11,9 @@ import "cosmos/base/v1beta1/coin.proto";
 // Allocation defines the spend limit for a particular port and channel
 message Allocation {
   // the port on which the packet will be sent
-  string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  string source_port = 1;
   // the channel by which the packet will be sent
-  string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  string source_channel = 2;
   // spend limitation on the channel
   repeated cosmos.base.v1beta1.Coin spend_limit = 3
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
diff --git a/proto/ibc/applications/transfer/v1/genesis.proto b/proto/ibc/applications/transfer/v1/genesis.proto
index 5e09a34ab07..3e24d1e8236 100644
--- a/proto/ibc/applications/transfer/v1/genesis.proto
+++ b/proto/ibc/applications/transfer/v1/genesis.proto
@@ -9,11 +9,7 @@ import "gogoproto/gogo.proto";
 
 // GenesisState defines the ibc-transfer genesis state
 message GenesisState {
-  string              port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  repeated DenomTrace denom_traces = 2 [
-    (gogoproto.castrepeated) = "Traces",
-    (gogoproto.nullable)     = false,
-    (gogoproto.moretags)     = "yaml:\"denom_traces\""
-  ];
-  Params params = 3 [(gogoproto.nullable) = false];
+  string              port_id      = 1;
+  repeated DenomTrace denom_traces = 2 [(gogoproto.castrepeated) = "Traces", (gogoproto.nullable) = false];
+  Params              params       = 3 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/applications/transfer/v1/transfer.proto b/proto/ibc/applications/transfer/v1/transfer.proto
index 2171074799a..d64b4a446a4 100644
--- a/proto/ibc/applications/transfer/v1/transfer.proto
+++ b/proto/ibc/applications/transfer/v1/transfer.proto
@@ -4,8 +4,6 @@ package ibc.applications.transfer.v1;
 
 option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types";
 
-import "gogoproto/gogo.proto";
-
 // DenomTrace contains the base denomination for ICS20 fungible tokens and the
 // source tracing information path.
 message DenomTrace {
@@ -23,8 +21,8 @@ message DenomTrace {
 message Params {
   // send_enabled enables or disables all cross-chain token transfers from this
   // chain.
-  bool send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled\""];
+  bool send_enabled = 1;
   // receive_enabled enables or disables all cross-chain token transfers to this
   // chain.
-  bool receive_enabled = 2 [(gogoproto.moretags) = "yaml:\"receive_enabled\""];
+  bool receive_enabled = 2;
 }
diff --git a/proto/ibc/applications/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto
index 1c67aafb937..65f1c8c8e74 100644
--- a/proto/ibc/applications/transfer/v1/tx.proto
+++ b/proto/ibc/applications/transfer/v1/tx.proto
@@ -22,9 +22,9 @@ message MsgTransfer {
   option (gogoproto.goproto_getters) = false;
 
   // the port on which the packet will be sent
-  string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  string source_port = 1;
   // the channel by which the packet will be sent
-  string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  string source_channel = 2;
   // the tokens to be transferred
   cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false];
   // the sender address
@@ -33,11 +33,10 @@ message MsgTransfer {
   string receiver = 5;
   // Timeout height relative to the current block height.
   // The timeout is disabled when set to 0.
-  ibc.core.client.v1.Height timeout_height = 6
-      [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false];
+  ibc.core.client.v1.Height timeout_height = 6 [(gogoproto.nullable) = false];
   // Timeout timestamp in absolute nanoseconds since unix epoch.
   // The timeout is disabled when set to 0.
-  uint64 timeout_timestamp = 7 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  uint64 timeout_timestamp = 7;
   // optional memo
   string memo = 8;
 }
diff --git a/proto/ibc/core/channel/v1/channel.proto b/proto/ibc/core/channel/v1/channel.proto
index 5fbb0d423f7..05c7dbac33b 100644
--- a/proto/ibc/core/channel/v1/channel.proto
+++ b/proto/ibc/core/channel/v1/channel.proto
@@ -21,7 +21,7 @@ message Channel {
   Counterparty counterparty = 3 [(gogoproto.nullable) = false];
   // list of connection identifiers, in order, along which packets sent on
   // this channel will travel
-  repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""];
+  repeated string connection_hops = 4;
   // opaque channel version, which is agreed upon during the handshake
   string version = 5;
 }
@@ -39,7 +39,7 @@ message IdentifiedChannel {
   Counterparty counterparty = 3 [(gogoproto.nullable) = false];
   // list of connection identifiers, in order, along which packets sent on
   // this channel will travel
-  repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""];
+  repeated string connection_hops = 4;
   // opaque channel version, which is agreed upon during the handshake
   string version = 5;
   // port identifier
@@ -85,9 +85,9 @@ message Counterparty {
   option (gogoproto.goproto_getters) = false;
 
   // port on the counterparty chain which owns the other end of the channel.
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // channel end on the counterparty chain
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
 }
 
 // Packet defines a type that carries data across different chains through IBC
@@ -99,20 +99,19 @@ message Packet {
   // with a later sequence number.
   uint64 sequence = 1;
   // identifies the port on the sending chain.
-  string source_port = 2 [(gogoproto.moretags) = "yaml:\"source_port\""];
+  string source_port = 2;
   // identifies the channel end on the sending chain.
-  string source_channel = 3 [(gogoproto.moretags) = "yaml:\"source_channel\""];
+  string source_channel = 3;
   // identifies the port on the receiving chain.
-  string destination_port = 4 [(gogoproto.moretags) = "yaml:\"destination_port\""];
+  string destination_port = 4;
   // identifies the channel end on the receiving chain.
-  string destination_channel = 5 [(gogoproto.moretags) = "yaml:\"destination_channel\""];
+  string destination_channel = 5;
   // actual opaque bytes transferred directly to the application module
   bytes data = 6;
   // block height after which the packet times out
-  ibc.core.client.v1.Height timeout_height = 7
-      [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false];
+  ibc.core.client.v1.Height timeout_height = 7 [(gogoproto.nullable) = false];
   // block timestamp (in nanoseconds) after which the packet times out
-  uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  uint64 timeout_timestamp = 8;
 }
 
 // PacketState defines the generic type necessary to retrieve and store
@@ -123,9 +122,9 @@ message PacketState {
   option (gogoproto.goproto_getters) = false;
 
   // channel port identifier.
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // channel unique identifier.
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
   // packet sequence.
   uint64 sequence = 3;
   // embedded data that represents packet state.
@@ -139,9 +138,9 @@ message PacketId {
   option (gogoproto.goproto_getters) = false;
 
   // channel port identifier
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // channel unique identifier
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
   // packet sequence
   uint64 sequence = 3;
 }
diff --git a/proto/ibc/core/channel/v1/genesis.proto b/proto/ibc/core/channel/v1/genesis.proto
index 65cc928aa2a..092466186da 100644
--- a/proto/ibc/core/channel/v1/genesis.proto
+++ b/proto/ibc/core/channel/v1/genesis.proto
@@ -13,20 +13,17 @@ message GenesisState {
   repeated PacketState       acknowledgements = 2 [(gogoproto.nullable) = false];
   repeated PacketState       commitments      = 3 [(gogoproto.nullable) = false];
   repeated PacketState       receipts         = 4 [(gogoproto.nullable) = false];
-  repeated PacketSequence    send_sequences   = 5
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"send_sequences\""];
-  repeated PacketSequence recv_sequences = 6
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"recv_sequences\""];
-  repeated PacketSequence ack_sequences = 7
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"ack_sequences\""];
+  repeated PacketSequence    send_sequences   = 5 [(gogoproto.nullable) = false];
+  repeated PacketSequence    recv_sequences   = 6 [(gogoproto.nullable) = false];
+  repeated PacketSequence    ack_sequences    = 7 [(gogoproto.nullable) = false];
   // the sequence for the next generated channel identifier
-  uint64 next_channel_sequence = 8 [(gogoproto.moretags) = "yaml:\"next_channel_sequence\""];
+  uint64 next_channel_sequence = 8;
 }
 
 // PacketSequence defines the genesis type necessary to retrieve and store
 // next send and receive sequences.
 message PacketSequence {
-  string port_id    = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string port_id    = 1;
+  string channel_id = 2;
   uint64 sequence   = 3;
 }
diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto
index a67a375559b..c16e48dc264 100644
--- a/proto/ibc/core/channel/v1/tx.proto
+++ b/proto/ibc/core/channel/v1/tx.proto
@@ -60,14 +60,14 @@ message MsgChannelOpenInit {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string  port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string  port_id = 1;
   Channel channel = 2 [(gogoproto.nullable) = false];
   string  signer  = 3;
 }
 
 // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type.
 message MsgChannelOpenInitResponse {
-  string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 1;
   string version    = 2;
 }
 
@@ -78,22 +78,21 @@ message MsgChannelOpenTry {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string port_id = 1;
   // Deprecated: this field is unused. Crossing hello's are no longer supported in core IBC.
-  string previous_channel_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_channel_id\""];
+  string previous_channel_id = 2 [deprecated = true];
   // NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC.
   Channel                   channel              = 3 [(gogoproto.nullable) = false];
-  string                    counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
-  bytes                     proof_init           = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""];
-  ibc.core.client.v1.Height proof_height         = 6
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 7;
+  string                    counterparty_version = 4;
+  bytes                     proof_init           = 5;
+  ibc.core.client.v1.Height proof_height         = 6 [(gogoproto.nullable) = false];
+  string                    signer               = 7;
 }
 
 // MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type.
 message MsgChannelOpenTryResponse {
   string version    = 1;
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string channel_id = 2;
 }
 
 // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
@@ -102,14 +101,13 @@ message MsgChannelOpenAck {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string                    port_id                 = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string                    channel_id              = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
-  string                    counterparty_channel_id = 3 [(gogoproto.moretags) = "yaml:\"counterparty_channel_id\""];
-  string                    counterparty_version    = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
-  bytes                     proof_try               = 5 [(gogoproto.moretags) = "yaml:\"proof_try\""];
-  ibc.core.client.v1.Height proof_height            = 6
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 7;
+  string                    port_id                 = 1;
+  string                    channel_id              = 2;
+  string                    counterparty_channel_id = 3;
+  string                    counterparty_version    = 4;
+  bytes                     proof_try               = 5;
+  ibc.core.client.v1.Height proof_height            = 6 [(gogoproto.nullable) = false];
+  string                    signer                  = 7;
 }
 
 // MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type.
@@ -121,12 +119,11 @@ message MsgChannelOpenConfirm {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string                    port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string                    channel_id   = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
-  bytes                     proof_ack    = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
-  ibc.core.client.v1.Height proof_height = 4
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 5;
+  string                    port_id      = 1;
+  string                    channel_id   = 2;
+  bytes                     proof_ack    = 3;
+  ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false];
+  string                    signer       = 5;
 }
 
 // MsgChannelOpenConfirmResponse defines the Msg/ChannelOpenConfirm response
@@ -139,8 +136,8 @@ message MsgChannelCloseInit {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string port_id    = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
+  string port_id    = 1;
+  string channel_id = 2;
   string signer     = 3;
 }
 
@@ -153,12 +150,11 @@ message MsgChannelCloseConfirm {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string                    port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
-  string                    channel_id   = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
-  bytes                     proof_init   = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""];
-  ibc.core.client.v1.Height proof_height = 4
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 5;
+  string                    port_id      = 1;
+  string                    channel_id   = 2;
+  bytes                     proof_init   = 3;
+  ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false];
+  string                    signer       = 5;
 }
 
 // MsgChannelCloseConfirmResponse defines the Msg/ChannelCloseConfirm response
@@ -171,10 +167,9 @@ message MsgRecvPacket {
   option (gogoproto.goproto_getters) = false;
 
   Packet                    packet           = 1 [(gogoproto.nullable) = false];
-  bytes                     proof_commitment = 2 [(gogoproto.moretags) = "yaml:\"proof_commitment\""];
-  ibc.core.client.v1.Height proof_height     = 3
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 4;
+  bytes                     proof_commitment = 2;
+  ibc.core.client.v1.Height proof_height     = 3 [(gogoproto.nullable) = false];
+  string                    signer           = 4;
 }
 
 // MsgRecvPacketResponse defines the Msg/RecvPacket response type.
@@ -189,12 +184,11 @@ message MsgTimeout {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  Packet                    packet           = 1 [(gogoproto.nullable) = false];
-  bytes                     proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
-  ibc.core.client.v1.Height proof_height     = 3
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
-  string signer             = 5;
+  Packet                    packet             = 1 [(gogoproto.nullable) = false];
+  bytes                     proof_unreceived   = 2;
+  ibc.core.client.v1.Height proof_height       = 3 [(gogoproto.nullable) = false];
+  uint64                    next_sequence_recv = 4;
+  string                    signer             = 5;
 }
 
 // MsgTimeoutResponse defines the Msg/Timeout response type.
@@ -209,13 +203,12 @@ message MsgTimeoutOnClose {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  Packet                    packet           = 1 [(gogoproto.nullable) = false];
-  bytes                     proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""];
-  bytes                     proof_close      = 3 [(gogoproto.moretags) = "yaml:\"proof_close\""];
-  ibc.core.client.v1.Height proof_height     = 4
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  uint64 next_sequence_recv = 5 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
-  string signer             = 6;
+  Packet                    packet             = 1 [(gogoproto.nullable) = false];
+  bytes                     proof_unreceived   = 2;
+  bytes                     proof_close        = 3;
+  ibc.core.client.v1.Height proof_height       = 4 [(gogoproto.nullable) = false];
+  uint64                    next_sequence_recv = 5;
+  string                    signer             = 6;
 }
 
 // MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type.
@@ -232,10 +225,9 @@ message MsgAcknowledgement {
 
   Packet                    packet          = 1 [(gogoproto.nullable) = false];
   bytes                     acknowledgement = 2;
-  bytes                     proof_acked     = 3 [(gogoproto.moretags) = "yaml:\"proof_acked\""];
-  ibc.core.client.v1.Height proof_height    = 4
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 5;
+  bytes                     proof_acked     = 3;
+  ibc.core.client.v1.Height proof_height    = 4 [(gogoproto.nullable) = false];
+  string                    signer          = 5;
 }
 
 // MsgAcknowledgementResponse defines the Msg/Acknowledgement response type.
diff --git a/proto/ibc/core/client/v1/client.proto b/proto/ibc/core/client/v1/client.proto
index 15b47e55548..9c9178d5f0e 100644
--- a/proto/ibc/core/client/v1/client.proto
+++ b/proto/ibc/core/client/v1/client.proto
@@ -13,9 +13,9 @@ import "cosmos_proto/cosmos.proto";
 // identifier field.
 message IdentifiedClientState {
   // client identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // client state
-  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  google.protobuf.Any client_state = 2;
 }
 
 // ConsensusStateWithHeight defines a consensus state with an additional height
@@ -24,17 +24,16 @@ message ConsensusStateWithHeight {
   // consensus state height
   Height height = 1 [(gogoproto.nullable) = false];
   // consensus state
-  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  google.protobuf.Any consensus_state = 2;
 }
 
 // ClientConsensusStates defines all the stored consensus states for a given
 // client.
 message ClientConsensusStates {
   // client identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // consensus states and their heights associated with the client
-  repeated ConsensusStateWithHeight consensus_states = 2
-      [(gogoproto.moretags) = "yaml:\"consensus_states\"", (gogoproto.nullable) = false];
+  repeated ConsensusStateWithHeight consensus_states = 2 [(gogoproto.nullable) = false];
 }
 
 // ClientUpdateProposal is a governance proposal. If it passes, the substitute
@@ -49,10 +48,10 @@ message ClientUpdateProposal {
   // the description of the proposal
   string description = 2;
   // the client identifier for the client to be updated if the proposal passes
-  string subject_client_id = 3 [(gogoproto.moretags) = "yaml:\"subject_client_id\""];
+  string subject_client_id = 3;
   // the substitute client identifier for the client standing in for the subject
   // client
-  string substitute_client_id = 4 [(gogoproto.moretags) = "yaml:\"substitute_client_id\""];
+  string substitute_client_id = 4;
 }
 
 // UpgradeProposal is a gov Content type for initiating an IBC breaking
@@ -73,7 +72,7 @@ message UpgradeProposal {
   // new upgraded client is valid by verifying a proof on the previous version
   // of the chain. This will allow IBC connections to persist smoothly across
   // planned chain upgrades
-  google.protobuf.Any upgraded_client_state = 4 [(gogoproto.moretags) = "yaml:\"upgraded_client_state\""];
+  google.protobuf.Any upgraded_client_state = 4;
 }
 
 // Height is a monotonically increasing data type
@@ -91,9 +90,9 @@ message Height {
   option (gogoproto.goproto_stringer) = false;
 
   // the revision that the client is currently on
-  uint64 revision_number = 1 [(gogoproto.moretags) = "yaml:\"revision_number\""];
+  uint64 revision_number = 1;
   // the height within the given revision
-  uint64 revision_height = 2 [(gogoproto.moretags) = "yaml:\"revision_height\""];
+  uint64 revision_height = 2;
 }
 
 // Params defines the set of IBC light client parameters.
@@ -101,5 +100,5 @@ message Params {
   // allowed_clients defines the list of allowed client state types which can be created
   // and interacted with. If a client type is removed from the allowed clients list, usage
   // of this client will be disabled until it is added again to the list.
-  repeated string allowed_clients = 1 [(gogoproto.moretags) = "yaml:\"allowed_clients\""];
+  repeated string allowed_clients = 1;
 }
diff --git a/proto/ibc/core/client/v1/genesis.proto b/proto/ibc/core/client/v1/genesis.proto
index 78821244169..d23585dcbab 100644
--- a/proto/ibc/core/client/v1/genesis.proto
+++ b/proto/ibc/core/client/v1/genesis.proto
@@ -13,19 +13,15 @@ message GenesisState {
   repeated IdentifiedClientState clients = 1
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "IdentifiedClientStates"];
   // consensus states from each client
-  repeated ClientConsensusStates clients_consensus = 2 [
-    (gogoproto.nullable)     = false,
-    (gogoproto.castrepeated) = "ClientsConsensusStates",
-    (gogoproto.moretags)     = "yaml:\"clients_consensus\""
-  ];
+  repeated ClientConsensusStates clients_consensus = 2
+      [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "ClientsConsensusStates"];
   // metadata from each client
-  repeated IdentifiedGenesisMetadata clients_metadata = 3
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"clients_metadata\""];
-  Params params = 4 [(gogoproto.nullable) = false];
+  repeated IdentifiedGenesisMetadata clients_metadata = 3 [(gogoproto.nullable) = false];
+  Params                             params           = 4 [(gogoproto.nullable) = false];
   // create localhost on initialization
-  bool create_localhost = 5 [(gogoproto.moretags) = "yaml:\"create_localhost\""];
+  bool create_localhost = 5;
   // the sequence for the next generated client identifier
-  uint64 next_client_sequence = 6 [(gogoproto.moretags) = "yaml:\"next_client_sequence\""];
+  uint64 next_client_sequence = 6;
 }
 
 // GenesisMetadata defines the genesis type for metadata that clients may return
@@ -42,7 +38,6 @@ message GenesisMetadata {
 // IdentifiedGenesisMetadata has the client metadata with the corresponding
 // client id.
 message IdentifiedGenesisMetadata {
-  string                   client_id       = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
-  repeated GenesisMetadata client_metadata = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_metadata\""];
+  string                   client_id       = 1;
+  repeated GenesisMetadata client_metadata = 2 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/core/client/v1/tx.proto b/proto/ibc/core/client/v1/tx.proto
index 23302d5e3aa..9388dbc9dd5 100644
--- a/proto/ibc/core/client/v1/tx.proto
+++ b/proto/ibc/core/client/v1/tx.proto
@@ -28,10 +28,10 @@ message MsgCreateClient {
   option (gogoproto.goproto_getters) = false;
 
   // light client state
-  google.protobuf.Any client_state = 1 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  google.protobuf.Any client_state = 1;
   // consensus state associated with the client that corresponds to a given
   // height.
-  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  google.protobuf.Any consensus_state = 2;
   // signer address
   string signer = 3;
 }
@@ -46,7 +46,7 @@ message MsgUpdateClient {
   option (gogoproto.goproto_getters) = false;
 
   // client unique identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // client message to update the light client
   google.protobuf.Any client_message = 2;
   // signer address
@@ -63,16 +63,16 @@ message MsgUpgradeClient {
   option (gogoproto.goproto_getters) = false;
 
   // client unique identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // upgraded client state
-  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  google.protobuf.Any client_state = 2;
   // upgraded consensus state, only contains enough information to serve as a
   // basis of trust in update logic
-  google.protobuf.Any consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  google.protobuf.Any consensus_state = 3;
   // proof that old chain committed to new client
-  bytes proof_upgrade_client = 4 [(gogoproto.moretags) = "yaml:\"proof_upgrade_client\""];
+  bytes proof_upgrade_client = 4;
   // proof that old chain committed to new consensus state
-  bytes proof_upgrade_consensus_state = 5 [(gogoproto.moretags) = "yaml:\"proof_upgrade_consensus_state\""];
+  bytes proof_upgrade_consensus_state = 5;
   // signer address
   string signer = 6;
 }
@@ -88,7 +88,7 @@ message MsgSubmitMisbehaviour {
   option (gogoproto.goproto_getters) = false;
 
   // client unique identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\"", deprecated = true];
+  string client_id = 1 [deprecated = true];
   // misbehaviour used for freezing the light client
   google.protobuf.Any misbehaviour = 2 [deprecated = true];
   // signer address
diff --git a/proto/ibc/core/commitment/v1/commitment.proto b/proto/ibc/core/commitment/v1/commitment.proto
index 4840ff3e067..f44fb75379a 100644
--- a/proto/ibc/core/commitment/v1/commitment.proto
+++ b/proto/ibc/core/commitment/v1/commitment.proto
@@ -19,7 +19,7 @@ message MerkleRoot {
 // The constructed key from the Path and the key will be append(Path.KeyPath,
 // append(Path.KeyPrefix, key...))
 message MerklePrefix {
-  bytes key_prefix = 1 [(gogoproto.moretags) = "yaml:\"key_prefix\""];
+  bytes key_prefix = 1;
 }
 
 // MerklePath is the path used to verify commitment proofs, which can be an
@@ -28,7 +28,7 @@ message MerklePrefix {
 message MerklePath {
   option (gogoproto.goproto_stringer) = false;
 
-  repeated string key_path = 1 [(gogoproto.moretags) = "yaml:\"key_path\""];
+  repeated string key_path = 1;
 }
 
 // MerkleProof is a wrapper type over a chain of CommitmentProofs.
diff --git a/proto/ibc/core/connection/v1/connection.proto b/proto/ibc/core/connection/v1/connection.proto
index ba367c14d20..952a831aef3 100644
--- a/proto/ibc/core/connection/v1/connection.proto
+++ b/proto/ibc/core/connection/v1/connection.proto
@@ -17,7 +17,7 @@ import "ibc/core/commitment/v1/commitment.proto";
 message ConnectionEnd {
   option (gogoproto.goproto_getters) = false;
   // client associated with this connection.
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // IBC version which can be utilised to determine encodings or protocols for
   // channels or packets utilising this connection.
   repeated Version versions = 2;
@@ -28,7 +28,7 @@ message ConnectionEnd {
   // delay period that must pass before a consensus state can be used for
   // packet-verification NOTE: delay period logic is only implemented by some
   // clients.
-  uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+  uint64 delay_period = 5;
 }
 
 // IdentifiedConnection defines a connection with additional connection
@@ -36,9 +36,9 @@ message ConnectionEnd {
 message IdentifiedConnection {
   option (gogoproto.goproto_getters) = false;
   // connection identifier.
-  string id = 1 [(gogoproto.moretags) = "yaml:\"id\""];
+  string id = 1;
   // client associated with this connection.
-  string client_id = 2 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 2;
   // IBC version which can be utilised to determine encodings or protocols for
   // channels or packets utilising this connection
   repeated Version versions = 3;
@@ -47,7 +47,7 @@ message IdentifiedConnection {
   // counterparty chain associated with this connection.
   Counterparty counterparty = 5 [(gogoproto.nullable) = false];
   // delay period associated with this connection.
-  uint64 delay_period = 6 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+  uint64 delay_period = 6;
 }
 
 // State defines if a connection is in one of the following states:
@@ -72,10 +72,10 @@ message Counterparty {
 
   // identifies the client on the counterparty chain associated with a given
   // connection.
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // identifies the connection end on the counterparty chain associated with a
   // given connection.
-  string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id = 2;
   // commitment merkle prefix of the counterparty chain.
   ibc.core.commitment.v1.MerklePrefix prefix = 3 [(gogoproto.nullable) = false];
 }
@@ -89,7 +89,7 @@ message ClientPaths {
 // ConnectionPaths define all the connection paths for a given client state.
 message ConnectionPaths {
   // client state unique identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // list of connection paths
   repeated string paths = 2;
 }
@@ -110,5 +110,5 @@ message Params {
   // maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the
   // largest amount of time that the chain might reasonably take to produce the next block under normal operating
   // conditions. A safe choice is 3-5x the expected time per block.
-  uint64 max_expected_time_per_block = 1 [(gogoproto.moretags) = "yaml:\"max_expected_time_per_block\""];
+  uint64 max_expected_time_per_block = 1;
 }
diff --git a/proto/ibc/core/connection/v1/genesis.proto b/proto/ibc/core/connection/v1/genesis.proto
index 122c5a4652d..43b4e45955e 100644
--- a/proto/ibc/core/connection/v1/genesis.proto
+++ b/proto/ibc/core/connection/v1/genesis.proto
@@ -10,9 +10,8 @@ import "ibc/core/connection/v1/connection.proto";
 // GenesisState defines the ibc connection submodule's genesis state.
 message GenesisState {
   repeated IdentifiedConnection connections             = 1 [(gogoproto.nullable) = false];
-  repeated ConnectionPaths      client_connection_paths = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_connection_paths\""];
+  repeated ConnectionPaths      client_connection_paths = 2 [(gogoproto.nullable) = false];
   // the sequence for the next generated connection identifier
-  uint64 next_connection_sequence = 3 [(gogoproto.moretags) = "yaml:\"next_connection_sequence\""];
+  uint64 next_connection_sequence = 3;
   Params params                   = 4 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/core/connection/v1/query.proto b/proto/ibc/core/connection/v1/query.proto
index 3c76b238910..99f6f92ab6e 100644
--- a/proto/ibc/core/connection/v1/query.proto
+++ b/proto/ibc/core/connection/v1/query.proto
@@ -106,7 +106,7 @@ message QueryClientConnectionsResponse {
 // Query/ConnectionClientState RPC method
 message QueryConnectionClientStateRequest {
   // connection identifier
-  string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id = 1;
 }
 
 // QueryConnectionClientStateResponse is the response type for the
@@ -124,7 +124,7 @@ message QueryConnectionClientStateResponse {
 // Query/ConnectionConsensusState RPC method
 message QueryConnectionConsensusStateRequest {
   // connection identifier
-  string connection_id   = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id   = 1;
   uint64 revision_number = 2;
   uint64 revision_height = 3;
 }
diff --git a/proto/ibc/core/connection/v1/tx.proto b/proto/ibc/core/connection/v1/tx.proto
index af8f505c461..28ab6264a6c 100644
--- a/proto/ibc/core/connection/v1/tx.proto
+++ b/proto/ibc/core/connection/v1/tx.proto
@@ -31,10 +31,10 @@ message MsgConnectionOpenInit {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string       client_id    = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string       client_id    = 1;
   Counterparty counterparty = 2 [(gogoproto.nullable) = false];
   Version      version      = 3;
-  uint64       delay_period = 4 [(gogoproto.moretags) = "yaml:\"delay_period\""];
+  uint64       delay_period = 4;
   string       signer       = 5;
 }
 
@@ -48,25 +48,23 @@ message MsgConnectionOpenTry {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC.
-  string previous_connection_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_connection_id\""];
-  google.protobuf.Any       client_state          = 3 [(gogoproto.moretags) = "yaml:\"client_state\""];
-  Counterparty              counterparty          = 4 [(gogoproto.nullable) = false];
-  uint64                    delay_period          = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""];
-  repeated Version          counterparty_versions = 6 [(gogoproto.moretags) = "yaml:\"counterparty_versions\""];
-  ibc.core.client.v1.Height proof_height          = 7
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string                    previous_connection_id = 2 [deprecated = true];
+  google.protobuf.Any       client_state           = 3;
+  Counterparty              counterparty           = 4 [(gogoproto.nullable) = false];
+  uint64                    delay_period           = 5;
+  repeated Version          counterparty_versions  = 6;
+  ibc.core.client.v1.Height proof_height           = 7 [(gogoproto.nullable) = false];
   // proof of the initialization the connection on Chain A: `UNITIALIZED ->
   // INIT`
-  bytes proof_init = 8 [(gogoproto.moretags) = "yaml:\"proof_init\""];
+  bytes proof_init = 8;
   // proof of client state included in message
-  bytes proof_client = 9 [(gogoproto.moretags) = "yaml:\"proof_client\""];
+  bytes proof_client = 9;
   // proof of client consensus state
-  bytes                     proof_consensus  = 10 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
-  ibc.core.client.v1.Height consensus_height = 11
-      [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false];
-  string signer = 12;
+  bytes                     proof_consensus  = 10;
+  ibc.core.client.v1.Height consensus_height = 11 [(gogoproto.nullable) = false];
+  string                    signer           = 12;
   // optional proof data for host state machines that are unable to introspect their own consensus state
   bytes host_consensus_state_proof = 13;
 }
@@ -80,22 +78,20 @@ message MsgConnectionOpenAck {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string              connection_id              = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  string              counterparty_connection_id = 2 [(gogoproto.moretags) = "yaml:\"counterparty_connection_id\""];
-  Version             version                    = 3;
-  google.protobuf.Any client_state               = 4 [(gogoproto.moretags) = "yaml:\"client_state\""];
-  ibc.core.client.v1.Height proof_height         = 5
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
+  string                    connection_id              = 1;
+  string                    counterparty_connection_id = 2;
+  Version                   version                    = 3;
+  google.protobuf.Any       client_state               = 4;
+  ibc.core.client.v1.Height proof_height               = 5 [(gogoproto.nullable) = false];
   // proof of the initialization the connection on Chain B: `UNITIALIZED ->
   // TRYOPEN`
-  bytes proof_try = 6 [(gogoproto.moretags) = "yaml:\"proof_try\""];
+  bytes proof_try = 6;
   // proof of client state included in message
-  bytes proof_client = 7 [(gogoproto.moretags) = "yaml:\"proof_client\""];
+  bytes proof_client = 7;
   // proof of client consensus state
-  bytes                     proof_consensus  = 8 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
-  ibc.core.client.v1.Height consensus_height = 9
-      [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false];
-  string signer = 10;
+  bytes                     proof_consensus  = 8;
+  ibc.core.client.v1.Height consensus_height = 9 [(gogoproto.nullable) = false];
+  string                    signer           = 10;
   // optional proof data for host state machines that are unable to introspect their own consensus state
   bytes host_consensus_state_proof = 11;
 }
@@ -109,12 +105,11 @@ message MsgConnectionOpenConfirm {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string connection_id = 1;
   // proof for the change of the connection state on Chain A: `INIT -> OPEN`
-  bytes                     proof_ack    = 2 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
-  ibc.core.client.v1.Height proof_height = 3
-      [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false];
-  string signer = 4;
+  bytes                     proof_ack    = 2;
+  ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false];
+  string                    signer       = 4;
 }
 
 // MsgConnectionOpenConfirmResponse defines the Msg/ConnectionOpenConfirm
diff --git a/proto/ibc/core/types/v1/genesis.proto b/proto/ibc/core/types/v1/genesis.proto
index 4e07551f823..9ab7fd3f741 100644
--- a/proto/ibc/core/types/v1/genesis.proto
+++ b/proto/ibc/core/types/v1/genesis.proto
@@ -12,12 +12,9 @@ import "ibc/core/channel/v1/genesis.proto";
 // GenesisState defines the ibc module's genesis state.
 message GenesisState {
   // ICS002 - Clients genesis state
-  ibc.core.client.v1.GenesisState client_genesis = 1
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_genesis\""];
+  ibc.core.client.v1.GenesisState client_genesis = 1 [(gogoproto.nullable) = false];
   // ICS003 - Connections genesis state
-  ibc.core.connection.v1.GenesisState connection_genesis = 2
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"connection_genesis\""];
+  ibc.core.connection.v1.GenesisState connection_genesis = 2 [(gogoproto.nullable) = false];
   // ICS004 - Channel genesis state
-  ibc.core.channel.v1.GenesisState channel_genesis = 3
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"channel_genesis\""];
+  ibc.core.channel.v1.GenesisState channel_genesis = 3 [(gogoproto.nullable) = false];
 }
diff --git a/proto/ibc/lightclients/solomachine/v2/solomachine.proto b/proto/ibc/lightclients/solomachine/v2/solomachine.proto
index 250313319b4..b18ba9bc92f 100644
--- a/proto/ibc/lightclients/solomachine/v2/solomachine.proto
+++ b/proto/ibc/lightclients/solomachine/v2/solomachine.proto
@@ -16,11 +16,11 @@ message ClientState {
   // latest sequence of the client state
   uint64 sequence = 1;
   // frozen sequence of the solo machine
-  bool           is_frozen       = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""];
-  ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  bool           is_frozen       = 2;
+  ConsensusState consensus_state = 3;
   // when set to true, will allow governance to update a solo machine client.
   // The client will be unfrozen if it is frozen.
-  bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""];
+  bool allow_update_after_proposal = 4;
 }
 
 // ConsensusState defines a solo machine consensus state. The sequence of a
@@ -29,7 +29,7 @@ message ClientState {
 message ConsensusState {
   option (gogoproto.goproto_getters) = false;
   // public key of the solo machine
-  google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
+  google.protobuf.Any public_key = 1;
   // diversifier allows the same public key to be re-used across different solo
   // machine clients (potentially on different chains) without being considered
   // misbehaviour.
@@ -44,18 +44,18 @@ message Header {
   uint64              sequence        = 1;
   uint64              timestamp       = 2;
   bytes               signature       = 3;
-  google.protobuf.Any new_public_key  = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""];
-  string              new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+  google.protobuf.Any new_public_key  = 4;
+  string              new_diversifier = 5;
 }
 
 // Misbehaviour defines misbehaviour for a solo machine which consists
 // of a sequence and two signatures over different messages at that sequence.
 message Misbehaviour {
   option (gogoproto.goproto_getters) = false;
-  string           client_id         = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string           client_id         = 1;
   uint64           sequence          = 2;
-  SignatureAndData signature_one     = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""];
-  SignatureAndData signature_two     = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""];
+  SignatureAndData signature_one     = 3;
+  SignatureAndData signature_two     = 4;
 }
 
 // SignatureAndData contains a signature and the data signed over to create that
@@ -63,7 +63,7 @@ message Misbehaviour {
 message SignatureAndData {
   option (gogoproto.goproto_getters) = false;
   bytes    signature                 = 1;
-  DataType data_type                 = 2 [(gogoproto.moretags) = "yaml:\"data_type\""];
+  DataType data_type                 = 2;
   bytes    data                      = 3;
   uint64   timestamp                 = 4;
 }
@@ -72,7 +72,7 @@ message SignatureAndData {
 // signature.
 message TimestampedSignatureData {
   option (gogoproto.goproto_getters) = false;
-  bytes  signature_data              = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""];
+  bytes  signature_data              = 1;
   uint64 timestamp                   = 2;
 }
 
@@ -84,7 +84,7 @@ message SignBytes {
   uint64 timestamp   = 2;
   string diversifier = 3;
   // type of the data used
-  DataType data_type = 4 [(gogoproto.moretags) = "yaml:\"data_type\""];
+  DataType data_type = 4;
   // marshaled data
   bytes data = 5;
 }
@@ -121,9 +121,9 @@ message HeaderData {
   option (gogoproto.goproto_getters) = false;
 
   // header public key
-  google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""];
+  google.protobuf.Any new_pub_key = 1;
   // header diversifier
-  string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+  string new_diversifier = 2;
 }
 
 // ClientStateData returns the SignBytes data for client state verification.
@@ -131,7 +131,7 @@ message ClientStateData {
   option (gogoproto.goproto_getters) = false;
 
   bytes               path         = 1;
-  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  google.protobuf.Any client_state = 2;
 }
 
 // ConsensusStateData returns the SignBytes data for consensus state
@@ -140,7 +140,7 @@ message ConsensusStateData {
   option (gogoproto.goproto_getters) = false;
 
   bytes               path            = 1;
-  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  google.protobuf.Any consensus_state = 2;
 }
 
 // ConnectionStateData returns the SignBytes data for connection state
@@ -185,5 +185,5 @@ message PacketReceiptAbsenceData {
 // sequence to be received.
 message NextSequenceRecvData {
   bytes  path          = 1;
-  uint64 next_seq_recv = 2 [(gogoproto.moretags) = "yaml:\"next_seq_recv\""];
+  uint64 next_seq_recv = 2;
 }
diff --git a/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/proto/ibc/lightclients/solomachine/v3/solomachine.proto
index 40e76b722e7..7bc800e93a7 100644
--- a/proto/ibc/lightclients/solomachine/v3/solomachine.proto
+++ b/proto/ibc/lightclients/solomachine/v3/solomachine.proto
@@ -14,8 +14,8 @@ message ClientState {
   // latest sequence of the client state
   uint64 sequence = 1;
   // frozen sequence of the solo machine
-  bool           is_frozen       = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""];
-  ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  bool           is_frozen       = 2;
+  ConsensusState consensus_state = 3;
 }
 
 // ConsensusState defines a solo machine consensus state. The sequence of a
@@ -24,7 +24,7 @@ message ClientState {
 message ConsensusState {
   option (gogoproto.goproto_getters) = false;
   // public key of the solo machine
-  google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
+  google.protobuf.Any public_key = 1;
   // diversifier allows the same public key to be re-used across different solo
   // machine clients (potentially on different chains) without being considered
   // misbehaviour.
@@ -38,8 +38,8 @@ message Header {
 
   uint64              timestamp       = 1;
   bytes               signature       = 2;
-  google.protobuf.Any new_public_key  = 3 [(gogoproto.moretags) = "yaml:\"new_public_key\""];
-  string              new_diversifier = 4 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+  google.protobuf.Any new_public_key  = 3;
+  string              new_diversifier = 4;
 }
 
 // Misbehaviour defines misbehaviour for a solo machine which consists
@@ -48,8 +48,8 @@ message Misbehaviour {
   option (gogoproto.goproto_getters) = false;
 
   uint64           sequence      = 1;
-  SignatureAndData signature_one = 2 [(gogoproto.moretags) = "yaml:\"signature_one\""];
-  SignatureAndData signature_two = 3 [(gogoproto.moretags) = "yaml:\"signature_two\""];
+  SignatureAndData signature_one = 2;
+  SignatureAndData signature_two = 3;
 }
 
 // SignatureAndData contains a signature and the data signed over to create that
@@ -68,7 +68,7 @@ message SignatureAndData {
 message TimestampedSignatureData {
   option (gogoproto.goproto_getters) = false;
 
-  bytes  signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""];
+  bytes  signature_data = 1;
   uint64 timestamp      = 2;
 }
 
@@ -93,7 +93,7 @@ message HeaderData {
   option (gogoproto.goproto_getters) = false;
 
   // header public key
-  google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""];
+  google.protobuf.Any new_pub_key = 1;
   // header diversifier
-  string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+  string new_diversifier = 2;
 }
diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto
index 83fa59c9fa4..7926828b519 100644
--- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto
+++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto
@@ -19,29 +19,21 @@ message ClientState {
   option (gogoproto.goproto_getters) = false;
 
   string   chain_id    = 1;
-  Fraction trust_level = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trust_level\""];
+  Fraction trust_level = 2 [(gogoproto.nullable) = false];
   // duration of the period since the LastestTimestamp during which the
   // submitted headers are valid for upgrade
-  google.protobuf.Duration trusting_period = 3
-      [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"trusting_period\""];
+  google.protobuf.Duration trusting_period = 3 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
   // duration of the staking unbonding period
-  google.protobuf.Duration unbonding_period = 4 [
-    (gogoproto.nullable)    = false,
-    (gogoproto.stdduration) = true,
-    (gogoproto.moretags)    = "yaml:\"unbonding_period\""
-  ];
+  google.protobuf.Duration unbonding_period = 4 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
   // defines how much new (untrusted) header's Time can drift into the future.
-  google.protobuf.Duration max_clock_drift = 5
-      [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"max_clock_drift\""];
+  google.protobuf.Duration max_clock_drift = 5 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
   // Block height when the client was frozen due to a misbehaviour
-  ibc.core.client.v1.Height frozen_height = 6
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"frozen_height\""];
+  ibc.core.client.v1.Height frozen_height = 6 [(gogoproto.nullable) = false];
   // Latest height the client was updated to
-  ibc.core.client.v1.Height latest_height = 7
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"latest_height\""];
+  ibc.core.client.v1.Height latest_height = 7 [(gogoproto.nullable) = false];
 
   // Proof specifications used in verifying counterparty state
-  repeated cosmos.ics23.v1.ProofSpec proof_specs = 8 [(gogoproto.moretags) = "yaml:\"proof_specs\""];
+  repeated cosmos.ics23.v1.ProofSpec proof_specs = 8;
 
   // Path at which next upgraded client will be committed.
   // Each element corresponds to the key for a single CommitmentProof in the
@@ -50,13 +42,12 @@ message ClientState {
   // under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using
   // the default upgrade module, upgrade_path should be []string{"upgrade",
   // "upgradedIBCState"}`
-  repeated string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""];
+  repeated string upgrade_path = 9;
 
   // allow_update_after_expiry is deprecated
-  bool allow_update_after_expiry = 10 [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""];
+  bool allow_update_after_expiry = 10 [deprecated = true];
   // allow_update_after_misbehaviour is deprecated
-  bool allow_update_after_misbehaviour = 11
-      [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""];
+  bool allow_update_after_misbehaviour = 11 [deprecated = true];
 }
 
 // ConsensusState defines the consensus state from Tendermint.
@@ -67,11 +58,8 @@ message ConsensusState {
   // was stored.
   google.protobuf.Timestamp timestamp = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // commitment root (i.e app hash)
-  ibc.core.commitment.v1.MerkleRoot root                 = 2 [(gogoproto.nullable) = false];
-  bytes                             next_validators_hash = 3 [
-    (gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes",
-    (gogoproto.moretags) = "yaml:\"next_validators_hash\""
-  ];
+  ibc.core.commitment.v1.MerkleRoot root = 2 [(gogoproto.nullable) = false];
+  bytes next_validators_hash = 3 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"];
 }
 
 // Misbehaviour is a wrapper over two conflicting Headers
@@ -80,9 +68,9 @@ message Misbehaviour {
   option (gogoproto.goproto_getters) = false;
 
   // ClientID is deprecated
-  string client_id = 1 [deprecated = true, (gogoproto.moretags) = "yaml:\"client_id\""];
-  Header header_1  = 2 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""];
-  Header header_2  = 3 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""];
+  string client_id = 1 [deprecated = true];
+  Header header_1  = 2 [(gogoproto.customname) = "Header1"];
+  Header header_2  = 3 [(gogoproto.customname) = "Header2"];
 }
 
 // Header defines the Tendermint client consensus Header.
@@ -98,13 +86,11 @@ message Misbehaviour {
 // hash to TrustedConsensusState.NextValidatorsHash since that is the last
 // trusted validator set at the TrustedHeight.
 message Header {
-  .tendermint.types.SignedHeader signed_header = 1
-      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"signed_header\""];
+  .tendermint.types.SignedHeader signed_header = 1 [(gogoproto.embed) = true];
 
-  .tendermint.types.ValidatorSet validator_set  = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""];
-  ibc.core.client.v1.Height      trusted_height = 3
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trusted_height\""];
-  .tendermint.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""];
+  .tendermint.types.ValidatorSet validator_set      = 2;
+  ibc.core.client.v1.Height      trusted_height     = 3 [(gogoproto.nullable) = false];
+  .tendermint.types.ValidatorSet trusted_validators = 4;
 }
 
 // Fraction defines the protobuf message type for tmmath.Fraction that only