diff --git a/api/cosmos/accounts/v1/query.pulsar.go b/api/cosmos/accounts/v1/query.pulsar.go
index e9288feea588..7a1751ef4a57 100644
--- a/api/cosmos/accounts/v1/query.pulsar.go
+++ b/api/cosmos/accounts/v1/query.pulsar.go
@@ -4322,7 +4322,7 @@ func (x *AccountQueryResponse) GetResponse() *anypb.Any {
 	return nil
 }
 
-// SchemaResponse is the response type for the Query/Schema RPC method.
+// SchemaRequest is the request type for the Query/Schema RPC method.
 type SchemaRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/x/accounts/proto/cosmos/accounts/v1/query.proto b/x/accounts/proto/cosmos/accounts/v1/query.proto
index e0e5564e097d..d59380f89c3b 100644
--- a/x/accounts/proto/cosmos/accounts/v1/query.proto
+++ b/x/accounts/proto/cosmos/accounts/v1/query.proto
@@ -32,7 +32,7 @@ message AccountQueryResponse {
   google.protobuf.Any response = 1;
 }
 
-// SchemaResponse is the response type for the Query/Schema RPC method.
+// SchemaRequest is the request type for the Query/Schema RPC method.
 message SchemaRequest {
   // account_type defines the account type to query the schema for.
   string account_type = 1;
diff --git a/x/accounts/v1/query.pb.go b/x/accounts/v1/query.pb.go
index 0e734500c33d..98a0582b78ff 100644
--- a/x/accounts/v1/query.pb.go
+++ b/x/accounts/v1/query.pb.go
@@ -129,7 +129,7 @@ func (m *AccountQueryResponse) GetResponse() *any.Any {
 	return nil
 }
 
-// SchemaResponse is the response type for the Query/Schema RPC method.
+// SchemaRequest is the request type for the Query/Schema RPC method.
 type SchemaRequest struct {
 	// account_type defines the account type to query the schema for.
 	AccountType string `protobuf:"bytes,1,opt,name=account_type,json=accountType,proto3" json:"account_type,omitempty"`
diff --git a/x/auth/types/tx.pb.go b/x/auth/types/tx.pb.go
index 960a79d6585b..d7cadb0666a2 100644
--- a/x/auth/types/tx.pb.go
+++ b/x/auth/types/tx.pb.go
@@ -7,12 +7,12 @@ import (
 	context "context"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	types "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/cosmos-sdk/types/msgservice"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
+	any "github.com/cosmos/gogoproto/types/any"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -133,8 +133,8 @@ var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo
 
 // MsgNonAtomicExec defines the Msg/NonAtomicExec request type.
 type MsgNonAtomicExec struct {
-	Signer string       `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty"`
-	Msgs   []*types.Any `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs,omitempty"`
+	Signer string     `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty"`
+	Msgs   []*any.Any `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs,omitempty"`
 }
 
 func (m *MsgNonAtomicExec) Reset()         { *m = MsgNonAtomicExec{} }
@@ -177,7 +177,7 @@ func (m *MsgNonAtomicExec) GetSigner() string {
 	return ""
 }
 
-func (m *MsgNonAtomicExec) GetMsgs() []*types.Any {
+func (m *MsgNonAtomicExec) GetMsgs() []*any.Any {
 	if m != nil {
 		return m.Msgs
 	}
@@ -187,8 +187,8 @@ func (m *MsgNonAtomicExec) GetMsgs() []*types.Any {
 // NonAtomicExecResult defines the response structure for executing a
 // MsgNonAtomicExec.
 type NonAtomicExecResult struct {
-	Error string     `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	Resp  *types.Any `protobuf:"bytes,2,opt,name=resp,proto3" json:"resp,omitempty"`
+	Error string   `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Resp  *any.Any `protobuf:"bytes,2,opt,name=resp,proto3" json:"resp,omitempty"`
 }
 
 func (m *NonAtomicExecResult) Reset()         { *m = NonAtomicExecResult{} }
@@ -231,7 +231,7 @@ func (m *NonAtomicExecResult) GetError() string {
 	return ""
 }
 
-func (m *NonAtomicExecResult) GetResp() *types.Any {
+func (m *NonAtomicExecResult) GetResp() *any.Any {
 	if m != nil {
 		return m.Resp
 	}
@@ -989,7 +989,7 @@ func (m *MsgNonAtomicExec) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Msgs = append(m.Msgs, &types.Any{})
+			m.Msgs = append(m.Msgs, &any.Any{})
 			if err := m.Msgs[len(m.Msgs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -1106,7 +1106,7 @@ func (m *NonAtomicExecResult) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Resp == nil {
-				m.Resp = &types.Any{}
+				m.Resp = &any.Any{}
 			}
 			if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err