diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto
index 09864e8a1..b278d8805 100644
--- a/proto/osmosis/tokenfactory/v1beta1/query.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/query.proto
@@ -86,6 +86,6 @@ message QueryBeforeSendHookAddressRequest {
 // QueryBeforeSendHookAddressResponse defines the response structure for the
 // DenomBeforeSendHook gRPC query.
 message QueryBeforeSendHookAddressResponse {
-  string cosmwasm_address = 1
-  [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
+  string contract_addr = 1
+  [ (gogoproto.moretags) = "yaml:\"contract_addr\"" ];
 }
diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto
index 7f4ce2fb3..43dd79d33 100644
--- a/proto/osmosis/tokenfactory/v1beta1/tx.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto
@@ -103,8 +103,8 @@ message MsgSetBeforeSendHook {
 
   string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
   string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
-  string cosmwasm_address = 3
-  [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ];
+  string contract_addr = 3
+  [ (gogoproto.moretags) = "yaml:\"contract_addr\"" ];
 }
 
 // MsgSetBeforeSendHookResponse defines the response structure for an executed
diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go
index fd9ca9236..56b6994de 100644
--- a/wasmbinding/bindings/msg.go
+++ b/wasmbinding/bindings/msg.go
@@ -185,7 +185,7 @@ type BurnTokens struct {
 
 type SetBeforeSendHook struct {
 	Denom        string `json:"denom"`
-	CosmWasmAddr string `json:"cosm_wasm_addr"`
+	ContractAddr string `json:"contract_addr"`
 }
 
 // AddSchedule adds new schedule to the cron module
diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
index 5b78a2a5e..8f1858521 100644
--- a/wasmbinding/message_plugin.go
+++ b/wasmbinding/message_plugin.go
@@ -536,7 +536,7 @@ func PerformMint(f *tokenfactorykeeper.Keeper, b *bankkeeper.BaseKeeper, ctx sdk
 }
 
 func PerformSetBeforeSendHook(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, set *bindings.SetBeforeSendHook) error {
-	sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.CosmWasmAddr)
+	sdkMsg := tokenfactorytypes.NewMsgSetBeforeSendHook(contractAddr.String(), set.Denom, set.ContractAddr)
 	if err := sdkMsg.ValidateBasic(); err != nil {
 		return err
 	}
diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go
index 95739bb46..d0cc9ce09 100644
--- a/wasmbinding/queries.go
+++ b/wasmbinding/queries.go
@@ -97,9 +97,9 @@ func (qp QueryPlugin) GetDenomAdmin(ctx sdk.Context, denom string) (*bindings.De
 
 // GetBeforeSendHook is a query to get denom before send hook.
 func (qp QueryPlugin) GetBeforeSendHook(ctx sdk.Context, denom string) (*bindings.BeforeSendHookResponse, error) {
-	cosmWasmAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom)
+	contractAddr := qp.tokenFactoryKeeper.GetBeforeSendHook(ctx, denom)
 
-	return &bindings.BeforeSendHookResponse{ContractAddr: cosmWasmAddr}, nil
+	return &bindings.BeforeSendHookResponse{ContractAddr: contractAddr}, nil
 }
 
 func (qp *QueryPlugin) GetTotalBurnedNeutronsAmount(ctx sdk.Context, _ *bindings.QueryTotalBurnedNeutronsAmountRequest) (*bindings.QueryTotalBurnedNeutronsAmountResponse, error) {
diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go
index 59a457975..929e72172 100644
--- a/x/tokenfactory/client/cli/query.go
+++ b/x/tokenfactory/client/cli/query.go
@@ -79,8 +79,8 @@ func GetCmdDenomAuthorityMetadata() *cobra.Command {
 			}
 
 			res, err := queryClient.DenomAuthorityMetadata(cmd.Context(), &types.QueryDenomAuthorityMetadataRequest{
-				Creator:  args[1],
-				Subdenom: args[2],
+				Creator:  denom[1],
+				Subdenom: denom[2],
 			})
 			if err != nil {
 				return err
diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go
index ec42a0463..16d15224e 100644
--- a/x/tokenfactory/client/cli/tx.go
+++ b/x/tokenfactory/client/cli/tx.go
@@ -204,7 +204,7 @@ func NewChangeAdminCmd() *cobra.Command {
 // NewSetBeforeSendHook broadcast MsgSetBeforeSendHook
 func NewSetBeforeSendHook() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "set-before-send-hook [denom] [cosm-wasm-addr] [flags]",
+		Use:   "set-before-send-hook [denom] [contract-addr] [flags]",
 		Short: "Sets the before send hook for a factory-created denom. Must have admin authority to do so.",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go
index 744662656..243ece8c3 100644
--- a/x/tokenfactory/keeper/admins.go
+++ b/x/tokenfactory/keeper/admins.go
@@ -37,7 +37,7 @@ func (k Keeper) setAuthorityMetadata(ctx sdk.Context, denom string, metadata typ
 	return nil
 }
 
-func (k Keeper) setAdmin(ctx sdk.Context, denom string, admin string) error {
+func (k Keeper) setAdmin(ctx sdk.Context, denom, admin string) error {
 	metadata, err := k.GetAuthorityMetadata(ctx, denom)
 	if err != nil {
 		return err
diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go
index 6cf9309d9..4685334be 100644
--- a/x/tokenfactory/keeper/bankactions.go
+++ b/x/tokenfactory/keeper/bankactions.go
@@ -51,7 +51,7 @@ func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string) erro
 	return k.bankKeeper.BurnCoins(ctx, types.ModuleName, sdk.NewCoins(amount))
 }
 
-func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr string, toAddr string) error {
+func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr, toAddr string) error {
 	// verify that denom is an x/tokenfactory denom
 	_, _, err := types.DeconstructDenom(amount.Denom)
 	if err != nil {
diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go
index c8654130a..d746ba3b2 100644
--- a/x/tokenfactory/keeper/before_send.go
+++ b/x/tokenfactory/keeper/before_send.go
@@ -11,7 +11,7 @@ import (
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 )
 
-func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom string, cosmwasmAddress string) error {
+func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom, contractAddr string) error {
 	// verify that denom is an x/tokenfactory denom
 	_, _, err := types.DeconstructDenom(denom)
 	if err != nil {
@@ -21,17 +21,17 @@ func (k Keeper) setBeforeSendHook(ctx sdk.Context, denom string, cosmwasmAddress
 	store := k.GetDenomPrefixStore(ctx, denom)
 
 	// delete the store for denom prefix store when cosmwasm address is nil
-	if cosmwasmAddress == "" {
+	if contractAddr == "" {
 		store.Delete([]byte(types.BeforeSendHookAddressPrefixKey))
 		return nil
 	}
 
-	_, err = sdk.AccAddressFromBech32(cosmwasmAddress)
+	_, err = sdk.AccAddressFromBech32(contractAddr)
 	if err != nil {
 		return err
 	}
 
-	store.Set([]byte(types.BeforeSendHookAddressPrefixKey), []byte(cosmwasmAddress))
+	store.Set([]byte(types.BeforeSendHookAddressPrefixKey), []byte(contractAddr))
 
 	return nil
 }
@@ -96,9 +96,9 @@ func (k Keeper) callBeforeSendListener(ctx sdk.Context, from, to sdk.AccAddress,
 	}()
 
 	for _, coin := range amount {
-		cosmwasmAddress := k.GetBeforeSendHook(ctx, coin.Denom)
-		if cosmwasmAddress != "" {
-			cwAddr, err := sdk.AccAddressFromBech32(cosmwasmAddress)
+		contractAddr := k.GetBeforeSendHook(ctx, coin.Denom)
+		if contractAddr != "" {
+			cwAddr, err := sdk.AccAddressFromBech32(contractAddr)
 			if err != nil {
 				return err
 			}
diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go
index a57a44af8..ff84e935c 100644
--- a/x/tokenfactory/keeper/createdenom.go
+++ b/x/tokenfactory/keeper/createdenom.go
@@ -11,7 +11,7 @@ import (
 )
 
 // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount
-func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) {
+func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) {
 	denom, err := k.validateCreateDenom(ctx, creatorAddr, subdenom)
 	if err != nil {
 		return "", err
@@ -28,7 +28,7 @@ func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, subdenom string
 
 // Runs CreateDenom logic after the charge and all denom validation has been handled.
 // Made into a second function for genesis initialization.
-func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string, denom string) (err error) {
+func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr, denom string) (err error) {
 	_, exists := k.bankKeeper.GetDenomMetaData(ctx, denom)
 	if !exists {
 		denomMetaData := banktypes.Metadata{
@@ -54,7 +54,7 @@ func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string,
 	return nil
 }
 
-func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) {
+func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr, subdenom string) (newTokenDenom string, err error) {
 	// Temporary check until IBC bug is sorted out
 	if k.bankKeeper.HasSupply(ctx, subdenom) {
 		return "", fmt.Errorf("temporary error until IBC bug is sorted out, " +
diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go
index 59c62a1e4..ba8fd43cc 100644
--- a/x/tokenfactory/keeper/grpc_query.go
+++ b/x/tokenfactory/keeper/grpc_query.go
@@ -40,7 +40,7 @@ func (k Keeper) BeforeSendHookAddress(ctx context.Context, req *types.QueryBefor
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
 	denom := fmt.Sprintf("factory/%s/%s", req.GetCreator(), req.GetSubdenom())
-	cosmwasmAddress := k.GetBeforeSendHook(sdkCtx, denom)
+	contractAddr := k.GetBeforeSendHook(sdkCtx, denom)
 
-	return &types.QueryBeforeSendHookAddressResponse{CosmwasmAddress: cosmwasmAddress}, nil
+	return &types.QueryBeforeSendHookAddressResponse{ContractAddr: contractAddr}, nil
 }
diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go
index 1bea2bcca..ebb88ea02 100644
--- a/x/tokenfactory/keeper/keeper.go
+++ b/x/tokenfactory/keeper/keeper.go
@@ -81,5 +81,6 @@ func (k *Keeper) SetContractKeeper(contractKeeper types.ContractKeeper) {
 // it purely mints and burns them on behalf of the admin of respective denoms,
 // and sends to the relevant address.
 func (k Keeper) CreateModuleAccount(ctx sdk.Context) {
+	// GetModuleAccount creates new module account if not present under the hood
 	k.accountKeeper.GetModuleAccount(ctx, types.ModuleName)
 }
diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go
index 3df06a489..fb29abf3b 100644
--- a/x/tokenfactory/keeper/msg_server.go
+++ b/x/tokenfactory/keeper/msg_server.go
@@ -218,7 +218,7 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS
 		return nil, types.ErrUnauthorized
 	}
 
-	err = server.Keeper.setBeforeSendHook(ctx, msg.Denom, msg.CosmwasmAddress)
+	err = server.Keeper.setBeforeSendHook(ctx, msg.Denom, msg.ContractAddr)
 	if err != nil {
 		return nil, err
 	}
@@ -227,7 +227,7 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS
 		sdk.NewEvent(
 			types.TypeMsgSetBeforeSendHook,
 			sdk.NewAttribute(types.AttributeDenom, msg.GetDenom()),
-			sdk.NewAttribute(types.AttributeBeforeSendHookAddress, msg.GetCosmwasmAddress()),
+			sdk.NewAttribute(types.AttributeBeforeSendHookAddress, msg.GetContractAddr()),
 		),
 	})
 
@@ -236,9 +236,9 @@ func (server msgServer) SetBeforeSendHook(goCtx context.Context, msg *types.MsgS
 
 // UpdateParams updates the module parameters
 func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) {
-	//if err := req.ValidateBasic(); err != nil {
-	//	return nil, err
-	//}
+	if err := req.ValidateBasic(); err != nil {
+		return nil, err
+	}
 	authority := k.GetAuthority()
 	if authority != req.Authority {
 		return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority)
diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go
index a4ae0b61f..176834acb 100644
--- a/x/tokenfactory/types/codec.go
+++ b/x/tokenfactory/types/codec.go
@@ -14,7 +14,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgCreateDenom{}, "osmosis/tokenfactory/create-denom", nil)
 	cdc.RegisterConcrete(&MsgMint{}, "osmosis/tokenfactory/mint", nil)
 	cdc.RegisterConcrete(&MsgBurn{}, "osmosis/tokenfactory/burn", nil)
-	//cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil)
+	// cdc.RegisterConcrete(&MsgForceTransfer{}, "osmosis/tokenfactory/force-transfer", nil)
 	cdc.RegisterConcrete(&MsgChangeAdmin{}, "osmosis/tokenfactory/change-admin", nil)
 	cdc.RegisterConcrete(&MsgSetBeforeSendHook{}, "osmosis/tokenfactory/set-beforesend-hook", nil)
 	cdc.RegisterConcrete(&MsgUpdateParams{}, "osmosis/tokenfactory/update-params", nil)
diff --git a/x/tokenfactory/types/constants.go b/x/tokenfactory/types/constants.go
index 7cfe7cd30..ba0108ee2 100644
--- a/x/tokenfactory/types/constants.go
+++ b/x/tokenfactory/types/constants.go
@@ -1,5 +1,3 @@
 package types
 
-var (
-	TrackBeforeSendGasLimit = uint64(100_000)
-)
+var TrackBeforeSendGasLimit = uint64(100_000)
diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go
index 4a78e42cb..23ad5fa43 100644
--- a/x/tokenfactory/types/denoms.go
+++ b/x/tokenfactory/types/denoms.go
@@ -40,7 +40,7 @@ func GetTokenDenom(creator, subdenom string) (string, error) {
 // DeconstructDenom takes a token denom string and verifies that it is a valid
 // denom of the tokenfactory module, and is of the form `factory/{creator}/{subdenom}`
 // If valid, it returns the creator address and subdenom
-func DeconstructDenom(denom string) (creator string, subdenom string, err error) {
+func DeconstructDenom(denom string) (creator, subdenom string, err error) {
 	err = sdk.ValidateDenom(denom)
 	if err != nil {
 		return "", "", err
diff --git a/x/tokenfactory/types/expected_keepers.go b/x/tokenfactory/types/expected_keepers.go
index 928915056..9da7b744d 100644
--- a/x/tokenfactory/types/expected_keepers.go
+++ b/x/tokenfactory/types/expected_keepers.go
@@ -18,7 +18,7 @@ type BankKeeper interface {
 	MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
 	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
 
-	SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
+	SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error
 	HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool
 }
 
diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go
index 356d6f801..eafdc8547 100644
--- a/x/tokenfactory/types/msgs.go
+++ b/x/tokenfactory/types/msgs.go
@@ -266,11 +266,11 @@ func (m MsgSetDenomMetadata) GetSigners() []sdk.AccAddress {
 var _ sdk.Msg = &MsgSetBeforeSendHook{}
 
 // NewMsgSetBeforeSendHook creates a message to set a new before send hook
-func NewMsgSetBeforeSendHook(sender string, denom string, cosmwasmAddress string) *MsgSetBeforeSendHook {
+func NewMsgSetBeforeSendHook(sender, denom, contractAddr string) *MsgSetBeforeSendHook {
 	return &MsgSetBeforeSendHook{
-		Sender:          sender,
-		Denom:           denom,
-		CosmwasmAddress: cosmwasmAddress,
+		Sender:       sender,
+		Denom:        denom,
+		ContractAddr: contractAddr,
 	}
 }
 
@@ -282,8 +282,8 @@ func (m MsgSetBeforeSendHook) ValidateBasic() error {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err)
 	}
 
-	if m.CosmwasmAddress != "" {
-		_, err = sdk.AccAddressFromBech32(m.CosmwasmAddress)
+	if m.ContractAddr != "" {
+		_, err = sdk.AccAddressFromBech32(m.ContractAddr)
 		if err != nil {
 			return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid cosmwasm contract address (%s)", err)
 		}
diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go
index 648426319..14743767d 100644
--- a/x/tokenfactory/types/params.go
+++ b/x/tokenfactory/types/params.go
@@ -11,47 +11,58 @@ import (
 var (
 	KeyDenomCreationFee        = []byte("DenomCreationFee")
 	KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume")
-	DefaultNeutronDenom        = "untrn"
-	// chosen as an arbitrary large number, less than the max_gas_wanted_per_tx in config.
-	DefaultCreationGasFee       = 1_000
-	DefaultFeeAmount      int64 = 1_000_000
+	KeyFeeCollectorAddress     = []byte("FeeCollectorAddress")
+	// We don't want to charge users for denom creation
+	DefaultDenomCreationFee        sdk.Coins = nil
+	DefaultDenomCreationGasConsume uint64    = 0
+	DefaultFeeCollectorAddress               = ""
 )
 
-// ParamTable for tokenfactory module.
+// ParamKeyTable the param key table for tokenfactory module.
 func ParamKeyTable() paramtypes.KeyTable {
 	return paramtypes.NewKeyTable().RegisterParamSet(&Params{})
 }
 
-func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Params {
+func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64, feeCollectorAddress string) Params {
 	return Params{
 		DenomCreationFee:        denomCreationFee,
 		DenomCreationGasConsume: denomCreationGasConsume,
+		FeeCollectorAddress:     feeCollectorAddress,
 	}
 }
 
-// default tokenfactory module parameters.
+// DefaultParams returns a default set of parameters
 func DefaultParams() Params {
-	return Params{
-		// We don't want to charge users for denom creation
-		DenomCreationFee:        nil,
-		DenomCreationGasConsume: 0,
-	}
+	return NewParams(DefaultDenomCreationFee, DefaultDenomCreationGasConsume, DefaultFeeCollectorAddress)
 }
 
-// validate params.
+// Validate validates params
 func (p Params) Validate() error {
+	// DenomCreationFee and FeeCollectorAddress must be both set, or both unset
+	hasDenomCreationFee := len(p.DenomCreationFee) > 0
+	hasFeeCollectorAddress := p.FeeCollectorAddress != ""
+
+	if hasDenomCreationFee != hasFeeCollectorAddress {
+		return fmt.Errorf("DenomCreationFee and FeeCollectorAddr must be both set or both unset")
+	}
+
 	if err := validateDenomCreationFee(p.DenomCreationFee); err != nil {
 		return err
 	}
 
+	if err := validateAddress(p.FeeCollectorAddress); err != nil {
+		return err
+	}
+
 	return nil
 }
 
-// Implements params.ParamSet.
+// ParamSetPairs get the params.ParamSet
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
 		paramtypes.NewParamSetPair(KeyDenomCreationFee, &p.DenomCreationFee, validateDenomCreationFee),
 		paramtypes.NewParamSetPair(KeyDenomCreationGasConsume, &p.DenomCreationGasConsume, validateDenomCreationGasConsume),
+		paramtypes.NewParamSetPair(KeyFeeCollectorAddress, &p.FeeCollectorAddress, validateAddress),
 	}
 }
 
@@ -76,3 +87,21 @@ func validateDenomCreationGasConsume(i interface{}) error {
 
 	return nil
 }
+
+func validateAddress(i interface{}) error {
+	v, ok := i.(string)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	if len(v) == 0 {
+		return nil
+	}
+
+	_, err := sdk.AccAddressFromBech32(v)
+	if err != nil {
+		return fmt.Errorf("invalid address: %w", err)
+	}
+
+	return nil
+}
diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go
index 1d06ab5fd..4b58f82a1 100644
--- a/x/tokenfactory/types/query.pb.go
+++ b/x/tokenfactory/types/query.pb.go
@@ -359,7 +359,7 @@ func (m *QueryBeforeSendHookAddressRequest) GetSubdenom() string {
 // QueryBeforeSendHookAddressResponse defines the response structure for the
 // DenomBeforeSendHook gRPC query.
 type QueryBeforeSendHookAddressResponse struct {
-	CosmwasmAddress string `protobuf:"bytes,1,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"`
+	ContractAddr string `protobuf:"bytes,1,opt,name=contract_addr,json=contractAddr,proto3" json:"contract_addr,omitempty" yaml:"contract_addr"`
 }
 
 func (m *QueryBeforeSendHookAddressResponse) Reset()         { *m = QueryBeforeSendHookAddressResponse{} }
@@ -395,9 +395,9 @@ func (m *QueryBeforeSendHookAddressResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryBeforeSendHookAddressResponse proto.InternalMessageInfo
 
-func (m *QueryBeforeSendHookAddressResponse) GetCosmwasmAddress() string {
+func (m *QueryBeforeSendHookAddressResponse) GetContractAddr() string {
 	if m != nil {
-		return m.CosmwasmAddress
+		return m.ContractAddr
 	}
 	return ""
 }
@@ -418,49 +418,49 @@ func init() {
 }
 
 var fileDescriptor_6f22013ad0f72e3f = []byte{
-	// 671 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0x4f, 0x4f, 0x53, 0x4d,
-	0x14, 0xc6, 0x3b, 0xbc, 0xaf, 0x55, 0xc6, 0x28, 0x32, 0xa0, 0x62, 0xc5, 0x5b, 0x19, 0x89, 0x81,
-	0x04, 0x3b, 0xf2, 0x67, 0x25, 0x1a, 0xe1, 0x62, 0x88, 0x89, 0x21, 0xd1, 0x2b, 0x31, 0x91, 0x98,
-	0x34, 0xd3, 0x76, 0x28, 0x0d, 0xdc, 0x7b, 0xca, 0xcc, 0x54, 0x6d, 0x08, 0x1b, 0x4c, 0x5c, 0x9b,
-	0xb8, 0xf4, 0x3b, 0xf8, 0x39, 0x58, 0x92, 0xb0, 0x71, 0xd5, 0x18, 0xf0, 0x13, 0x74, 0xe1, 0xc6,
-	0x8d, 0xe9, 0xcc, 0x14, 0x84, 0x96, 0x9b, 0x0a, 0x89, 0xbb, 0x9b, 0x99, 0x73, 0x9e, 0xf3, 0xfc,
-	0xe6, 0x9c, 0x93, 0x8b, 0x47, 0x40, 0x85, 0xa0, 0x4a, 0x8a, 0x69, 0x58, 0x15, 0xd1, 0x32, 0xcf,
-	0x6b, 0x90, 0x55, 0xf6, 0x76, 0x3c, 0x27, 0x34, 0x1f, 0x67, 0xeb, 0x15, 0x21, 0xab, 0x99, 0xb2,
-	0x04, 0x0d, 0x64, 0xd0, 0x45, 0x66, 0xfe, 0x8c, 0xcc, 0xb8, 0xc8, 0x54, 0x7f, 0x11, 0x8a, 0x60,
-	0x02, 0x59, 0xe3, 0xcb, 0xe6, 0xa4, 0x06, 0x8b, 0x00, 0xc5, 0x35, 0xc1, 0x78, 0xb9, 0xc4, 0x78,
-	0x14, 0x81, 0xe6, 0xba, 0x04, 0x91, 0x72, 0xb7, 0x53, 0xb1, 0xb5, 0x79, 0x45, 0xaf, 0x80, 0x2c,
-	0xe9, 0xea, 0x82, 0xd0, 0xbc, 0xc0, 0x35, 0x77, 0x59, 0xa3, 0xb1, 0x59, 0x65, 0x2e, 0x79, 0xe8,
-	0x0a, 0xd0, 0x7e, 0x4c, 0x5e, 0x34, 0x08, 0x9e, 0x9b, 0xc3, 0x40, 0xac, 0x57, 0x84, 0xd2, 0xf4,
-	0x35, 0xee, 0x3b, 0x72, 0xaa, 0xca, 0x10, 0x29, 0x41, 0x7c, 0x9c, 0xb4, 0xc9, 0x03, 0xe8, 0x36,
-	0x1a, 0xb9, 0x38, 0x31, 0x9c, 0x89, 0x03, 0xce, 0xd8, 0x6c, 0xff, 0xff, 0xed, 0x5a, 0x3a, 0x11,
-	0xb8, 0x4c, 0xfa, 0x01, 0x61, 0x6a, 0xb4, 0x9f, 0x88, 0x08, 0xc2, 0xd9, 0xe3, 0x04, 0xce, 0x01,
-	0x19, 0xc3, 0xe7, 0xf3, 0x52, 0x70, 0x0d, 0xd2, 0xd4, 0xea, 0xf6, 0x49, 0xbd, 0x96, 0xbe, 0x5c,
-	0xe5, 0xe1, 0xda, 0x03, 0xea, 0x2e, 0x68, 0xd0, 0x0c, 0x21, 0x0c, 0x5f, 0x50, 0x95, 0x5c, 0xa1,
-	0xa1, 0x38, 0xd0, 0x65, 0xc2, 0xfb, 0xea, 0xb5, 0x74, 0x8f, 0x0d, 0x6f, 0xde, 0xd0, 0xe0, 0x20,
-	0x88, 0x7e, 0x45, 0xf8, 0x4e, 0xac, 0x0b, 0x47, 0xfc, 0x11, 0x61, 0x72, 0xf0, 0xca, 0xd9, 0xd0,
-	0x5d, 0x3b, 0xfc, 0xa9, 0x78, 0xfc, 0xf6, 0xd2, 0xfe, 0x50, 0xe3, 0x39, 0xea, 0xb5, 0xf4, 0x0d,
-	0xeb, 0xae, 0x55, 0x9d, 0x06, 0xbd, 0x2d, 0x8d, 0xa5, 0x0b, 0xf8, 0xd6, 0xa1, 0x5f, 0x35, 0x2f,
-	0x21, 0x9c, 0xb3, 0xec, 0xa7, 0x7a, 0x30, 0xfa, 0x0c, 0x7b, 0x27, 0xc9, 0x39, 0xf2, 0x51, 0x9c,
-	0x34, 0x4f, 0xd5, 0xe8, 0xf5, 0x7f, 0x23, 0xdd, 0x7e, 0x6f, 0xbd, 0x96, 0xbe, 0x64, 0xe5, 0xec,
-	0x39, 0x0d, 0x5c, 0x00, 0xdd, 0x42, 0x78, 0xc8, 0xa8, 0xf9, 0x62, 0x19, 0xa4, 0x78, 0x29, 0xa2,
-	0xc2, 0x53, 0x80, 0xd5, 0xd9, 0x42, 0x41, 0x0a, 0xa5, 0xfe, 0x51, 0x47, 0xd7, 0xdc, 0x58, 0x9d,
-	0xe0, 0xc1, 0x51, 0xcd, 0xe3, 0x2b, 0x79, 0x50, 0xe1, 0x3b, 0xae, 0xc2, 0x2c, 0xb7, 0x77, 0xce,
-	0xcd, 0xcd, 0x7a, 0x2d, 0x7d, 0xdd, 0xb9, 0x39, 0x16, 0x41, 0x83, 0x9e, 0xe6, 0x91, 0xd3, 0x9b,
-	0xa8, 0x27, 0xf1, 0x39, 0x53, 0x8e, 0x7c, 0x41, 0x38, 0x69, 0x07, 0x9d, 0xdc, 0x8f, 0x9f, 0x87,
-	0xd6, 0x3d, 0x4b, 0x8d, 0xff, 0x45, 0x86, 0x25, 0xa0, 0x63, 0x5b, 0xbb, 0x3f, 0x3e, 0x77, 0xdd,
-	0x25, 0xc3, 0xac, 0x83, 0x25, 0x27, 0xbf, 0x10, 0xbe, 0xd6, 0x7e, 0x0e, 0xc9, 0x4c, 0x07, 0xb5,
-	0x63, 0x77, 0x34, 0x35, 0x7b, 0x06, 0x05, 0x47, 0xf3, 0xc6, 0xd0, 0xbc, 0x22, 0x8b, 0xf1, 0x34,
-	0x76, 0xd0, 0x58, 0xf3, 0x78, 0xc3, 0x4d, 0xc9, 0x26, 0xdb, 0x68, 0xf6, 0x7f, 0x93, 0xb5, 0x2e,
-	0x12, 0xd9, 0x45, 0xb8, 0xb7, 0x65, 0xc2, 0xc9, 0x74, 0xa7, 0xb6, 0xdb, 0xac, 0x59, 0xea, 0xe1,
-	0xe9, 0x92, 0x1d, 0xee, 0x9c, 0xc1, 0x7d, 0x44, 0xa6, 0x3b, 0xc1, 0xcd, 0x2e, 0x4b, 0x08, 0xb3,
-	0x0e, 0xf5, 0x90, 0x99, 0xfc, 0x44, 0xf8, 0x6a, 0xdb, 0x29, 0x27, 0x8f, 0x3b, 0x30, 0x17, 0xb7,
-	0xa3, 0xa9, 0x99, 0xd3, 0x0b, 0x38, 0xc2, 0x25, 0x43, 0xb8, 0x48, 0x82, 0xb3, 0x37, 0x34, 0x67,
-	0x0a, 0x65, 0x95, 0x88, 0x0a, 0xd9, 0x15, 0x80, 0x55, 0x7f, 0x61, 0x7b, 0xcf, 0x43, 0x3b, 0x7b,
-	0x1e, 0xfa, 0xbe, 0xe7, 0xa1, 0x4f, 0xfb, 0x5e, 0x62, 0x67, 0xdf, 0x4b, 0x7c, 0xdb, 0xf7, 0x12,
-	0x4b, 0x93, 0xc5, 0x92, 0x5e, 0xa9, 0xe4, 0x32, 0x79, 0x08, 0x59, 0x24, 0x2a, 0x5a, 0x42, 0x74,
-	0x0f, 0x64, 0xb1, 0xf9, 0xcd, 0xde, 0x1f, 0x75, 0xa1, 0xab, 0x65, 0xa1, 0x72, 0x49, 0xf3, 0x07,
-	0x9c, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x90, 0xae, 0xbc, 0xc7, 0xe0, 0x07, 0x00, 0x00,
+	// 670 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x6b, 0x13, 0x41,
+	0x14, 0xc7, 0x33, 0x55, 0xa3, 0x1d, 0xad, 0xd2, 0x69, 0x95, 0x1a, 0xea, 0xc6, 0x8e, 0x45, 0x5a,
+	0xa8, 0x19, 0xfb, 0xe3, 0x64, 0x2d, 0xb6, 0x5b, 0x11, 0x41, 0x0a, 0xba, 0x16, 0xc1, 0x22, 0x84,
+	0x49, 0x76, 0x9a, 0x86, 0x76, 0xf7, 0xa5, 0x33, 0x13, 0x31, 0x94, 0x5e, 0x2a, 0x78, 0x16, 0x3c,
+	0xfa, 0x3f, 0xf8, 0x77, 0xf4, 0x58, 0xe8, 0xc5, 0x53, 0x90, 0xd6, 0xbf, 0x20, 0x07, 0x2f, 0x5e,
+	0x24, 0xb3, 0xb3, 0xfd, 0x61, 0xd2, 0x25, 0xa6, 0xe0, 0x6d, 0x33, 0xf3, 0xde, 0xf7, 0x7d, 0x3f,
+	0xf3, 0xde, 0x23, 0x78, 0x0c, 0x54, 0x00, 0xaa, 0xac, 0x98, 0x86, 0x75, 0x11, 0xae, 0xf2, 0xa2,
+	0x06, 0x59, 0x63, 0xef, 0x27, 0x0b, 0x42, 0xf3, 0x49, 0xb6, 0x59, 0x15, 0xb2, 0x96, 0xab, 0x48,
+	0xd0, 0x40, 0x86, 0x6d, 0x64, 0xee, 0x64, 0x64, 0xce, 0x46, 0x66, 0x06, 0x4b, 0x50, 0x02, 0x13,
+	0xc8, 0x9a, 0x5f, 0x51, 0x4e, 0x66, 0xb8, 0x04, 0x50, 0xda, 0x10, 0x8c, 0x57, 0xca, 0x8c, 0x87,
+	0x21, 0x68, 0xae, 0xcb, 0x10, 0x2a, 0x7b, 0x3b, 0x93, 0x58, 0x9b, 0x57, 0xf5, 0x1a, 0xc8, 0xb2,
+	0xae, 0x2d, 0x09, 0xcd, 0x7d, 0xae, 0xb9, 0xcd, 0x1a, 0x4f, 0xcc, 0xaa, 0x70, 0xc9, 0x03, 0x5b,
+	0x80, 0x0e, 0x62, 0xf2, 0xaa, 0x49, 0xf0, 0xd2, 0x1c, 0x7a, 0x62, 0xb3, 0x2a, 0x94, 0xa6, 0x6f,
+	0xf1, 0xc0, 0xa9, 0x53, 0x55, 0x81, 0x50, 0x09, 0xe2, 0xe2, 0x74, 0x94, 0x3c, 0x84, 0xee, 0xa2,
+	0xb1, 0xab, 0x53, 0xa3, 0xb9, 0x24, 0xe0, 0x5c, 0x94, 0xed, 0x5e, 0xdc, 0xad, 0x67, 0x53, 0x9e,
+	0xcd, 0xa4, 0x1f, 0x11, 0xa6, 0x46, 0xfb, 0xa9, 0x08, 0x21, 0x58, 0xf8, 0x9b, 0xc0, 0x3a, 0x20,
+	0x13, 0xf8, 0x72, 0x51, 0x0a, 0xae, 0x41, 0x9a, 0x5a, 0xbd, 0x2e, 0x69, 0xd4, 0xb3, 0xd7, 0x6b,
+	0x3c, 0xd8, 0x78, 0x44, 0xed, 0x05, 0xf5, 0xe2, 0x10, 0xc2, 0xf0, 0x15, 0x55, 0x2d, 0xf8, 0x4d,
+	0xc5, 0xa1, 0x1e, 0x13, 0x3e, 0xd0, 0xa8, 0x67, 0x6f, 0x44, 0xe1, 0xf1, 0x0d, 0xf5, 0x8e, 0x82,
+	0xe8, 0x37, 0x84, 0xef, 0x25, 0xba, 0xb0, 0xc4, 0x9f, 0x10, 0x26, 0x47, 0xaf, 0x9c, 0x0f, 0xec,
+	0xb5, 0xc5, 0x9f, 0x49, 0xc6, 0x6f, 0x2f, 0xed, 0x8e, 0x34, 0x9f, 0xa3, 0x51, 0xcf, 0xde, 0x8e,
+	0xdc, 0xb5, 0xaa, 0x53, 0xaf, 0xbf, 0xa5, 0xb1, 0x74, 0x09, 0xdf, 0x39, 0xf6, 0xab, 0x9e, 0x49,
+	0x08, 0x16, 0x23, 0xf6, 0xae, 0x1e, 0x8c, 0xbe, 0xc0, 0xce, 0x59, 0x72, 0x96, 0x7c, 0x1c, 0xa7,
+	0xcd, 0x53, 0x35, 0x7b, 0x7d, 0x61, 0xac, 0xd7, 0xed, 0x6f, 0xd4, 0xb3, 0x7d, 0x91, 0x5c, 0x74,
+	0x4e, 0x3d, 0x1b, 0x40, 0x77, 0x10, 0x1e, 0x31, 0x6a, 0xae, 0x58, 0x05, 0x29, 0x5e, 0x8b, 0xd0,
+	0x7f, 0x0e, 0xb0, 0xbe, 0xe0, 0xfb, 0x52, 0x28, 0xf5, 0x9f, 0x3a, 0x5a, 0xb4, 0x63, 0x75, 0x86,
+	0x07, 0x4b, 0x35, 0x87, 0xfb, 0x8a, 0x10, 0x6a, 0xc9, 0x8b, 0x3a, 0xcf, 0x7d, 0x3f, 0xb6, 0x32,
+	0xd4, 0xa8, 0x67, 0x07, 0xad, 0x95, 0x93, 0xd7, 0xd4, 0xbb, 0x16, 0xff, 0x6e, 0x2a, 0x4d, 0x35,
+	0xd2, 0xf8, 0x92, 0xa9, 0x42, 0xbe, 0x22, 0x9c, 0x8e, 0xe6, 0x9b, 0x3c, 0x4c, 0x1e, 0x83, 0xd6,
+	0xf5, 0xca, 0x4c, 0xfe, 0x43, 0x46, 0x64, 0x9c, 0x4e, 0xec, 0xec, 0xff, 0xfc, 0xd2, 0x73, 0x9f,
+	0x8c, 0xb2, 0x0e, 0x76, 0x9b, 0xfc, 0x46, 0xf8, 0x56, 0xfb, 0xf1, 0x23, 0xf3, 0x1d, 0xd4, 0x4e,
+	0x5c, 0xcd, 0xcc, 0xc2, 0x39, 0x14, 0x2c, 0xcd, 0x3b, 0x43, 0xf3, 0x86, 0x2c, 0x27, 0xd3, 0x44,
+	0xf3, 0xc5, 0xe2, 0xe3, 0x2d, 0x3b, 0x1c, 0xdb, 0x6c, 0x2b, 0x6e, 0xfb, 0x36, 0x6b, 0xdd, 0x1f,
+	0xb2, 0x8f, 0x70, 0x7f, 0xcb, 0x60, 0x93, 0xd9, 0x4e, 0x6d, 0xb7, 0xd9, 0xae, 0xcc, 0xe3, 0xee,
+	0x92, 0x2d, 0xee, 0xa2, 0xc1, 0x9d, 0x23, 0xb3, 0x9d, 0xe0, 0xe6, 0x57, 0x25, 0x04, 0x79, 0x8b,
+	0x7a, 0xcc, 0x4c, 0x7e, 0x21, 0x7c, 0xb3, 0xed, 0x70, 0x93, 0x27, 0x1d, 0x98, 0x4b, 0x5a, 0xcd,
+	0xcc, 0x7c, 0xf7, 0x02, 0x96, 0x70, 0xc5, 0x10, 0x2e, 0x13, 0xef, 0xfc, 0x0d, 0x2d, 0x98, 0x42,
+	0x79, 0x25, 0x42, 0x3f, 0xbf, 0x06, 0xb0, 0xee, 0x2e, 0xed, 0x1e, 0x38, 0x68, 0xef, 0xc0, 0x41,
+	0x3f, 0x0e, 0x1c, 0xf4, 0xf9, 0xd0, 0x49, 0xed, 0x1d, 0x3a, 0xa9, 0xef, 0x87, 0x4e, 0x6a, 0x65,
+	0xba, 0x54, 0xd6, 0x6b, 0xd5, 0x42, 0xae, 0x08, 0x01, 0x0b, 0x45, 0x55, 0x4b, 0x08, 0x1f, 0x80,
+	0x2c, 0xc5, 0xdf, 0xec, 0xc3, 0x69, 0x17, 0xba, 0x56, 0x11, 0xaa, 0x90, 0x36, 0x7f, 0x7c, 0xd3,
+	0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x15, 0xaa, 0xec, 0xd7, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -912,10 +912,10 @@ func (m *QueryBeforeSendHookAddressResponse) MarshalToSizedBuffer(dAtA []byte) (
 	_ = i
 	var l int
 	_ = l
-	if len(m.CosmwasmAddress) > 0 {
-		i -= len(m.CosmwasmAddress)
-		copy(dAtA[i:], m.CosmwasmAddress)
-		i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmwasmAddress)))
+	if len(m.ContractAddr) > 0 {
+		i -= len(m.ContractAddr)
+		copy(dAtA[i:], m.ContractAddr)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.ContractAddr)))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -1032,7 +1032,7 @@ func (m *QueryBeforeSendHookAddressResponse) Size() (n int) {
 	}
 	var l int
 	_ = l
-	l = len(m.CosmwasmAddress)
+	l = len(m.ContractAddr)
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
@@ -1684,7 +1684,7 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ContractAddr", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1712,7 +1712,7 @@ func (m *QueryBeforeSendHookAddressResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.CosmwasmAddress = string(dAtA[iNdEx:postIndex])
+			m.ContractAddr = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go
index 2a887b635..61a23a8a0 100644
--- a/x/tokenfactory/types/tx.pb.go
+++ b/x/tokenfactory/types/tx.pb.go
@@ -440,9 +440,9 @@ var xxx_messageInfo_MsgChangeAdminResponse proto.InternalMessageInfo
 // MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to
 // assign a CosmWasm contract to call with a BeforeSend hook
 type MsgSetBeforeSendHook struct {
-	Sender          string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
-	Denom           string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"`
-	CosmwasmAddress string `protobuf:"bytes,3,opt,name=cosmwasm_address,json=cosmwasmAddress,proto3" json:"cosmwasm_address,omitempty" yaml:"cosmwasm_address"`
+	Sender       string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
+	Denom        string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty" yaml:"denom"`
+	ContractAddr string `protobuf:"bytes,3,opt,name=contract_addr,json=contractAddr,proto3" json:"contract_addr,omitempty" yaml:"contract_addr"`
 }
 
 func (m *MsgSetBeforeSendHook) Reset()         { *m = MsgSetBeforeSendHook{} }
@@ -492,9 +492,9 @@ func (m *MsgSetBeforeSendHook) GetDenom() string {
 	return ""
 }
 
-func (m *MsgSetBeforeSendHook) GetCosmwasmAddress() string {
+func (m *MsgSetBeforeSendHook) GetContractAddr() string {
 	if m != nil {
-		return m.CosmwasmAddress
+		return m.ContractAddr
 	}
 	return ""
 }
@@ -856,72 +856,73 @@ func init() {
 }
 
 var fileDescriptor_283b6c9a90a846b4 = []byte{
-	// 1040 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46,
-	0x14, 0x36, 0x93, 0xd4, 0xb1, 0x2f, 0x71, 0x6d, 0xd3, 0x6e, 0x2c, 0x33, 0x0e, 0x99, 0xb2, 0x4d,
-	0xe0, 0x18, 0x95, 0x08, 0x3b, 0x69, 0x80, 0x6a, 0x6a, 0x94, 0xc2, 0xcd, 0x50, 0x01, 0x05, 0xed,
-	0x2e, 0x45, 0x00, 0xe1, 0x24, 0x9d, 0x28, 0x42, 0xe5, 0x9d, 0x72, 0x77, 0x8a, 0xe2, 0xad, 0x68,
-	0xb7, 0x4e, 0x1d, 0xb2, 0x77, 0xed, 0xe8, 0xa1, 0x73, 0x67, 0x8f, 0x41, 0xbb, 0x74, 0x22, 0x0c,
-	0x1b, 0xa8, 0x77, 0xfd, 0x05, 0xc5, 0xfd, 0x20, 0x25, 0x51, 0x82, 0x7e, 0x0c, 0x45, 0x16, 0x89,
-	0xbc, 0xf7, 0x7d, 0xef, 0xde, 0xf7, 0xee, 0xdd, 0x7b, 0x04, 0x0f, 0x08, 0x8b, 0x08, 0x0b, 0x99,
-	0xc7, 0x49, 0x0b, 0xe1, 0x06, 0xac, 0x71, 0x42, 0x4f, 0xbc, 0xd7, 0xfb, 0x55, 0xc4, 0xe1, 0xbe,
-	0xc7, 0xdf, 0x14, 0xda, 0x94, 0x70, 0x62, 0xee, 0x68, 0x58, 0x61, 0x10, 0x56, 0xd0, 0x30, 0xeb,
-	0xd1, 0x44, 0x27, 0x6d, 0x48, 0x61, 0xc4, 0x94, 0x23, 0x6b, 0x33, 0x20, 0x01, 0x91, 0x8f, 0x9e,
-	0x78, 0xd2, 0xab, 0x76, 0x4d, 0x7a, 0xf0, 0xaa, 0x90, 0xa1, 0x94, 0x57, 0x23, 0x21, 0xd6, 0xf6,
-	0x2d, 0x6d, 0x8f, 0x58, 0xe0, 0xbd, 0xde, 0x17, 0x7f, 0xda, 0xb0, 0xad, 0x0c, 0x15, 0xe5, 0x51,
-	0xbd, 0x68, 0xd3, 0x3a, 0x8c, 0x42, 0x4c, 0x3c, 0xf9, 0x3b, 0xb2, 0x0d, 0x6e, 0xa5, 0xdb, 0x88,
-	0x17, 0x65, 0x77, 0xdf, 0x1a, 0xe0, 0xc3, 0x32, 0x0b, 0x9e, 0x53, 0x04, 0x39, 0xfa, 0x0a, 0x61,
-	0x12, 0x99, 0x8f, 0xc0, 0x22, 0x43, 0xb8, 0x8e, 0x68, 0xce, 0xb8, 0x6f, 0xec, 0x2e, 0x97, 0xd6,
-	0x7b, 0xb1, 0xb3, 0x72, 0x02, 0xa3, 0x1f, 0x8a, 0xae, 0x5a, 0x77, 0x7d, 0x0d, 0x30, 0x3d, 0xb0,
-	0xc4, 0x3a, 0xd5, 0xba, 0xa0, 0xe5, 0xae, 0x49, 0xf0, 0x46, 0x2f, 0x76, 0x56, 0x35, 0x58, 0x5b,
-	0x5c, 0x3f, 0x05, 0x15, 0x1f, 0xfe, 0x72, 0x75, 0xba, 0xf7, 0xf1, 0xd8, 0xdc, 0xd5, 0x64, 0x08,
-	0x79, 0x45, 0x79, 0x09, 0xee, 0x0c, 0x47, 0xe5, 0x23, 0xd6, 0x26, 0x98, 0x21, 0xb3, 0x04, 0x56,
-	0x31, 0xea, 0x56, 0x24, 0xb5, 0xa2, 0x76, 0x56, 0x61, 0x5a, 0xbd, 0xd8, 0xb9, 0xa3, 0x76, 0xce,
-	0x00, 0x5c, 0x7f, 0x05, 0xa3, 0xee, 0xb1, 0x58, 0x90, 0xbe, 0xdc, 0x73, 0x03, 0xdc, 0x2c, 0xb3,
-	0xa0, 0x1c, 0x62, 0x3e, 0x8f, 0xda, 0x17, 0x60, 0x11, 0x46, 0xa4, 0x83, 0xb9, 0xd4, 0x7a, 0xeb,
-	0x60, 0xbb, 0xa0, 0xb3, 0x2f, 0xce, 0x30, 0xa9, 0x8c, 0xc2, 0x73, 0x12, 0xe2, 0xd2, 0x47, 0x67,
-	0xb1, 0xb3, 0xd0, 0xf7, 0xa4, 0x68, 0xae, 0xaf, 0xf9, 0xe6, 0x97, 0x60, 0x25, 0x0a, 0x31, 0x3f,
-	0x26, 0xcf, 0xea, 0x75, 0x8a, 0x18, 0xcb, 0x5d, 0xcf, 0x4a, 0x10, 0xe6, 0x0a, 0x27, 0x15, 0xa8,
-	0x00, 0xae, 0x3f, 0x4c, 0x28, 0xda, 0x22, 0x91, 0xdb, 0x63, 0x13, 0x29, 0x80, 0xee, 0x3a, 0x58,
-	0xd5, 0x0a, 0x93, 0xcc, 0xb9, 0xff, 0x2a, 0xd5, 0xa5, 0x0e, 0xc5, 0xef, 0x47, 0xf5, 0x21, 0x58,
-	0xad, 0x76, 0x28, 0x3e, 0xa4, 0x24, 0x1a, 0xd6, 0xbd, 0xd3, 0x8b, 0x9d, 0x9c, 0xe2, 0x08, 0x40,
-	0xa5, 0x41, 0x49, 0xd4, 0x57, 0x9e, 0x25, 0x4d, 0xd2, 0x2e, 0xa0, 0x5a, 0xbb, 0xd0, 0x99, 0x6a,
-	0xff, 0x53, 0x97, 0x79, 0x13, 0xe2, 0x00, 0x3d, 0xab, 0x47, 0xe1, 0x5c, 0x29, 0x78, 0x08, 0x3e,
-	0x18, 0xac, 0xf1, 0xb5, 0x5e, 0xec, 0xdc, 0x56, 0x48, 0x5d, 0x5f, 0xca, 0x6c, 0xee, 0x83, 0x65,
-	0x51, 0x7a, 0x50, 0xf8, 0xd7, 0xd2, 0x36, 0x7b, 0xb1, 0xb3, 0xd6, 0xaf, 0x4a, 0x69, 0x72, 0xfd,
-	0x25, 0x8c, 0xba, 0x32, 0x8a, 0x89, 0x17, 0x42, 0x06, 0x9b, 0x57, 0x94, 0x9c, 0xba, 0x10, 0xfd,
-	0xf8, 0x53, 0x69, 0xe7, 0x06, 0xd8, 0x2c, 0xb3, 0xe0, 0x08, 0xf1, 0x12, 0x6a, 0x10, 0x8a, 0x8e,
-	0x10, 0xae, 0xbf, 0x20, 0xa4, 0xf5, 0x7f, 0x08, 0x3c, 0x04, 0x6b, 0xe2, 0xf0, 0xbb, 0x90, 0xa5,
-	0xe7, 0xa3, 0x75, 0xde, 0xed, 0xc5, 0xce, 0x96, 0xa2, 0x64, 0x11, 0xae, 0xbf, 0x9a, 0x2c, 0x25,
-	0x27, 0x98, 0x17, 0xaa, 0x77, 0xc7, 0xaa, 0x66, 0x88, 0xe7, 0xab, 0x52, 0x88, 0x88, 0x2d, 0xdf,
-	0x24, 0xa4, 0xe5, 0xda, 0x60, 0x67, 0x9c, 0xc2, 0x34, 0x05, 0x6f, 0x0d, 0xb0, 0xa1, 0x00, 0xf2,
-	0x7e, 0x97, 0x11, 0x87, 0x75, 0xc8, 0xe1, 0x3c, 0x19, 0xf0, 0xc1, 0x52, 0xa4, 0x69, 0xba, 0xce,
-	0xef, 0xf5, 0xeb, 0x1c, 0xb7, 0xd2, 0x3a, 0x4f, 0x7c, 0x97, 0xb6, 0x74, 0xad, 0xeb, 0x66, 0x97,
-	0x90, 0x5d, 0x3f, 0xf5, 0xe3, 0xde, 0x03, 0x77, 0xc7, 0x44, 0x95, 0x46, 0xfd, 0xf7, 0x35, 0xb0,
-	0x56, 0x66, 0xc1, 0x21, 0xa1, 0x35, 0x74, 0x4c, 0x21, 0x66, 0x0d, 0x44, 0xdf, 0xcf, 0xc5, 0xf4,
-	0xc1, 0x06, 0xd7, 0x01, 0x8c, 0x5e, 0xce, 0xfb, 0xbd, 0xd8, 0xd9, 0x51, 0xbc, 0x04, 0x94, 0xb9,
-	0xa0, 0xe3, 0xc8, 0xe6, 0x37, 0x60, 0x3d, 0x59, 0xee, 0xb7, 0xb9, 0x1b, 0xd2, 0xa3, 0xdd, 0x8b,
-	0x1d, 0x2b, 0xe3, 0x71, 0xb0, 0xd5, 0x8d, 0x12, 0x8b, 0xbb, 0xa2, 0x60, 0x3e, 0x19, 0x5b, 0x30,
-	0x0d, 0x91, 0xbf, 0x7c, 0x42, 0x71, 0x2d, 0x90, 0xcb, 0x26, 0x35, 0xcd, 0xf8, 0x99, 0x21, 0x3b,
-	0xc3, 0x77, 0xed, 0x3a, 0xe4, 0xe8, 0x5b, 0x39, 0xa3, 0xcd, 0xa7, 0x60, 0x19, 0x76, 0x78, 0x93,
-	0xd0, 0x90, 0x9f, 0xe8, 0x9c, 0xe7, 0xfe, 0xfa, 0x23, 0xbf, 0xa9, 0x73, 0xa9, 0x03, 0x38, 0xe2,
-	0x34, 0xc4, 0x81, 0xdf, 0x87, 0x9a, 0x5f, 0x83, 0x45, 0x35, 0xe5, 0x75, 0xf6, 0x3f, 0x2d, 0x4c,
-	0xfa, 0x5e, 0x28, 0xa8, 0xdd, 0x4a, 0xcb, 0xe2, 0x20, 0x7e, 0xbf, 0x3a, 0xdd, 0x33, 0x7c, 0x4d,
-	0x2f, 0x3e, 0xf9, 0xe9, 0xea, 0x74, 0xaf, 0xef, 0x58, 0xf6, 0x83, 0x10, 0x73, 0x44, 0x6b, 0x4d,
-	0x18, 0xe2, 0x57, 0x1d, 0x44, 0x43, 0xc4, 0xbc, 0x4c, 0xd8, 0xee, 0x36, 0xd8, 0xca, 0x2c, 0x25,
-	0x2a, 0x0f, 0x7e, 0xbb, 0x09, 0xae, 0x97, 0x59, 0x60, 0xbe, 0x02, 0xb7, 0x06, 0xc7, 0xfa, 0x67,
-	0x93, 0x03, 0x1c, 0x1e, 0xb7, 0xd6, 0x93, 0x79, 0xd0, 0xe9, 0x70, 0x7e, 0x09, 0x6e, 0xc8, 0xa1,
-	0xfa, 0x60, 0x2a, 0x5b, 0xc0, 0xac, 0xfc, 0x4c, 0xb0, 0x41, 0xef, 0x72, 0x78, 0x4d, 0xf7, 0x2e,
-	0x60, 0x33, 0x78, 0x1f, 0x1c, 0x11, 0x32, 0x5d, 0x03, 0xe3, 0x61, 0x86, 0x74, 0xf5, 0xd1, 0xb3,
-	0xa4, 0x6b, 0xb4, 0x75, 0x9b, 0x3f, 0x1a, 0x60, 0x6d, 0xa4, 0x69, 0xed, 0x4f, 0x75, 0x95, 0xa5,
-	0x58, 0x5f, 0xcc, 0x4d, 0x49, 0x43, 0xf8, 0xd9, 0x00, 0xeb, 0xa3, 0xa3, 0xe3, 0x60, 0x16, 0x87,
-	0xc3, 0x1c, 0xab, 0x38, 0x3f, 0x27, 0x8d, 0xa2, 0x0b, 0x56, 0x86, 0xdb, 0x60, 0x61, 0xaa, 0xb3,
-	0x21, 0xbc, 0xf5, 0x74, 0x3e, 0x7c, 0xba, 0x31, 0x07, 0xb7, 0x87, 0xba, 0xc1, 0xf4, 0x9a, 0x19,
-	0x84, 0x5b, 0x9f, 0xcf, 0x05, 0x4f, 0x76, 0x2d, 0x95, 0xcf, 0x2e, 0x6c, 0xe3, 0xdd, 0x85, 0x6d,
-	0x9c, 0x5f, 0xd8, 0xc6, 0xaf, 0x97, 0xf6, 0xc2, 0xbb, 0x4b, 0x7b, 0xe1, 0x9f, 0x4b, 0x7b, 0xe1,
-	0xfb, 0xc7, 0x41, 0xc8, 0x9b, 0x9d, 0x6a, 0xa1, 0x46, 0x22, 0x0f, 0xa3, 0x0e, 0xa7, 0x04, 0xe7,
-	0x09, 0x0d, 0x92, 0x67, 0xef, 0xcd, 0x70, 0xef, 0xe3, 0x27, 0x6d, 0xc4, 0xaa, 0x8b, 0xf2, 0x53,
-	0xfe, 0xf1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0xd8, 0xa2, 0x17, 0xd9, 0x0c, 0x00, 0x00,
+	// 1045 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbd, 0x6f, 0xdb, 0xc6,
+	0x1b, 0x36, 0x93, 0xfc, 0x1c, 0xfb, 0x62, 0xff, 0x6c, 0xd3, 0x6e, 0x2c, 0xb3, 0x0e, 0x99, 0xb2,
+	0x4d, 0xe0, 0x18, 0x95, 0x08, 0x39, 0x69, 0x80, 0x0a, 0x28, 0xd0, 0x28, 0x85, 0x9b, 0xa1, 0x02,
+	0x0a, 0xda, 0x5d, 0x8a, 0x00, 0xc2, 0x49, 0x3a, 0x51, 0x84, 0xca, 0x3b, 0xe5, 0xee, 0x14, 0xc7,
+	0x5b, 0xd1, 0x6e, 0x9d, 0x3a, 0x64, 0xef, 0xda, 0xd1, 0x43, 0xe7, 0xce, 0x1e, 0x83, 0x76, 0x68,
+	0x27, 0x22, 0xb0, 0x81, 0x7a, 0xd7, 0x5f, 0x50, 0xdc, 0x07, 0x29, 0x51, 0x12, 0xf4, 0x31, 0x14,
+	0x59, 0x6c, 0xf2, 0xde, 0xe7, 0x79, 0xee, 0x7d, 0x5e, 0xbe, 0x77, 0xaf, 0xc0, 0x3d, 0xc2, 0x22,
+	0xc2, 0x42, 0xe6, 0x71, 0xd2, 0x46, 0xb8, 0x09, 0xeb, 0x9c, 0xd0, 0x53, 0xef, 0x65, 0xb1, 0x86,
+	0x38, 0x2c, 0x7a, 0xfc, 0x55, 0xa1, 0x43, 0x09, 0x27, 0xe6, 0xae, 0x86, 0x15, 0x06, 0x61, 0x05,
+	0x0d, 0xb3, 0x1e, 0x4c, 0x14, 0xe9, 0x40, 0x0a, 0x23, 0xa6, 0x84, 0xac, 0xad, 0x80, 0x04, 0x44,
+	0x3e, 0x7a, 0xe2, 0x49, 0xaf, 0xda, 0x75, 0xa9, 0xe0, 0xd5, 0x20, 0x43, 0x29, 0xaf, 0x4e, 0x42,
+	0xac, 0xe3, 0xdb, 0x3a, 0x1e, 0xb1, 0xc0, 0x7b, 0x59, 0x14, 0xff, 0x74, 0x60, 0x47, 0x05, 0xaa,
+	0x4a, 0x51, 0xbd, 0xe8, 0xd0, 0x06, 0x8c, 0x42, 0x4c, 0x3c, 0xf9, 0x77, 0x64, 0x1b, 0xdc, 0x4e,
+	0xb7, 0x11, 0x2f, 0x2a, 0xee, 0xbe, 0x36, 0xc0, 0xff, 0x2b, 0x2c, 0x78, 0x4a, 0x11, 0xe4, 0xe8,
+	0x0b, 0x84, 0x49, 0x64, 0x3e, 0x00, 0x8b, 0x0c, 0xe1, 0x06, 0xa2, 0x39, 0xe3, 0xae, 0xb1, 0xb7,
+	0x5c, 0xde, 0xe8, 0xc5, 0xce, 0xea, 0x29, 0x8c, 0xbe, 0x2b, 0xb9, 0x6a, 0xdd, 0xf5, 0x35, 0xc0,
+	0xf4, 0xc0, 0x12, 0xeb, 0xd6, 0x1a, 0x82, 0x96, 0xbb, 0x26, 0xc1, 0x9b, 0xbd, 0xd8, 0x59, 0xd3,
+	0x60, 0x1d, 0x71, 0xfd, 0x14, 0x54, 0xba, 0xff, 0xd3, 0xd5, 0xd9, 0xfe, 0x07, 0x63, 0x6b, 0x57,
+	0x97, 0x29, 0xe4, 0x15, 0xe5, 0x39, 0xb8, 0x9d, 0xcd, 0xca, 0x47, 0xac, 0x43, 0x30, 0x43, 0x66,
+	0x19, 0xac, 0x61, 0x74, 0x52, 0x95, 0xd4, 0xaa, 0xda, 0x59, 0xa5, 0x69, 0xf5, 0x62, 0xe7, 0xb6,
+	0xda, 0x79, 0x08, 0xe0, 0xfa, 0xab, 0x18, 0x9d, 0x1c, 0x8b, 0x05, 0xa9, 0xe5, 0xbe, 0x35, 0xc0,
+	0xcd, 0x0a, 0x0b, 0x2a, 0x21, 0xe6, 0xf3, 0xb8, 0x7d, 0x06, 0x16, 0x61, 0x44, 0xba, 0x98, 0x4b,
+	0xaf, 0xb7, 0x0e, 0x76, 0x0a, 0xba, 0xfa, 0xe2, 0x1b, 0x26, 0x9d, 0x51, 0x78, 0x4a, 0x42, 0x5c,
+	0x7e, 0xef, 0x3c, 0x76, 0x16, 0xfa, 0x4a, 0x8a, 0xe6, 0xfa, 0x9a, 0x6f, 0x7e, 0x0e, 0x56, 0xa3,
+	0x10, 0xf3, 0x63, 0xf2, 0xa4, 0xd1, 0xa0, 0x88, 0xb1, 0xdc, 0xf5, 0x61, 0x0b, 0x22, 0x5c, 0xe5,
+	0xa4, 0x0a, 0x15, 0xc0, 0xf5, 0xb3, 0x84, 0x92, 0x2d, 0x0a, 0xb9, 0x33, 0xb6, 0x90, 0x02, 0xe8,
+	0x6e, 0x80, 0x35, 0xed, 0x30, 0xa9, 0x9c, 0xfb, 0x8f, 0x72, 0x5d, 0xee, 0x52, 0xfc, 0x6e, 0x5c,
+	0x1f, 0x82, 0xb5, 0x5a, 0x97, 0xe2, 0x43, 0x4a, 0xa2, 0xac, 0xef, 0xdd, 0x5e, 0xec, 0xe4, 0x14,
+	0x47, 0x00, 0xaa, 0x4d, 0x4a, 0xa2, 0xbe, 0xf3, 0x61, 0xd2, 0x24, 0xef, 0x02, 0xaa, 0xbd, 0x0b,
+	0x9f, 0xa9, 0xf7, 0xdf, 0x75, 0x9b, 0xb7, 0x20, 0x0e, 0xd0, 0x93, 0x46, 0x14, 0xce, 0x55, 0x82,
+	0xfb, 0xe0, 0x7f, 0x83, 0x3d, 0xbe, 0xde, 0x8b, 0x9d, 0x15, 0x85, 0xd4, 0xfd, 0xa5, 0xc2, 0x66,
+	0x11, 0x2c, 0x8b, 0xd6, 0x83, 0x42, 0x5f, 0x5b, 0xdb, 0xea, 0xc5, 0xce, 0x7a, 0xbf, 0x2b, 0x65,
+	0xc8, 0xf5, 0x97, 0x30, 0x3a, 0x91, 0x59, 0x4c, 0x3c, 0x10, 0x32, 0xd9, 0xbc, 0xa2, 0xe4, 0xd4,
+	0x81, 0xe8, 0xe7, 0x9f, 0x5a, 0xfb, 0xcb, 0x00, 0x5b, 0x15, 0x16, 0x1c, 0x21, 0x5e, 0x46, 0x4d,
+	0x42, 0xd1, 0x11, 0xc2, 0x8d, 0x67, 0x84, 0xb4, 0xff, 0x0b, 0x83, 0x9f, 0x81, 0xd5, 0x3a, 0xc1,
+	0x9c, 0xc2, 0x3a, 0x97, 0xdf, 0x47, 0x9b, 0xcc, 0xf5, 0x62, 0x67, 0x4b, 0xe1, 0x33, 0x61, 0xd7,
+	0x5f, 0x49, 0xde, 0xc5, 0xb7, 0x2b, 0xe5, 0x85, 0xd9, 0xbd, 0xb1, 0x66, 0x19, 0xe2, 0xf9, 0x9a,
+	0xcc, 0x5f, 0xa4, 0x94, 0x6f, 0x11, 0xd2, 0x76, 0x6d, 0xb0, 0x3b, 0xce, 0x58, 0xea, 0xfc, 0xb5,
+	0x01, 0x36, 0x15, 0x40, 0x1e, 0xeb, 0x0a, 0xe2, 0xb0, 0x01, 0x39, 0x9c, 0xc7, 0xb8, 0x0f, 0x96,
+	0x22, 0x4d, 0xd3, 0xed, 0x7d, 0xa7, 0xdf, 0xde, 0xb8, 0x9d, 0xb6, 0x77, 0xa2, 0x5d, 0xde, 0xd6,
+	0x2d, 0xae, 0xef, 0xb8, 0x84, 0xec, 0xfa, 0xa9, 0x8e, 0x7b, 0x07, 0xbc, 0x3f, 0x26, 0xab, 0x34,
+	0xeb, 0x3f, 0xaf, 0x81, 0xf5, 0x0a, 0x0b, 0x0e, 0x09, 0xad, 0xa3, 0x63, 0x0a, 0x31, 0x6b, 0x22,
+	0xfa, 0x6e, 0xce, 0xa3, 0x0f, 0x36, 0xb9, 0x4e, 0x60, 0xf4, 0x4c, 0xde, 0xed, 0xc5, 0xce, 0xae,
+	0xe2, 0x25, 0xa0, 0xa1, 0x73, 0x39, 0x8e, 0x6c, 0x7e, 0x05, 0x36, 0x92, 0xe5, 0xfe, 0xed, 0x76,
+	0x43, 0x2a, 0xda, 0xbd, 0xd8, 0xb1, 0x86, 0x14, 0x07, 0x6f, 0xb8, 0x51, 0x62, 0x69, 0x4f, 0x34,
+	0xcc, 0x87, 0x63, 0x1b, 0xa6, 0x29, 0xea, 0x97, 0x4f, 0x28, 0xae, 0x05, 0x72, 0xc3, 0x45, 0x4d,
+	0x2b, 0x7e, 0x6e, 0xc8, 0x0b, 0xe1, 0x9b, 0x4e, 0x03, 0x72, 0xf4, 0xb5, 0x1c, 0xcd, 0xe6, 0x63,
+	0xb0, 0x0c, 0xbb, 0xbc, 0x45, 0x68, 0xc8, 0x4f, 0x75, 0xcd, 0x73, 0x7f, 0xfc, 0x96, 0xdf, 0xd2,
+	0xb5, 0xd4, 0x09, 0x1c, 0x71, 0x1a, 0xe2, 0xc0, 0xef, 0x43, 0xcd, 0x2f, 0xc1, 0xa2, 0x1a, 0xee,
+	0xba, 0xfa, 0x1f, 0x15, 0x26, 0xfd, 0x4c, 0x28, 0xa8, 0xdd, 0xca, 0xcb, 0xe2, 0x43, 0xfc, 0x7a,
+	0x75, 0xb6, 0x6f, 0xf8, 0x9a, 0x5e, 0x7a, 0xf4, 0xc3, 0xd5, 0xd9, 0x7e, 0x5f, 0x58, 0x5e, 0x03,
+	0x21, 0xe6, 0x88, 0xd6, 0x5b, 0x30, 0xc4, 0x2f, 0xba, 0x88, 0x86, 0x88, 0x79, 0x43, 0x69, 0xbb,
+	0x3b, 0x60, 0x7b, 0x68, 0x29, 0x71, 0x79, 0xf0, 0xcb, 0x4d, 0x70, 0xbd, 0xc2, 0x02, 0xf3, 0x05,
+	0xb8, 0x35, 0x38, 0xcd, 0x3f, 0x9e, 0x9c, 0x60, 0x76, 0xca, 0x5a, 0x8f, 0xe6, 0x41, 0xa7, 0x33,
+	0xf9, 0x39, 0xb8, 0x21, 0x67, 0xe9, 0xbd, 0xa9, 0x6c, 0x01, 0xb3, 0xf2, 0x33, 0xc1, 0x06, 0xd5,
+	0xe5, 0xcc, 0x9a, 0xae, 0x2e, 0x60, 0x33, 0xa8, 0x0f, 0x4e, 0x06, 0x59, 0xae, 0x81, 0xa9, 0x30,
+	0x43, 0xb9, 0xfa, 0xe8, 0x59, 0xca, 0x35, 0x7a, 0x63, 0x9b, 0xdf, 0x1b, 0x60, 0x7d, 0xe4, 0xd2,
+	0x2a, 0x4e, 0x95, 0x1a, 0xa6, 0x58, 0x9f, 0xce, 0x4d, 0x49, 0x53, 0xf8, 0xd1, 0x00, 0x1b, 0xa3,
+	0x13, 0xe3, 0x60, 0x16, 0xc1, 0x2c, 0xc7, 0x2a, 0xcd, 0xcf, 0x49, 0xb3, 0x38, 0x01, 0xab, 0xd9,
+	0x6b, 0xb0, 0x30, 0x55, 0x2c, 0x83, 0xb7, 0x1e, 0xcf, 0x87, 0x4f, 0x37, 0xe6, 0x60, 0x25, 0x73,
+	0x1b, 0x4c, 0xef, 0x99, 0x41, 0xb8, 0xf5, 0xc9, 0x5c, 0xf0, 0x64, 0xd7, 0x72, 0xe5, 0xfc, 0xc2,
+	0x36, 0xde, 0x5c, 0xd8, 0xc6, 0xdb, 0x0b, 0xdb, 0xf8, 0xf9, 0xd2, 0x5e, 0x78, 0x73, 0x69, 0x2f,
+	0xfc, 0x7d, 0x69, 0x2f, 0x7c, 0xfb, 0x30, 0x08, 0x79, 0xab, 0x5b, 0x2b, 0xd4, 0x49, 0xe4, 0x61,
+	0xd4, 0xe5, 0x94, 0xe0, 0x3c, 0xa1, 0x41, 0xf2, 0xec, 0xbd, 0xca, 0xde, 0x7d, 0xfc, 0xb4, 0x83,
+	0x58, 0x6d, 0x51, 0xfe, 0x82, 0x7f, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0x90, 0x4a,
+	0xf5, 0xd0, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1550,10 +1551,10 @@ func (m *MsgSetBeforeSendHook) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.CosmwasmAddress) > 0 {
-		i -= len(m.CosmwasmAddress)
-		copy(dAtA[i:], m.CosmwasmAddress)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.CosmwasmAddress)))
+	if len(m.ContractAddr) > 0 {
+		i -= len(m.ContractAddr)
+		copy(dAtA[i:], m.ContractAddr)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.ContractAddr)))
 		i--
 		dAtA[i] = 0x1a
 	}
@@ -1941,7 +1942,7 @@ func (m *MsgSetBeforeSendHook) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
-	l = len(m.CosmwasmAddress)
+	l = len(m.ContractAddr)
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
@@ -2924,7 +2925,7 @@ func (m *MsgSetBeforeSendHook) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CosmwasmAddress", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ContractAddr", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2952,7 +2953,7 @@ func (m *MsgSetBeforeSendHook) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.CosmwasmAddress = string(dAtA[iNdEx:postIndex])
+			m.ContractAddr = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex