diff --git a/proto/panacea/aol/v2/tx.proto b/proto/panacea/aol/v2/tx.proto
index 5e34cec7..61cf4d19 100644
--- a/proto/panacea/aol/v2/tx.proto
+++ b/proto/panacea/aol/v2/tx.proto
@@ -5,33 +5,33 @@ option java_multiple_files = true;
 option go_package = "github.com/medibloc/panacea-core/x/aol/types";
 
 // Msg defines the Msg service.
-service MsgService {
+service Msg {
   // CreateTopic defines a method for creating a topic.
-  rpc CreateTopic(MsgServiceCreateTopicRequest) returns (MsgServiceCreateTopicResponse);
+  rpc CreateTopic(MsgCreateTopicRequest) returns (MsgCreateTopicResponse);
 
   // AddWriter defines a method for adding a writer to the topic.
-  rpc AddWriter(MsgServiceAddWriterRequest) returns (MsgServiceAddWriterResponse);
+  rpc AddWriter(MsgAddWriterRequest) returns (MsgAddWriterResponse);
 
   // DeleteWriter defines a method for deleting a writer to the topic.
-  rpc DeleteWriter(MsgServiceDeleteWriterRequest) returns (MsgServiceDeleteWriterResponse);
+  rpc DeleteWriter(MsgDeleteWriterRequest) returns (MsgDeleteWriterResponse);
 
   // AddRecord defines a method for adding a record to the topic with the
   // writer.
-  rpc AddRecord(MsgServiceAddRecordRequest) returns (MsgServiceAddRecordResponse);
+  rpc AddRecord(MsgAddRecordRequest) returns (MsgAddRecordResponse);
 }
 
 // MsgCreateTopic defines the Msg/CreateTopic request type.
-message MsgServiceCreateTopicRequest {
+message MsgCreateTopicRequest {
   string topic_name = 1;
   string description = 2;
   string owner_address = 3;
 }
 
 // MsgCreateTopicResponse defines the Msg/CreateTopic response type.
-message MsgServiceCreateTopicResponse {}
+message MsgCreateTopicResponse {}
 
 // MsgAddWriter defines the Msg/AddWriter request type.
-message MsgServiceAddWriterRequest {
+message MsgAddWriterRequest {
   string topic_name = 1;
   string moniker = 2;
   string description = 3;
@@ -40,20 +40,20 @@ message MsgServiceAddWriterRequest {
 }
 
 // MsgAddWriter defines the Msg/AddWriter response type.
-message MsgServiceAddWriterResponse {}
+message MsgAddWriterResponse {}
 
 // MsgDeleteWriter defines the Msg/DeleteWriter request type.
-message MsgServiceDeleteWriterRequest {
+message MsgDeleteWriterRequest {
   string topic_name = 1;
   string writer_address = 2;
   string owner_address = 3;
 }
 
 // MsgDeleteWriter defines the Msg/DeleteWriter response type.
-message MsgServiceDeleteWriterResponse {}
+message MsgDeleteWriterResponse {}
 
 // MsgAddRecord defines the Msg/AddRecord request type.
-message MsgServiceAddRecordRequest {
+message MsgAddRecordRequest {
   string topic_name = 1;
   bytes key = 2;
   bytes value = 3;
@@ -63,7 +63,7 @@ message MsgServiceAddRecordRequest {
 }
 
 // MsgAddRecordResponse defines the Msg/AddRecordResponse response type.
-message MsgServiceAddRecordResponse {
+message MsgAddRecordResponse {
   string owner_address = 1;
   string topic_name = 2;
   uint64 offset = 3;
diff --git a/proto/panacea/did/v2/tx.proto b/proto/panacea/did/v2/tx.proto
index 118955c4..d6b28836 100644
--- a/proto/panacea/did/v2/tx.proto
+++ b/proto/panacea/did/v2/tx.proto
@@ -7,19 +7,19 @@ option go_package = "github.com/medibloc/panacea-core/x/did/types";
 import "panacea/did/v2/did.proto";
 
 // Msg defines the Msg service.
-service MsgService {
+service Msg {
   // CreateDID defines a method for creating a DID.
-  rpc CreateDID(MsgServiceCreateDIDRequest) returns (MsgServiceCreateDIDResponse);
+  rpc CreateDID(MsgCreateDIDRequest) returns (MsgCreateDIDResponse);
 
   // UpdateDID defines a method for updating a DID.
-  rpc UpdateDID(MsgServiceUpdateDIDRequest) returns (MsgServiceUpdateDIDResponse);
+  rpc UpdateDID(MsgUpdateDIDRequest) returns (MsgUpdateDIDResponse);
 
   // DeactivateDID defines a method for deactivating a DID.
-  rpc DeactivateDID(MsgServiceDeactivateDIDRequest) returns (MsgServiceDeactivateDIDResponse);
+  rpc DeactivateDID(MsgDeactivateDIDRequest) returns (MsgDeactivateDIDResponse);
 }
 
 // MsgCreateDID defines the Msg/CreateDID request type.
-message MsgServiceCreateDIDRequest {
+message MsgCreateDIDRequest {
   string did = 1;
   DIDDocument document = 2;
   string verification_method_id = 3;
@@ -28,10 +28,10 @@ message MsgServiceCreateDIDRequest {
 }
 
 // MsgCreateDIDResponse defines the Msg/CreateDID response type.
-message MsgServiceCreateDIDResponse {}
+message MsgCreateDIDResponse {}
 
 // MsgUpdateDID defines the Msg/UpdateDID request type.
-message MsgServiceUpdateDIDRequest {
+message MsgUpdateDIDRequest {
   string did = 1;
   DIDDocument document = 2;
   string verification_method_id = 3;
@@ -40,10 +40,10 @@ message MsgServiceUpdateDIDRequest {
 }
 
 // MsgUpdateDIDResponse defines the Msg/UpdateDID response type.
-message MsgServiceUpdateDIDResponse {}
+message MsgUpdateDIDResponse {}
 
 // MsgDeactivateDID defines the Msg/DeactivateDID request type.
-message MsgServiceDeactivateDIDRequest {
+message MsgDeactivateDIDRequest {
   string did = 1;
   string verification_method_id = 2;
   bytes signature = 3;
@@ -51,4 +51,4 @@ message MsgServiceDeactivateDIDRequest {
 }
 
 // MsgDeactivateDIDResponse defines the Msg/DeactivateDID response type.
-message MsgServiceDeactivateDIDResponse {}
+message MsgDeactivateDIDResponse {}
diff --git a/proto/panacea/pnft/v2/tx.proto b/proto/panacea/pnft/v2/tx.proto
index 776a630f..8c61a6a1 100644
--- a/proto/panacea/pnft/v2/tx.proto
+++ b/proto/panacea/pnft/v2/tx.proto
@@ -4,23 +4,23 @@ package panacea.pnft.v2;
 option go_package = "github.com/medibloc/panacea-core/x/pnft/types";
 option java_multiple_files = true;
 
-service MsgService {
-  rpc CreateDenom(MsgServiceCreateDenomRequest) returns (MsgServiceCreateDenomResponse);
+service Msg {
+  rpc CreateDenom(MsgCreateDenomRequest) returns (MsgCreateDenomResponse);
 
-  rpc UpdateDenom(MsgServiceUpdateDenomRequest) returns (MsgServiceUpdateDenomResponse);
+  rpc UpdateDenom(MsgUpdateDenomRequest) returns (MsgUpdateDenomResponse);
 
-  rpc DeleteDenom(MsgServiceDeleteDenomRequest) returns (MsgServiceDeleteDenomResponse);
+  rpc DeleteDenom(MsgDeleteDenomRequest) returns (MsgDeleteDenomResponse);
 
-  rpc TransferDenom(MsgServiceTransferDenomRequest) returns (MsgServiceTransferDenomResponse);
+  rpc TransferDenom(MsgTransferDenomRequest) returns (MsgTransferDenomResponse);
 
-  rpc MintPNFT(MsgServiceMintPNFTRequest) returns (MsgServiceMintPNFTResponse);
+  rpc MintPNFT(MsgMintPNFTRequest) returns (MsgMintPNFTResponse);
 
-  rpc TransferPNFT(MsgServiceTransferPNFTRequest) returns (MsgServiceTransferPNFTResponse);
+  rpc TransferPNFT(MsgTransferPNFTRequest) returns (MsgTransferPNFTResponse);
 
-  rpc BurnPNFT(MsgServiceBurnPNFTRequest) returns (MsgServiceBurnPNFTResponse);
+  rpc BurnPNFT(MsgBurnPNFTRequest) returns (MsgBurnPNFTResponse);
 }
 
-message MsgServiceCreateDenomRequest {
+message MsgCreateDenomRequest {
   string id = 1;
   string name = 2;
   string symbol = 3;
@@ -31,9 +31,9 @@ message MsgServiceCreateDenomRequest {
   string creator = 8;
 }
 
-message MsgServiceCreateDenomResponse {}
+message MsgCreateDenomResponse {}
 
-message MsgServiceUpdateDenomRequest {
+message MsgUpdateDenomRequest {
   string id = 1;
   string name = 2;
   string symbol = 3;
@@ -44,24 +44,24 @@ message MsgServiceUpdateDenomRequest {
   string updater = 8;
 }
 
-message MsgServiceUpdateDenomResponse {}
+message MsgUpdateDenomResponse {}
 
-message MsgServiceDeleteDenomRequest {
+message MsgDeleteDenomRequest {
   string id = 1;
   string remover = 2;
 }
 
-message MsgServiceDeleteDenomResponse {}
+message MsgDeleteDenomResponse {}
 
-message MsgServiceTransferDenomRequest {
+message MsgTransferDenomRequest {
   string id = 1;
   string sender = 2;
   string receiver = 3;
 }
 
-message MsgServiceTransferDenomResponse {}
+message MsgTransferDenomResponse {}
 
-message MsgServiceMintPNFTRequest {
+message MsgMintPNFTRequest {
   string denom_id = 1;
   string id = 2;
   string name = 3;
@@ -72,21 +72,21 @@ message MsgServiceMintPNFTRequest {
   string creator = 8;
 }
 
-message MsgServiceMintPNFTResponse {}
+message MsgMintPNFTResponse {}
 
-message MsgServiceTransferPNFTRequest {
+message MsgTransferPNFTRequest {
   string denom_id = 1;
   string id = 2;
   string sender = 3;
   string receiver = 4;
 }
 
-message MsgServiceTransferPNFTResponse {}
+message MsgTransferPNFTResponse {}
 
-message MsgServiceBurnPNFTRequest {
+message MsgBurnPNFTRequest {
   string denom_id = 1;
   string id = 2;
   string burner = 3;
 }
 
-message MsgServiceBurnPNFTResponse {}
\ No newline at end of file
+message MsgBurnPNFTResponse {}
\ No newline at end of file
diff --git a/types/testsuite/suite.go b/types/testsuite/suite.go
index 63d54757..dc6d7423 100644
--- a/types/testsuite/suite.go
+++ b/types/testsuite/suite.go
@@ -53,14 +53,14 @@ type TestSuite struct {
 	AccountKeeper    authkeeper.AccountKeeper
 	StakingKeeper    *stakingkeeper.Keeper
 	AolKeeper        aolkeeper.Keeper
-	AolMsgServer     aoltypes.MsgServiceServer
+	AolMsgServer     aoltypes.MsgServer
 	BankKeeper       bankkeeper.Keeper
 	BurnKeeper       burnkeeper.Keeper
 	CapabilityKeeper *capabilitykeeper.Keeper
 	DistrKeeper      distrkeeper.Keeper
 	IBCKeeper        *ibckeeper.Keeper
 	TransferKeeper   ibctransferkeeper.Keeper
-	DIDMsgServer     didtypes.MsgServiceServer
+	DIDMsgServer     didtypes.MsgServer
 	DIDKeeper        didkeeper.Keeper
 	UpgradeKeeper    *upgradekeeper.Keeper
 }
diff --git a/x/aol/client/cli/txRecord.go b/x/aol/client/cli/txRecord.go
index c98328a3..98dda884 100644
--- a/x/aol/client/cli/txRecord.go
+++ b/x/aol/client/cli/txRecord.go
@@ -39,7 +39,7 @@ func CmdAddRecord() *cobra.Command {
 			writerAddress := clientCtx.GetFromAddress().String()
 			feePayerAddress := viper.GetString(flagFeePayer)
 
-			msg := types.NewMsgServiceAddRecordRequest(topicName, key, value, writerAddress, ownerAddress, feePayerAddress)
+			msg := types.NewMsgAddRecordRequest(topicName, key, value, writerAddress, ownerAddress, feePayerAddress)
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}
diff --git a/x/aol/keeper/msg_server.go b/x/aol/keeper/msg_server.go
index cc9797ec..266d7b31 100644
--- a/x/aol/keeper/msg_server.go
+++ b/x/aol/keeper/msg_server.go
@@ -10,8 +10,8 @@ type msgServer struct {
 
 // NewMsgServerImpl returns an implementation of the MsgServer interface
 // for the provided Keeper.
-func NewMsgServerImpl(keeper Keeper) types.MsgServiceServer {
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
 	return &msgServer{Keeper: keeper}
 }
 
-var _ types.MsgServiceServer = msgServer{}
+var _ types.MsgServer = msgServer{}
diff --git a/x/aol/keeper/msg_server_record.go b/x/aol/keeper/msg_server_record.go
index 7d1b6e8d..f832da8a 100644
--- a/x/aol/keeper/msg_server_record.go
+++ b/x/aol/keeper/msg_server_record.go
@@ -9,7 +9,7 @@ import (
 	"github.com/medibloc/panacea-core/v2/x/aol/types"
 )
 
-func (k msgServer) AddRecord(goCtx context.Context, msg *types.MsgServiceAddRecordRequest) (*types.MsgServiceAddRecordResponse, error) {
+func (k msgServer) AddRecord(goCtx context.Context, msg *types.MsgAddRecordRequest) (*types.MsgAddRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	ownerAddr, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
@@ -43,7 +43,7 @@ func (k msgServer) AddRecord(goCtx context.Context, msg *types.MsgServiceAddReco
 	}
 	k.SetRecord(ctx, recordKey, record)
 
-	return &types.MsgServiceAddRecordResponse{
+	return &types.MsgAddRecordResponse{
 		OwnerAddress: msg.OwnerAddress,
 		TopicName:    msg.TopicName,
 		Offset:       offset,
diff --git a/x/aol/keeper/msg_server_test.go b/x/aol/keeper/msg_server_test.go
index c162eb17..b27d4765 100644
--- a/x/aol/keeper/msg_server_test.go
+++ b/x/aol/keeper/msg_server_test.go
@@ -31,7 +31,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 	ownerAddress := suite.GetAccAddress()
 
 	// create topic
-	msgCreateTopic := aoltypes.MsgServiceCreateTopicRequest{
+	msgCreateTopic := aoltypes.MsgCreateTopicRequest{
 		TopicName:    topicName,
 		Description:  "topic description",
 		OwnerAddress: ownerAddress.String(),
@@ -54,7 +54,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 	// add writer
 	moniker := "testMoniker"
 	writerAddress := suite.GetAccAddress()
-	msgAddWriter := aoltypes.MsgServiceAddWriterRequest{
+	msgAddWriter := aoltypes.MsgAddWriterRequest{
 		TopicName:     topicName,
 		Moniker:       moniker,
 		Description:   "write Description",
@@ -68,7 +68,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 
 	// add writer2
 	writerAddress2 := suite.GetAccAddress()
-	msgAddWriter = aoltypes.MsgServiceAddWriterRequest{
+	msgAddWriter = aoltypes.MsgAddWriterRequest{
 		TopicName:     topicName,
 		Moniker:       moniker,
 		Description:   "write Description2",
@@ -103,7 +103,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 	suite.Require().Equal(msgAddWriter.Moniker, getWriterResponse.Writer.Moniker)
 
 	// add record
-	msgAddRecord := aoltypes.MsgServiceAddRecordRequest{
+	msgAddRecord := aoltypes.MsgAddRecordRequest{
 		TopicName:       topicName,
 		Key:             []byte("key1"),
 		Value:           []byte("value1"),
@@ -128,7 +128,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 	suite.Require().Equal(msgAddRecord.WriterAddress, getRecordResponse.Record.WriterAddress)
 
 	// add record2
-	msgAddRecord2 := aoltypes.MsgServiceAddRecordRequest{
+	msgAddRecord2 := aoltypes.MsgAddRecordRequest{
 		TopicName:       topicName,
 		Key:             []byte("key2"),
 		Value:           []byte("value2"),
@@ -164,7 +164,7 @@ func (suite *aolMsgServerTestSuite) TestMsgServer() {
 	suite.Require().Equal(uint64(2), getTopicResponse.Topic.TotalWriters)
 
 	// delete writer
-	msgDeleteWriter := aoltypes.MsgServiceDeleteWriterRequest{
+	msgDeleteWriter := aoltypes.MsgDeleteWriterRequest{
 		TopicName:     topicName,
 		WriterAddress: writerAddress2.String(),
 		OwnerAddress:  ownerAddress.String(),
diff --git a/x/aol/keeper/msg_server_topic.go b/x/aol/keeper/msg_server_topic.go
index 378a5c22..a10217be 100644
--- a/x/aol/keeper/msg_server_topic.go
+++ b/x/aol/keeper/msg_server_topic.go
@@ -10,7 +10,7 @@ import (
 	"github.com/medibloc/panacea-core/v2/x/aol/types"
 )
 
-func (k msgServer) CreateTopic(goCtx context.Context, msg *types.MsgServiceCreateTopicRequest) (*types.MsgServiceCreateTopicResponse, error) {
+func (k msgServer) CreateTopic(goCtx context.Context, msg *types.MsgCreateTopicRequest) (*types.MsgCreateTopicResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	ownerAddr, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
@@ -30,5 +30,5 @@ func (k msgServer) CreateTopic(goCtx context.Context, msg *types.MsgServiceCreat
 	topic := types.Topic{Description: msg.Description}
 	k.SetTopic(ctx, topicKey, topic)
 
-	return &types.MsgServiceCreateTopicResponse{}, nil
+	return &types.MsgCreateTopicResponse{}, nil
 }
diff --git a/x/aol/keeper/msg_server_writer.go b/x/aol/keeper/msg_server_writer.go
index dc4e404f..3529166f 100644
--- a/x/aol/keeper/msg_server_writer.go
+++ b/x/aol/keeper/msg_server_writer.go
@@ -9,7 +9,7 @@ import (
 	"github.com/medibloc/panacea-core/v2/x/aol/types"
 )
 
-func (k msgServer) AddWriter(goCtx context.Context, msg *types.MsgServiceAddWriterRequest) (*types.MsgServiceAddWriterResponse, error) {
+func (k msgServer) AddWriter(goCtx context.Context, msg *types.MsgAddWriterRequest) (*types.MsgAddWriterResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	ownerAddr, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
@@ -40,10 +40,10 @@ func (k msgServer) AddWriter(goCtx context.Context, msg *types.MsgServiceAddWrit
 	}
 	k.SetWriter(ctx, writerKey, writer)
 
-	return &types.MsgServiceAddWriterResponse{}, nil
+	return &types.MsgAddWriterResponse{}, nil
 }
 
-func (k msgServer) DeleteWriter(goCtx context.Context, msg *types.MsgServiceDeleteWriterRequest) (*types.MsgServiceDeleteWriterResponse, error) {
+func (k msgServer) DeleteWriter(goCtx context.Context, msg *types.MsgDeleteWriterRequest) (*types.MsgDeleteWriterResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	ownerAddr, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
@@ -66,5 +66,5 @@ func (k msgServer) DeleteWriter(goCtx context.Context, msg *types.MsgServiceDele
 
 	k.RemoveWriter(ctx, writerKey)
 
-	return &types.MsgServiceDeleteWriterResponse{}, nil
+	return &types.MsgDeleteWriterResponse{}, nil
 }
diff --git a/x/aol/module.go b/x/aol/module.go
index 6db4f11c..885c60f8 100644
--- a/x/aol/module.go
+++ b/x/aol/module.go
@@ -119,7 +119,7 @@ func (AppModule) QuerierRoute() string { return types.QuerierRoute }
 // module-specific GRPC queries.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
-	types.RegisterMsgServiceServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
+	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 }
 
 // RegisterInvariants registers the capability module's invariants.
diff --git a/x/aol/types/codec.go b/x/aol/types/codec.go
index f559ffa0..50b9a63f 100644
--- a/x/aol/types/codec.go
+++ b/x/aol/types/codec.go
@@ -9,22 +9,22 @@ import (
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
 	// this line is used by starport scaffolding # 2
-	cdc.RegisterConcrete(&MsgServiceCreateTopicRequest{}, "aol/CreateTopic", nil)
-	cdc.RegisterConcrete(&MsgServiceAddWriterRequest{}, "aol/AddWriter", nil)
-	cdc.RegisterConcrete(&MsgServiceDeleteWriterRequest{}, "aol/DeleteWriter", nil)
-	cdc.RegisterConcrete(&MsgServiceAddRecordRequest{}, "aol/AddRecord", nil)
+	cdc.RegisterConcrete(&MsgCreateTopicRequest{}, "aol/CreateTopic", nil)
+	cdc.RegisterConcrete(&MsgAddWriterRequest{}, "aol/AddWriter", nil)
+	cdc.RegisterConcrete(&MsgDeleteWriterRequest{}, "aol/DeleteWriter", nil)
+	cdc.RegisterConcrete(&MsgAddRecordRequest{}, "aol/AddRecord", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	// this line is used by starport scaffolding # 3
 	registry.RegisterImplementations((*sdk.Msg)(nil),
-		&MsgServiceCreateTopicRequest{},
-		&MsgServiceAddWriterRequest{},
-		&MsgServiceDeleteWriterRequest{},
-		&MsgServiceAddRecordRequest{},
+		&MsgCreateTopicRequest{},
+		&MsgAddWriterRequest{},
+		&MsgDeleteWriterRequest{},
+		&MsgAddRecordRequest{},
 	)
 
-	msgservice.RegisterMsgServiceDesc(registry, &_MsgService_serviceDesc)
+	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
 
 var (
diff --git a/x/aol/types/messages_record.go b/x/aol/types/messages_record.go
index 50d9adb8..bf319a59 100644
--- a/x/aol/types/messages_record.go
+++ b/x/aol/types/messages_record.go
@@ -6,10 +6,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var _ sdk.Msg = &MsgServiceAddRecordRequest{}
+var _ sdk.Msg = &MsgAddRecordRequest{}
 
-func NewMsgServiceAddRecordRequest(topicName string, key, value []byte, writerAddress, ownerAddress, feePayerAddress string) *MsgServiceAddRecordRequest {
-	return &MsgServiceAddRecordRequest{
+func NewMsgAddRecordRequest(topicName string, key, value []byte, writerAddress, ownerAddress, feePayerAddress string) *MsgAddRecordRequest {
+	return &MsgAddRecordRequest{
 		TopicName:       topicName,
 		Key:             key,
 		Value:           value,
@@ -19,15 +19,15 @@ func NewMsgServiceAddRecordRequest(topicName string, key, value []byte, writerAd
 	}
 }
 
-func (msg *MsgServiceAddRecordRequest) Route() string {
+func (msg *MsgAddRecordRequest) Route() string {
 	return RouterKey
 }
 
-func (msg *MsgServiceAddRecordRequest) Type() string {
+func (msg *MsgAddRecordRequest) Type() string {
 	return "AddRecord"
 }
 
-func (msg *MsgServiceAddRecordRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgAddRecordRequest) GetSigners() []sdk.AccAddress {
 	writerAddress, err := sdk.AccAddressFromBech32(msg.WriterAddress)
 	if err != nil {
 		panic(err)
@@ -44,12 +44,12 @@ func (msg *MsgServiceAddRecordRequest) GetSigners() []sdk.AccAddress {
 	}
 }
 
-func (msg *MsgServiceAddRecordRequest) GetSignBytes() []byte {
+func (msg *MsgAddRecordRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceAddRecordRequest) ValidateBasic() error {
+func (msg *MsgAddRecordRequest) ValidateBasic() error {
 	if err := validateTopicName(msg.TopicName); err != nil {
 		return err
 	}
diff --git a/x/aol/types/messages_topic.go b/x/aol/types/messages_topic.go
index 70901614..2d957ccb 100644
--- a/x/aol/types/messages_topic.go
+++ b/x/aol/types/messages_topic.go
@@ -6,25 +6,25 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var _ sdk.Msg = &MsgServiceCreateTopicRequest{}
+var _ sdk.Msg = &MsgCreateTopicRequest{}
 
-func NewMsgCreateTopic(topicName, description, ownerAddress string) *MsgServiceCreateTopicRequest {
-	return &MsgServiceCreateTopicRequest{
+func NewMsgCreateTopic(topicName, description, ownerAddress string) *MsgCreateTopicRequest {
+	return &MsgCreateTopicRequest{
 		TopicName:    topicName,
 		Description:  description,
 		OwnerAddress: ownerAddress,
 	}
 }
 
-func (msg *MsgServiceCreateTopicRequest) Route() string {
+func (msg *MsgCreateTopicRequest) Route() string {
 	return RouterKey
 }
 
-func (msg *MsgServiceCreateTopicRequest) Type() string {
+func (msg *MsgCreateTopicRequest) Type() string {
 	return "CreateTopic"
 }
 
-func (msg *MsgServiceCreateTopicRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgCreateTopicRequest) GetSigners() []sdk.AccAddress {
 	ownerAddress, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
 	if err != nil {
 		panic(err)
@@ -32,12 +32,12 @@ func (msg *MsgServiceCreateTopicRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{ownerAddress}
 }
 
-func (msg *MsgServiceCreateTopicRequest) GetSignBytes() []byte {
+func (msg *MsgCreateTopicRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceCreateTopicRequest) ValidateBasic() error {
+func (msg *MsgCreateTopicRequest) ValidateBasic() error {
 	if err := validateTopicName(msg.TopicName); err != nil {
 		return err
 	}
diff --git a/x/aol/types/messages_writer.go b/x/aol/types/messages_writer.go
index 7576fa54..a46cf3c7 100644
--- a/x/aol/types/messages_writer.go
+++ b/x/aol/types/messages_writer.go
@@ -6,10 +6,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var _ sdk.Msg = &MsgServiceAddWriterRequest{}
+var _ sdk.Msg = &MsgAddWriterRequest{}
 
-func NewMsgAddWriter(topicName, moniker, description, writerAddress, ownerAddress string) *MsgServiceAddWriterRequest {
-	return &MsgServiceAddWriterRequest{
+func NewMsgAddWriter(topicName, moniker, description, writerAddress, ownerAddress string) *MsgAddWriterRequest {
+	return &MsgAddWriterRequest{
 		TopicName:     topicName,
 		Moniker:       moniker,
 		Description:   description,
@@ -18,15 +18,15 @@ func NewMsgAddWriter(topicName, moniker, description, writerAddress, ownerAddres
 	}
 }
 
-func (msg *MsgServiceAddWriterRequest) Route() string {
+func (msg *MsgAddWriterRequest) Route() string {
 	return RouterKey
 }
 
-func (msg *MsgServiceAddWriterRequest) Type() string {
+func (msg *MsgAddWriterRequest) Type() string {
 	return "AddWriter"
 }
 
-func (msg *MsgServiceAddWriterRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgAddWriterRequest) GetSigners() []sdk.AccAddress {
 	ownerAddress, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
 	if err != nil {
 		panic(err)
@@ -34,12 +34,12 @@ func (msg *MsgServiceAddWriterRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{ownerAddress}
 }
 
-func (msg *MsgServiceAddWriterRequest) GetSignBytes() []byte {
+func (msg *MsgAddWriterRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceAddWriterRequest) ValidateBasic() error {
+func (msg *MsgAddWriterRequest) ValidateBasic() error {
 	if err := validateTopicName(msg.TopicName); err != nil {
 		return err
 	}
@@ -58,24 +58,24 @@ func (msg *MsgServiceAddWriterRequest) ValidateBasic() error {
 	return nil
 }
 
-var _ sdk.Msg = &MsgServiceDeleteWriterRequest{}
+var _ sdk.Msg = &MsgDeleteWriterRequest{}
 
-func NewMsgDeleteWriter(topicName, writerAddress, ownerAddress string) *MsgServiceDeleteWriterRequest {
-	return &MsgServiceDeleteWriterRequest{
+func NewMsgDeleteWriter(topicName, writerAddress, ownerAddress string) *MsgDeleteWriterRequest {
+	return &MsgDeleteWriterRequest{
 		TopicName:     topicName,
 		WriterAddress: writerAddress,
 		OwnerAddress:  ownerAddress,
 	}
 }
-func (msg *MsgServiceDeleteWriterRequest) Route() string {
+func (msg *MsgDeleteWriterRequest) Route() string {
 	return RouterKey
 }
 
-func (msg *MsgServiceDeleteWriterRequest) Type() string {
+func (msg *MsgDeleteWriterRequest) Type() string {
 	return "DeleteWriter"
 }
 
-func (msg *MsgServiceDeleteWriterRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgDeleteWriterRequest) GetSigners() []sdk.AccAddress {
 	ownerAddress, err := sdk.AccAddressFromBech32(msg.OwnerAddress)
 	if err != nil {
 		panic(err)
@@ -83,12 +83,12 @@ func (msg *MsgServiceDeleteWriterRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{ownerAddress}
 }
 
-func (msg *MsgServiceDeleteWriterRequest) GetSignBytes() []byte {
+func (msg *MsgDeleteWriterRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceDeleteWriterRequest) ValidateBasic() error {
+func (msg *MsgDeleteWriterRequest) ValidateBasic() error {
 	if err := validateTopicName(msg.TopicName); err != nil {
 		return err
 	}
diff --git a/x/aol/types/tx.pb.go b/x/aol/types/tx.pb.go
index 9272ddc7..1e5db1b4 100644
--- a/x/aol/types/tx.pb.go
+++ b/x/aol/types/tx.pb.go
@@ -28,24 +28,24 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // MsgCreateTopic defines the Msg/CreateTopic request type.
-type MsgServiceCreateTopicRequest struct {
+type MsgCreateTopicRequest struct {
 	TopicName    string `protobuf:"bytes,1,opt,name=topic_name,json=topicName,proto3" json:"topic_name,omitempty"`
 	Description  string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	OwnerAddress string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
 }
 
-func (m *MsgServiceCreateTopicRequest) Reset()         { *m = MsgServiceCreateTopicRequest{} }
-func (m *MsgServiceCreateTopicRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateTopicRequest) ProtoMessage()    {}
-func (*MsgServiceCreateTopicRequest) Descriptor() ([]byte, []int) {
+func (m *MsgCreateTopicRequest) Reset()         { *m = MsgCreateTopicRequest{} }
+func (m *MsgCreateTopicRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateTopicRequest) ProtoMessage()    {}
+func (*MsgCreateTopicRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{0}
 }
-func (m *MsgServiceCreateTopicRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateTopicRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateTopicRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateTopicRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateTopicRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -55,33 +55,33 @@ func (m *MsgServiceCreateTopicRequest) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateTopicRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateTopicRequest.Merge(m, src)
+func (m *MsgCreateTopicRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateTopicRequest.Merge(m, src)
 }
-func (m *MsgServiceCreateTopicRequest) XXX_Size() int {
+func (m *MsgCreateTopicRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateTopicRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateTopicRequest.DiscardUnknown(m)
+func (m *MsgCreateTopicRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateTopicRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateTopicRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateTopicRequest proto.InternalMessageInfo
 
-func (m *MsgServiceCreateTopicRequest) GetTopicName() string {
+func (m *MsgCreateTopicRequest) GetTopicName() string {
 	if m != nil {
 		return m.TopicName
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateTopicRequest) GetDescription() string {
+func (m *MsgCreateTopicRequest) GetDescription() string {
 	if m != nil {
 		return m.Description
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateTopicRequest) GetOwnerAddress() string {
+func (m *MsgCreateTopicRequest) GetOwnerAddress() string {
 	if m != nil {
 		return m.OwnerAddress
 	}
@@ -89,21 +89,21 @@ func (m *MsgServiceCreateTopicRequest) GetOwnerAddress() string {
 }
 
 // MsgCreateTopicResponse defines the Msg/CreateTopic response type.
-type MsgServiceCreateTopicResponse struct {
+type MsgCreateTopicResponse struct {
 }
 
-func (m *MsgServiceCreateTopicResponse) Reset()         { *m = MsgServiceCreateTopicResponse{} }
-func (m *MsgServiceCreateTopicResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateTopicResponse) ProtoMessage()    {}
-func (*MsgServiceCreateTopicResponse) Descriptor() ([]byte, []int) {
+func (m *MsgCreateTopicResponse) Reset()         { *m = MsgCreateTopicResponse{} }
+func (m *MsgCreateTopicResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateTopicResponse) ProtoMessage()    {}
+func (*MsgCreateTopicResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{1}
 }
-func (m *MsgServiceCreateTopicResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateTopicResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateTopicResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateTopicResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateTopicResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateTopicResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -113,20 +113,20 @@ func (m *MsgServiceCreateTopicResponse) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateTopicResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateTopicResponse.Merge(m, src)
+func (m *MsgCreateTopicResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateTopicResponse.Merge(m, src)
 }
-func (m *MsgServiceCreateTopicResponse) XXX_Size() int {
+func (m *MsgCreateTopicResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateTopicResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateTopicResponse.DiscardUnknown(m)
+func (m *MsgCreateTopicResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateTopicResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateTopicResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateTopicResponse proto.InternalMessageInfo
 
 // MsgAddWriter defines the Msg/AddWriter request type.
-type MsgServiceAddWriterRequest struct {
+type MsgAddWriterRequest struct {
 	TopicName     string `protobuf:"bytes,1,opt,name=topic_name,json=topicName,proto3" json:"topic_name,omitempty"`
 	Moniker       string `protobuf:"bytes,2,opt,name=moniker,proto3" json:"moniker,omitempty"`
 	Description   string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
@@ -134,18 +134,18 @@ type MsgServiceAddWriterRequest struct {
 	OwnerAddress  string `protobuf:"bytes,5,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
 }
 
-func (m *MsgServiceAddWriterRequest) Reset()         { *m = MsgServiceAddWriterRequest{} }
-func (m *MsgServiceAddWriterRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceAddWriterRequest) ProtoMessage()    {}
-func (*MsgServiceAddWriterRequest) Descriptor() ([]byte, []int) {
+func (m *MsgAddWriterRequest) Reset()         { *m = MsgAddWriterRequest{} }
+func (m *MsgAddWriterRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgAddWriterRequest) ProtoMessage()    {}
+func (*MsgAddWriterRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{2}
 }
-func (m *MsgServiceAddWriterRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgAddWriterRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceAddWriterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgAddWriterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceAddWriterRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgAddWriterRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -155,47 +155,47 @@ func (m *MsgServiceAddWriterRequest) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceAddWriterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceAddWriterRequest.Merge(m, src)
+func (m *MsgAddWriterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgAddWriterRequest.Merge(m, src)
 }
-func (m *MsgServiceAddWriterRequest) XXX_Size() int {
+func (m *MsgAddWriterRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceAddWriterRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceAddWriterRequest.DiscardUnknown(m)
+func (m *MsgAddWriterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgAddWriterRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceAddWriterRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgAddWriterRequest proto.InternalMessageInfo
 
-func (m *MsgServiceAddWriterRequest) GetTopicName() string {
+func (m *MsgAddWriterRequest) GetTopicName() string {
 	if m != nil {
 		return m.TopicName
 	}
 	return ""
 }
 
-func (m *MsgServiceAddWriterRequest) GetMoniker() string {
+func (m *MsgAddWriterRequest) GetMoniker() string {
 	if m != nil {
 		return m.Moniker
 	}
 	return ""
 }
 
-func (m *MsgServiceAddWriterRequest) GetDescription() string {
+func (m *MsgAddWriterRequest) GetDescription() string {
 	if m != nil {
 		return m.Description
 	}
 	return ""
 }
 
-func (m *MsgServiceAddWriterRequest) GetWriterAddress() string {
+func (m *MsgAddWriterRequest) GetWriterAddress() string {
 	if m != nil {
 		return m.WriterAddress
 	}
 	return ""
 }
 
-func (m *MsgServiceAddWriterRequest) GetOwnerAddress() string {
+func (m *MsgAddWriterRequest) GetOwnerAddress() string {
 	if m != nil {
 		return m.OwnerAddress
 	}
@@ -203,21 +203,21 @@ func (m *MsgServiceAddWriterRequest) GetOwnerAddress() string {
 }
 
 // MsgAddWriter defines the Msg/AddWriter response type.
-type MsgServiceAddWriterResponse struct {
+type MsgAddWriterResponse struct {
 }
 
-func (m *MsgServiceAddWriterResponse) Reset()         { *m = MsgServiceAddWriterResponse{} }
-func (m *MsgServiceAddWriterResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceAddWriterResponse) ProtoMessage()    {}
-func (*MsgServiceAddWriterResponse) Descriptor() ([]byte, []int) {
+func (m *MsgAddWriterResponse) Reset()         { *m = MsgAddWriterResponse{} }
+func (m *MsgAddWriterResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgAddWriterResponse) ProtoMessage()    {}
+func (*MsgAddWriterResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{3}
 }
-func (m *MsgServiceAddWriterResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgAddWriterResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceAddWriterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgAddWriterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceAddWriterResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgAddWriterResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -227,37 +227,37 @@ func (m *MsgServiceAddWriterResponse) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceAddWriterResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceAddWriterResponse.Merge(m, src)
+func (m *MsgAddWriterResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgAddWriterResponse.Merge(m, src)
 }
-func (m *MsgServiceAddWriterResponse) XXX_Size() int {
+func (m *MsgAddWriterResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceAddWriterResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceAddWriterResponse.DiscardUnknown(m)
+func (m *MsgAddWriterResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgAddWriterResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceAddWriterResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgAddWriterResponse proto.InternalMessageInfo
 
 // MsgDeleteWriter defines the Msg/DeleteWriter request type.
-type MsgServiceDeleteWriterRequest struct {
+type MsgDeleteWriterRequest struct {
 	TopicName     string `protobuf:"bytes,1,opt,name=topic_name,json=topicName,proto3" json:"topic_name,omitempty"`
 	WriterAddress string `protobuf:"bytes,2,opt,name=writer_address,json=writerAddress,proto3" json:"writer_address,omitempty"`
 	OwnerAddress  string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
 }
 
-func (m *MsgServiceDeleteWriterRequest) Reset()         { *m = MsgServiceDeleteWriterRequest{} }
-func (m *MsgServiceDeleteWriterRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeleteWriterRequest) ProtoMessage()    {}
-func (*MsgServiceDeleteWriterRequest) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteWriterRequest) Reset()         { *m = MsgDeleteWriterRequest{} }
+func (m *MsgDeleteWriterRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteWriterRequest) ProtoMessage()    {}
+func (*MsgDeleteWriterRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{4}
 }
-func (m *MsgServiceDeleteWriterRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteWriterRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeleteWriterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteWriterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeleteWriterRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteWriterRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -267,33 +267,33 @@ func (m *MsgServiceDeleteWriterRequest) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeleteWriterRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeleteWriterRequest.Merge(m, src)
+func (m *MsgDeleteWriterRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteWriterRequest.Merge(m, src)
 }
-func (m *MsgServiceDeleteWriterRequest) XXX_Size() int {
+func (m *MsgDeleteWriterRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeleteWriterRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeleteWriterRequest.DiscardUnknown(m)
+func (m *MsgDeleteWriterRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteWriterRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeleteWriterRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteWriterRequest proto.InternalMessageInfo
 
-func (m *MsgServiceDeleteWriterRequest) GetTopicName() string {
+func (m *MsgDeleteWriterRequest) GetTopicName() string {
 	if m != nil {
 		return m.TopicName
 	}
 	return ""
 }
 
-func (m *MsgServiceDeleteWriterRequest) GetWriterAddress() string {
+func (m *MsgDeleteWriterRequest) GetWriterAddress() string {
 	if m != nil {
 		return m.WriterAddress
 	}
 	return ""
 }
 
-func (m *MsgServiceDeleteWriterRequest) GetOwnerAddress() string {
+func (m *MsgDeleteWriterRequest) GetOwnerAddress() string {
 	if m != nil {
 		return m.OwnerAddress
 	}
@@ -301,21 +301,21 @@ func (m *MsgServiceDeleteWriterRequest) GetOwnerAddress() string {
 }
 
 // MsgDeleteWriter defines the Msg/DeleteWriter response type.
-type MsgServiceDeleteWriterResponse struct {
+type MsgDeleteWriterResponse struct {
 }
 
-func (m *MsgServiceDeleteWriterResponse) Reset()         { *m = MsgServiceDeleteWriterResponse{} }
-func (m *MsgServiceDeleteWriterResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeleteWriterResponse) ProtoMessage()    {}
-func (*MsgServiceDeleteWriterResponse) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteWriterResponse) Reset()         { *m = MsgDeleteWriterResponse{} }
+func (m *MsgDeleteWriterResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteWriterResponse) ProtoMessage()    {}
+func (*MsgDeleteWriterResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{5}
 }
-func (m *MsgServiceDeleteWriterResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteWriterResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeleteWriterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteWriterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeleteWriterResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteWriterResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -325,20 +325,20 @@ func (m *MsgServiceDeleteWriterResponse) XXX_Marshal(b []byte, deterministic boo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeleteWriterResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeleteWriterResponse.Merge(m, src)
+func (m *MsgDeleteWriterResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteWriterResponse.Merge(m, src)
 }
-func (m *MsgServiceDeleteWriterResponse) XXX_Size() int {
+func (m *MsgDeleteWriterResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeleteWriterResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeleteWriterResponse.DiscardUnknown(m)
+func (m *MsgDeleteWriterResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteWriterResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeleteWriterResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteWriterResponse proto.InternalMessageInfo
 
 // MsgAddRecord defines the Msg/AddRecord request type.
-type MsgServiceAddRecordRequest struct {
+type MsgAddRecordRequest struct {
 	TopicName       string `protobuf:"bytes,1,opt,name=topic_name,json=topicName,proto3" json:"topic_name,omitempty"`
 	Key             []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
 	Value           []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
@@ -347,18 +347,18 @@ type MsgServiceAddRecordRequest struct {
 	FeePayerAddress string `protobuf:"bytes,6,opt,name=fee_payer_address,json=feePayerAddress,proto3" json:"fee_payer_address,omitempty"`
 }
 
-func (m *MsgServiceAddRecordRequest) Reset()         { *m = MsgServiceAddRecordRequest{} }
-func (m *MsgServiceAddRecordRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceAddRecordRequest) ProtoMessage()    {}
-func (*MsgServiceAddRecordRequest) Descriptor() ([]byte, []int) {
+func (m *MsgAddRecordRequest) Reset()         { *m = MsgAddRecordRequest{} }
+func (m *MsgAddRecordRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgAddRecordRequest) ProtoMessage()    {}
+func (*MsgAddRecordRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{6}
 }
-func (m *MsgServiceAddRecordRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgAddRecordRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceAddRecordRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgAddRecordRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceAddRecordRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgAddRecordRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -368,54 +368,54 @@ func (m *MsgServiceAddRecordRequest) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceAddRecordRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceAddRecordRequest.Merge(m, src)
+func (m *MsgAddRecordRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgAddRecordRequest.Merge(m, src)
 }
-func (m *MsgServiceAddRecordRequest) XXX_Size() int {
+func (m *MsgAddRecordRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceAddRecordRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceAddRecordRequest.DiscardUnknown(m)
+func (m *MsgAddRecordRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgAddRecordRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceAddRecordRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgAddRecordRequest proto.InternalMessageInfo
 
-func (m *MsgServiceAddRecordRequest) GetTopicName() string {
+func (m *MsgAddRecordRequest) GetTopicName() string {
 	if m != nil {
 		return m.TopicName
 	}
 	return ""
 }
 
-func (m *MsgServiceAddRecordRequest) GetKey() []byte {
+func (m *MsgAddRecordRequest) GetKey() []byte {
 	if m != nil {
 		return m.Key
 	}
 	return nil
 }
 
-func (m *MsgServiceAddRecordRequest) GetValue() []byte {
+func (m *MsgAddRecordRequest) GetValue() []byte {
 	if m != nil {
 		return m.Value
 	}
 	return nil
 }
 
-func (m *MsgServiceAddRecordRequest) GetWriterAddress() string {
+func (m *MsgAddRecordRequest) GetWriterAddress() string {
 	if m != nil {
 		return m.WriterAddress
 	}
 	return ""
 }
 
-func (m *MsgServiceAddRecordRequest) GetOwnerAddress() string {
+func (m *MsgAddRecordRequest) GetOwnerAddress() string {
 	if m != nil {
 		return m.OwnerAddress
 	}
 	return ""
 }
 
-func (m *MsgServiceAddRecordRequest) GetFeePayerAddress() string {
+func (m *MsgAddRecordRequest) GetFeePayerAddress() string {
 	if m != nil {
 		return m.FeePayerAddress
 	}
@@ -423,24 +423,24 @@ func (m *MsgServiceAddRecordRequest) GetFeePayerAddress() string {
 }
 
 // MsgAddRecordResponse defines the Msg/AddRecordResponse response type.
-type MsgServiceAddRecordResponse struct {
+type MsgAddRecordResponse struct {
 	OwnerAddress string `protobuf:"bytes,1,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"`
 	TopicName    string `protobuf:"bytes,2,opt,name=topic_name,json=topicName,proto3" json:"topic_name,omitempty"`
 	Offset       uint64 `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"`
 }
 
-func (m *MsgServiceAddRecordResponse) Reset()         { *m = MsgServiceAddRecordResponse{} }
-func (m *MsgServiceAddRecordResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceAddRecordResponse) ProtoMessage()    {}
-func (*MsgServiceAddRecordResponse) Descriptor() ([]byte, []int) {
+func (m *MsgAddRecordResponse) Reset()         { *m = MsgAddRecordResponse{} }
+func (m *MsgAddRecordResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgAddRecordResponse) ProtoMessage()    {}
+func (*MsgAddRecordResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_e40917e58e4bb294, []int{7}
 }
-func (m *MsgServiceAddRecordResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgAddRecordResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceAddRecordResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgAddRecordResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceAddRecordResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgAddRecordResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -450,33 +450,33 @@ func (m *MsgServiceAddRecordResponse) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceAddRecordResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceAddRecordResponse.Merge(m, src)
+func (m *MsgAddRecordResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgAddRecordResponse.Merge(m, src)
 }
-func (m *MsgServiceAddRecordResponse) XXX_Size() int {
+func (m *MsgAddRecordResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceAddRecordResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceAddRecordResponse.DiscardUnknown(m)
+func (m *MsgAddRecordResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgAddRecordResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceAddRecordResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgAddRecordResponse proto.InternalMessageInfo
 
-func (m *MsgServiceAddRecordResponse) GetOwnerAddress() string {
+func (m *MsgAddRecordResponse) GetOwnerAddress() string {
 	if m != nil {
 		return m.OwnerAddress
 	}
 	return ""
 }
 
-func (m *MsgServiceAddRecordResponse) GetTopicName() string {
+func (m *MsgAddRecordResponse) GetTopicName() string {
 	if m != nil {
 		return m.TopicName
 	}
 	return ""
 }
 
-func (m *MsgServiceAddRecordResponse) GetOffset() uint64 {
+func (m *MsgAddRecordResponse) GetOffset() uint64 {
 	if m != nil {
 		return m.Offset
 	}
@@ -484,52 +484,52 @@ func (m *MsgServiceAddRecordResponse) GetOffset() uint64 {
 }
 
 func init() {
-	proto.RegisterType((*MsgServiceCreateTopicRequest)(nil), "panacea.aol.v2.MsgServiceCreateTopicRequest")
-	proto.RegisterType((*MsgServiceCreateTopicResponse)(nil), "panacea.aol.v2.MsgServiceCreateTopicResponse")
-	proto.RegisterType((*MsgServiceAddWriterRequest)(nil), "panacea.aol.v2.MsgServiceAddWriterRequest")
-	proto.RegisterType((*MsgServiceAddWriterResponse)(nil), "panacea.aol.v2.MsgServiceAddWriterResponse")
-	proto.RegisterType((*MsgServiceDeleteWriterRequest)(nil), "panacea.aol.v2.MsgServiceDeleteWriterRequest")
-	proto.RegisterType((*MsgServiceDeleteWriterResponse)(nil), "panacea.aol.v2.MsgServiceDeleteWriterResponse")
-	proto.RegisterType((*MsgServiceAddRecordRequest)(nil), "panacea.aol.v2.MsgServiceAddRecordRequest")
-	proto.RegisterType((*MsgServiceAddRecordResponse)(nil), "panacea.aol.v2.MsgServiceAddRecordResponse")
+	proto.RegisterType((*MsgCreateTopicRequest)(nil), "panacea.aol.v2.MsgCreateTopicRequest")
+	proto.RegisterType((*MsgCreateTopicResponse)(nil), "panacea.aol.v2.MsgCreateTopicResponse")
+	proto.RegisterType((*MsgAddWriterRequest)(nil), "panacea.aol.v2.MsgAddWriterRequest")
+	proto.RegisterType((*MsgAddWriterResponse)(nil), "panacea.aol.v2.MsgAddWriterResponse")
+	proto.RegisterType((*MsgDeleteWriterRequest)(nil), "panacea.aol.v2.MsgDeleteWriterRequest")
+	proto.RegisterType((*MsgDeleteWriterResponse)(nil), "panacea.aol.v2.MsgDeleteWriterResponse")
+	proto.RegisterType((*MsgAddRecordRequest)(nil), "panacea.aol.v2.MsgAddRecordRequest")
+	proto.RegisterType((*MsgAddRecordResponse)(nil), "panacea.aol.v2.MsgAddRecordResponse")
 }
 
 func init() { proto.RegisterFile("panacea/aol/v2/tx.proto", fileDescriptor_e40917e58e4bb294) }
 
 var fileDescriptor_e40917e58e4bb294 = []byte{
-	// 512 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xb3, 0x49, 0x1b, 0x94, 0x69, 0x5a, 0x60, 0x85, 0x20, 0x0a, 0xc4, 0x44, 0x41, 0x48,
-	0xa8, 0xb4, 0xb6, 0x14, 0x9e, 0xa0, 0xc0, 0x81, 0x0b, 0xa8, 0x32, 0x48, 0x48, 0x5c, 0xa2, 0x8d,
-	0x3d, 0x29, 0xa6, 0xb6, 0xd7, 0xac, 0x37, 0x69, 0x73, 0xe7, 0xc4, 0x89, 0x77, 0xe1, 0x11, 0xb8,
-	0x70, 0xec, 0x11, 0x89, 0x0b, 0x4a, 0x5e, 0x04, 0x65, 0xbd, 0x69, 0x6d, 0xc7, 0x69, 0x8c, 0xc4,
-	0x2d, 0x33, 0xfe, 0xe2, 0xf9, 0x7e, 0xf3, 0xc7, 0x70, 0x2f, 0x62, 0x21, 0x73, 0x90, 0x59, 0x8c,
-	0xfb, 0xd6, 0xa4, 0x6f, 0xc9, 0x73, 0x33, 0x12, 0x5c, 0x72, 0xba, 0xa7, 0x1f, 0x98, 0x8c, 0xfb,
-	0xe6, 0xa4, 0xdf, 0xfb, 0x42, 0xe0, 0xc1, 0xeb, 0xf8, 0xe4, 0x2d, 0x8a, 0x89, 0xe7, 0xe0, 0x0b,
-	0x81, 0x4c, 0xe2, 0x3b, 0x1e, 0x79, 0x8e, 0x8d, 0x9f, 0xc7, 0x18, 0x4b, 0xda, 0x01, 0x90, 0x8b,
-	0x78, 0x10, 0xb2, 0x00, 0x5b, 0xa4, 0x4b, 0x9e, 0x34, 0xec, 0x86, 0xca, 0xbc, 0x61, 0x01, 0xd2,
-	0x2e, 0xec, 0xb8, 0x18, 0x3b, 0xc2, 0x8b, 0xa4, 0xc7, 0xc3, 0x56, 0x55, 0x3d, 0x4f, 0xa7, 0xe8,
-	0x23, 0xd8, 0xe5, 0x67, 0x21, 0x8a, 0x01, 0x73, 0x5d, 0x81, 0x71, 0xdc, 0xaa, 0x29, 0x4d, 0x53,
-	0x25, 0x8f, 0x92, 0x5c, 0xef, 0x21, 0x74, 0xd6, 0xb8, 0x88, 0x23, 0x1e, 0xc6, 0xd8, 0xfb, 0x41,
-	0xa0, 0x7d, 0xa5, 0x38, 0x72, 0xdd, 0xf7, 0xc2, 0x93, 0x28, 0x4a, 0xba, 0x6c, 0xc1, 0x8d, 0x80,
-	0x87, 0xde, 0x29, 0x0a, 0xed, 0x70, 0x19, 0xe6, 0xfd, 0xd7, 0x56, 0xfd, 0x3f, 0x86, 0xbd, 0x33,
-	0x55, 0xeb, 0x12, 0x60, 0x4b, 0x89, 0x76, 0x93, 0xac, 0x26, 0x58, 0xc5, 0xdc, 0x2e, 0xc0, 0xec,
-	0xc0, 0xfd, 0x42, 0x08, 0x0d, 0xf9, 0x95, 0xa4, 0xdb, 0xf0, 0x12, 0x7d, 0x94, 0xf8, 0x4f, 0x9c,
-	0xab, 0x5e, 0xab, 0xa5, 0xbc, 0x16, 0x8d, 0xa4, 0x0b, 0xc6, 0x3a, 0x2f, 0xda, 0xee, 0xef, 0xfc,
-	0x4c, 0x6c, 0x74, 0xb8, 0x70, 0x4b, 0x7a, 0xbd, 0x05, 0xb5, 0x53, 0x9c, 0x2a, 0x83, 0x4d, 0x7b,
-	0xf1, 0x93, 0xde, 0x81, 0xed, 0x09, 0xf3, 0xc7, 0xa8, 0xec, 0x34, 0xed, 0x24, 0xf8, 0x9f, 0xfd,
-	0xa7, 0xfb, 0x70, 0x7b, 0x84, 0x38, 0x88, 0xd8, 0x34, 0x25, 0xac, 0x2b, 0xe1, 0xcd, 0x11, 0xe2,
-	0xf1, 0x22, 0xbf, 0xe4, 0x9f, 0xe6, 0x66, 0xb5, 0x84, 0x4b, 0xe0, 0x57, 0xeb, 0x91, 0x82, 0x7a,
-	0xd9, 0x16, 0x54, 0xf3, 0x2d, 0xb8, 0x0b, 0x75, 0x3e, 0x1a, 0xc5, 0x28, 0x15, 0xf1, 0x96, 0xad,
-	0xa3, 0xfe, 0xf7, 0x1a, 0xc0, 0x55, 0x6d, 0xfa, 0x09, 0x76, 0x52, 0x27, 0x41, 0x0f, 0xcc, 0xec,
-	0x0d, 0x9b, 0xd7, 0xdd, 0x6f, 0xfb, 0xb0, 0xa4, 0x5a, 0x63, 0xb9, 0xd0, 0xb8, 0xdc, 0x4b, 0xba,
-	0xbf, 0xfe, 0xbf, 0xf9, 0x0b, 0x6c, 0x3f, 0x2d, 0xa5, 0xd5, 0x55, 0x02, 0x68, 0xa6, 0x37, 0x8a,
-	0x5e, 0x63, 0xb2, 0xe0, 0x0a, 0xda, 0x66, 0x59, 0x79, 0x06, 0x2a, 0x19, 0xe0, 0x06, 0xa8, 0xcc,
-	0x0a, 0x6f, 0x80, 0xca, 0x6e, 0xc4, 0xf3, 0x57, 0x3f, 0x67, 0x06, 0xb9, 0x98, 0x19, 0xe4, 0xcf,
-	0xcc, 0x20, 0xdf, 0xe6, 0x46, 0xe5, 0x62, 0x6e, 0x54, 0x7e, 0xcd, 0x8d, 0xca, 0x31, 0xf9, 0x70,
-	0x70, 0xe2, 0xc9, 0x8f, 0xe3, 0xa1, 0xe9, 0xf0, 0xc0, 0x0a, 0xd0, 0xf5, 0x86, 0x3e, 0x77, 0x2c,
-	0xfd, 0xee, 0x43, 0x87, 0x0b, 0xb4, 0xce, 0xd5, 0xa7, 0x5a, 0x4e, 0x23, 0x8c, 0x87, 0x75, 0xf5,
-	0xad, 0x7e, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0x36, 0x58, 0x5c, 0x0b, 0xc6, 0x05, 0x00, 0x00,
+	// 509 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0x86, 0xe3, 0xa4, 0x0d, 0xca, 0x34, 0x2d, 0xb0, 0x94, 0xd4, 0x44, 0xc2, 0xaa, 0x52, 0x0a,
+	0x08, 0x81, 0x2d, 0x85, 0x27, 0x28, 0x70, 0xe0, 0x12, 0x54, 0x59, 0x08, 0x24, 0x84, 0x14, 0x6d,
+	0xec, 0x49, 0xb0, 0x6a, 0x7b, 0xcd, 0xee, 0x26, 0x6d, 0x0e, 0x9c, 0x78, 0x01, 0x1e, 0x88, 0x07,
+	0xe0, 0xd8, 0x03, 0x07, 0x8e, 0x28, 0x79, 0x05, 0x1e, 0x00, 0x65, 0xbd, 0x89, 0xe2, 0xd8, 0x25,
+	0x41, 0xea, 0xcd, 0x33, 0xfb, 0x7b, 0xe7, 0xfb, 0x77, 0x67, 0x16, 0x0e, 0x12, 0x1a, 0x53, 0x0f,
+	0xa9, 0x43, 0x59, 0xe8, 0x8c, 0xda, 0x8e, 0xbc, 0xb0, 0x13, 0xce, 0x24, 0x23, 0x7b, 0x7a, 0xc1,
+	0xa6, 0x2c, 0xb4, 0x47, 0xed, 0xd6, 0x17, 0xb8, 0xdb, 0x11, 0x83, 0x97, 0x1c, 0xa9, 0xc4, 0xb7,
+	0x2c, 0x09, 0x3c, 0x17, 0x3f, 0x0f, 0x51, 0x48, 0x72, 0x1f, 0x40, 0xce, 0xe2, 0x6e, 0x4c, 0x23,
+	0x34, 0x8d, 0x43, 0xe3, 0x71, 0xcd, 0xad, 0xa9, 0xcc, 0x1b, 0x1a, 0x21, 0x39, 0x84, 0x1d, 0x1f,
+	0x85, 0xc7, 0x83, 0x44, 0x06, 0x2c, 0x36, 0xcb, 0x6a, 0x7d, 0x39, 0x45, 0x8e, 0x60, 0x97, 0x9d,
+	0xc7, 0xc8, 0xbb, 0xd4, 0xf7, 0x39, 0x0a, 0x61, 0x56, 0x94, 0xa6, 0xae, 0x92, 0x27, 0x69, 0xae,
+	0x65, 0x42, 0x63, 0xb5, 0xbc, 0x48, 0x58, 0x2c, 0xb0, 0xf5, 0xdd, 0x80, 0x3b, 0x1d, 0x31, 0x38,
+	0xf1, 0xfd, 0xf7, 0x3c, 0x90, 0xc8, 0x37, 0xe4, 0x32, 0xe1, 0x46, 0xc4, 0xe2, 0xe0, 0x0c, 0xb9,
+	0x66, 0x9a, 0x87, 0xab, 0xc4, 0x95, 0x3c, 0xf1, 0x31, 0xec, 0x9d, 0xab, 0x5a, 0x0b, 0xe4, 0x2d,
+	0x25, 0xda, 0x4d, 0xb3, 0x9a, 0x39, 0x6f, 0x6c, 0xbb, 0xc0, 0x58, 0x03, 0xf6, 0xb3, 0xf4, 0xda,
+	0xd6, 0x57, 0x43, 0x39, 0x7e, 0x85, 0x21, 0x4a, 0xfc, 0x2f, 0x67, 0x79, 0xba, 0xf2, 0x46, 0x74,
+	0x45, 0xc7, 0x7e, 0x0f, 0x0e, 0x72, 0x10, 0x1a, 0xf0, 0xe7, 0xe2, 0xdc, 0x5d, 0xf4, 0x18, 0xf7,
+	0x37, 0xa4, 0xbb, 0x05, 0x95, 0x33, 0x1c, 0x2b, 0xa4, 0xba, 0x3b, 0xfb, 0x24, 0xfb, 0xb0, 0x3d,
+	0xa2, 0xe1, 0x10, 0x15, 0x40, 0xdd, 0x4d, 0x83, 0xeb, 0x3c, 0x63, 0xf2, 0x04, 0x6e, 0xf7, 0x11,
+	0xbb, 0x09, 0x1d, 0x2f, 0x09, 0xab, 0x4a, 0x78, 0xb3, 0x8f, 0x78, 0x3a, 0xcb, 0xcf, 0x1d, 0xf3,
+	0xf9, 0x7d, 0xcc, 0x5d, 0xa5, 0x76, 0xf3, 0x85, 0x8c, 0x82, 0x42, 0x59, 0xef, 0xe5, 0x55, 0xef,
+	0x0d, 0xa8, 0xb2, 0x7e, 0x5f, 0xa0, 0x54, 0x56, 0xb7, 0x5c, 0x1d, 0xb5, 0xff, 0x94, 0xa1, 0xd2,
+	0x11, 0x03, 0xf2, 0x11, 0x76, 0x96, 0x3a, 0x9c, 0x1c, 0xdb, 0xd9, 0x19, 0xb4, 0x0b, 0x07, 0xb0,
+	0xf9, 0x70, 0x9d, 0x4c, 0x3b, 0x78, 0x07, 0xb5, 0x45, 0x9b, 0x91, 0xa3, 0x82, 0x9f, 0x56, 0x47,
+	0xa8, 0xf9, 0xe0, 0xdf, 0x22, 0xbd, 0x6f, 0x17, 0xea, 0xcb, 0x0d, 0x42, 0x8a, 0x78, 0x0a, 0xda,
+	0xb8, 0xf9, 0x68, 0xad, 0x2e, 0x03, 0x9e, 0xde, 0xc7, 0x55, 0xe0, 0x99, 0x1e, 0xbc, 0x0a, 0x3c,
+	0x7b, 0xa5, 0x2f, 0x5e, 0xff, 0x98, 0x58, 0xc6, 0xe5, 0xc4, 0x32, 0x7e, 0x4f, 0x2c, 0xe3, 0xdb,
+	0xd4, 0x2a, 0x5d, 0x4e, 0xad, 0xd2, 0xaf, 0xa9, 0x55, 0x3a, 0x35, 0x3e, 0x3c, 0x1d, 0x04, 0xf2,
+	0xd3, 0xb0, 0x67, 0x7b, 0x2c, 0x72, 0x22, 0xf4, 0x83, 0x5e, 0xc8, 0x3c, 0x47, 0x6f, 0xfa, 0xcc,
+	0x63, 0x1c, 0x9d, 0x0b, 0xf5, 0x64, 0xca, 0x71, 0x82, 0xa2, 0x57, 0x55, 0x6f, 0xe6, 0xf3, 0xbf,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x60, 0xa2, 0xc4, 0x4e, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -540,197 +540,197 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// MsgServiceClient is the client API for MsgService service.
+// MsgClient is the client API for Msg service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type MsgServiceClient interface {
+type MsgClient interface {
 	// CreateTopic defines a method for creating a topic.
-	CreateTopic(ctx context.Context, in *MsgServiceCreateTopicRequest, opts ...grpc.CallOption) (*MsgServiceCreateTopicResponse, error)
+	CreateTopic(ctx context.Context, in *MsgCreateTopicRequest, opts ...grpc.CallOption) (*MsgCreateTopicResponse, error)
 	// AddWriter defines a method for adding a writer to the topic.
-	AddWriter(ctx context.Context, in *MsgServiceAddWriterRequest, opts ...grpc.CallOption) (*MsgServiceAddWriterResponse, error)
+	AddWriter(ctx context.Context, in *MsgAddWriterRequest, opts ...grpc.CallOption) (*MsgAddWriterResponse, error)
 	// DeleteWriter defines a method for deleting a writer to the topic.
-	DeleteWriter(ctx context.Context, in *MsgServiceDeleteWriterRequest, opts ...grpc.CallOption) (*MsgServiceDeleteWriterResponse, error)
+	DeleteWriter(ctx context.Context, in *MsgDeleteWriterRequest, opts ...grpc.CallOption) (*MsgDeleteWriterResponse, error)
 	// AddRecord defines a method for adding a record to the topic with the
 	// writer.
-	AddRecord(ctx context.Context, in *MsgServiceAddRecordRequest, opts ...grpc.CallOption) (*MsgServiceAddRecordResponse, error)
+	AddRecord(ctx context.Context, in *MsgAddRecordRequest, opts ...grpc.CallOption) (*MsgAddRecordResponse, error)
 }
 
-type msgServiceClient struct {
+type msgClient struct {
 	cc grpc1.ClientConn
 }
 
-func NewMsgServiceClient(cc grpc1.ClientConn) MsgServiceClient {
-	return &msgServiceClient{cc}
+func NewMsgClient(cc grpc1.ClientConn) MsgClient {
+	return &msgClient{cc}
 }
 
-func (c *msgServiceClient) CreateTopic(ctx context.Context, in *MsgServiceCreateTopicRequest, opts ...grpc.CallOption) (*MsgServiceCreateTopicResponse, error) {
-	out := new(MsgServiceCreateTopicResponse)
-	err := c.cc.Invoke(ctx, "/panacea.aol.v2.MsgService/CreateTopic", in, out, opts...)
+func (c *msgClient) CreateTopic(ctx context.Context, in *MsgCreateTopicRequest, opts ...grpc.CallOption) (*MsgCreateTopicResponse, error) {
+	out := new(MsgCreateTopicResponse)
+	err := c.cc.Invoke(ctx, "/panacea.aol.v2.Msg/CreateTopic", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) AddWriter(ctx context.Context, in *MsgServiceAddWriterRequest, opts ...grpc.CallOption) (*MsgServiceAddWriterResponse, error) {
-	out := new(MsgServiceAddWriterResponse)
-	err := c.cc.Invoke(ctx, "/panacea.aol.v2.MsgService/AddWriter", in, out, opts...)
+func (c *msgClient) AddWriter(ctx context.Context, in *MsgAddWriterRequest, opts ...grpc.CallOption) (*MsgAddWriterResponse, error) {
+	out := new(MsgAddWriterResponse)
+	err := c.cc.Invoke(ctx, "/panacea.aol.v2.Msg/AddWriter", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) DeleteWriter(ctx context.Context, in *MsgServiceDeleteWriterRequest, opts ...grpc.CallOption) (*MsgServiceDeleteWriterResponse, error) {
-	out := new(MsgServiceDeleteWriterResponse)
-	err := c.cc.Invoke(ctx, "/panacea.aol.v2.MsgService/DeleteWriter", in, out, opts...)
+func (c *msgClient) DeleteWriter(ctx context.Context, in *MsgDeleteWriterRequest, opts ...grpc.CallOption) (*MsgDeleteWriterResponse, error) {
+	out := new(MsgDeleteWriterResponse)
+	err := c.cc.Invoke(ctx, "/panacea.aol.v2.Msg/DeleteWriter", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) AddRecord(ctx context.Context, in *MsgServiceAddRecordRequest, opts ...grpc.CallOption) (*MsgServiceAddRecordResponse, error) {
-	out := new(MsgServiceAddRecordResponse)
-	err := c.cc.Invoke(ctx, "/panacea.aol.v2.MsgService/AddRecord", in, out, opts...)
+func (c *msgClient) AddRecord(ctx context.Context, in *MsgAddRecordRequest, opts ...grpc.CallOption) (*MsgAddRecordResponse, error) {
+	out := new(MsgAddRecordResponse)
+	err := c.cc.Invoke(ctx, "/panacea.aol.v2.Msg/AddRecord", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// MsgServiceServer is the server API for MsgService service.
-type MsgServiceServer interface {
+// MsgServer is the server API for Msg service.
+type MsgServer interface {
 	// CreateTopic defines a method for creating a topic.
-	CreateTopic(context.Context, *MsgServiceCreateTopicRequest) (*MsgServiceCreateTopicResponse, error)
+	CreateTopic(context.Context, *MsgCreateTopicRequest) (*MsgCreateTopicResponse, error)
 	// AddWriter defines a method for adding a writer to the topic.
-	AddWriter(context.Context, *MsgServiceAddWriterRequest) (*MsgServiceAddWriterResponse, error)
+	AddWriter(context.Context, *MsgAddWriterRequest) (*MsgAddWriterResponse, error)
 	// DeleteWriter defines a method for deleting a writer to the topic.
-	DeleteWriter(context.Context, *MsgServiceDeleteWriterRequest) (*MsgServiceDeleteWriterResponse, error)
+	DeleteWriter(context.Context, *MsgDeleteWriterRequest) (*MsgDeleteWriterResponse, error)
 	// AddRecord defines a method for adding a record to the topic with the
 	// writer.
-	AddRecord(context.Context, *MsgServiceAddRecordRequest) (*MsgServiceAddRecordResponse, error)
+	AddRecord(context.Context, *MsgAddRecordRequest) (*MsgAddRecordResponse, error)
 }
 
-// UnimplementedMsgServiceServer can be embedded to have forward compatible implementations.
-type UnimplementedMsgServiceServer struct {
+// UnimplementedMsgServer can be embedded to have forward compatible implementations.
+type UnimplementedMsgServer struct {
 }
 
-func (*UnimplementedMsgServiceServer) CreateTopic(ctx context.Context, req *MsgServiceCreateTopicRequest) (*MsgServiceCreateTopicResponse, error) {
+func (*UnimplementedMsgServer) CreateTopic(ctx context.Context, req *MsgCreateTopicRequest) (*MsgCreateTopicResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTopic not implemented")
 }
-func (*UnimplementedMsgServiceServer) AddWriter(ctx context.Context, req *MsgServiceAddWriterRequest) (*MsgServiceAddWriterResponse, error) {
+func (*UnimplementedMsgServer) AddWriter(ctx context.Context, req *MsgAddWriterRequest) (*MsgAddWriterResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddWriter not implemented")
 }
-func (*UnimplementedMsgServiceServer) DeleteWriter(ctx context.Context, req *MsgServiceDeleteWriterRequest) (*MsgServiceDeleteWriterResponse, error) {
+func (*UnimplementedMsgServer) DeleteWriter(ctx context.Context, req *MsgDeleteWriterRequest) (*MsgDeleteWriterResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteWriter not implemented")
 }
-func (*UnimplementedMsgServiceServer) AddRecord(ctx context.Context, req *MsgServiceAddRecordRequest) (*MsgServiceAddRecordResponse, error) {
+func (*UnimplementedMsgServer) AddRecord(ctx context.Context, req *MsgAddRecordRequest) (*MsgAddRecordResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddRecord not implemented")
 }
 
-func RegisterMsgServiceServer(s grpc1.Server, srv MsgServiceServer) {
-	s.RegisterService(&_MsgService_serviceDesc, srv)
+func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
+	s.RegisterService(&_Msg_serviceDesc, srv)
 }
 
-func _MsgService_CreateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceCreateTopicRequest)
+func _Msg_CreateTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgCreateTopicRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).CreateTopic(ctx, in)
+		return srv.(MsgServer).CreateTopic(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.aol.v2.MsgService/CreateTopic",
+		FullMethod: "/panacea.aol.v2.Msg/CreateTopic",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).CreateTopic(ctx, req.(*MsgServiceCreateTopicRequest))
+		return srv.(MsgServer).CreateTopic(ctx, req.(*MsgCreateTopicRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_AddWriter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceAddWriterRequest)
+func _Msg_AddWriter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgAddWriterRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).AddWriter(ctx, in)
+		return srv.(MsgServer).AddWriter(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.aol.v2.MsgService/AddWriter",
+		FullMethod: "/panacea.aol.v2.Msg/AddWriter",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).AddWriter(ctx, req.(*MsgServiceAddWriterRequest))
+		return srv.(MsgServer).AddWriter(ctx, req.(*MsgAddWriterRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_DeleteWriter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceDeleteWriterRequest)
+func _Msg_DeleteWriter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgDeleteWriterRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).DeleteWriter(ctx, in)
+		return srv.(MsgServer).DeleteWriter(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.aol.v2.MsgService/DeleteWriter",
+		FullMethod: "/panacea.aol.v2.Msg/DeleteWriter",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).DeleteWriter(ctx, req.(*MsgServiceDeleteWriterRequest))
+		return srv.(MsgServer).DeleteWriter(ctx, req.(*MsgDeleteWriterRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_AddRecord_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceAddRecordRequest)
+func _Msg_AddRecord_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgAddRecordRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).AddRecord(ctx, in)
+		return srv.(MsgServer).AddRecord(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.aol.v2.MsgService/AddRecord",
+		FullMethod: "/panacea.aol.v2.Msg/AddRecord",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).AddRecord(ctx, req.(*MsgServiceAddRecordRequest))
+		return srv.(MsgServer).AddRecord(ctx, req.(*MsgAddRecordRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _MsgService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "panacea.aol.v2.MsgService",
-	HandlerType: (*MsgServiceServer)(nil),
+var _Msg_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "panacea.aol.v2.Msg",
+	HandlerType: (*MsgServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
 			MethodName: "CreateTopic",
-			Handler:    _MsgService_CreateTopic_Handler,
+			Handler:    _Msg_CreateTopic_Handler,
 		},
 		{
 			MethodName: "AddWriter",
-			Handler:    _MsgService_AddWriter_Handler,
+			Handler:    _Msg_AddWriter_Handler,
 		},
 		{
 			MethodName: "DeleteWriter",
-			Handler:    _MsgService_DeleteWriter_Handler,
+			Handler:    _Msg_DeleteWriter_Handler,
 		},
 		{
 			MethodName: "AddRecord",
-			Handler:    _MsgService_AddRecord_Handler,
+			Handler:    _Msg_AddRecord_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "panacea/aol/v2/tx.proto",
 }
 
-func (m *MsgServiceCreateTopicRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateTopicRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -740,12 +740,12 @@ func (m *MsgServiceCreateTopicRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateTopicRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateTopicRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateTopicRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateTopicRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -774,7 +774,7 @@ func (m *MsgServiceCreateTopicRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceCreateTopicResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateTopicResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -784,12 +784,12 @@ func (m *MsgServiceCreateTopicResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateTopicResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateTopicResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateTopicResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateTopicResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -797,7 +797,7 @@ func (m *MsgServiceCreateTopicResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceAddWriterRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgAddWriterRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -807,12 +807,12 @@ func (m *MsgServiceAddWriterRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceAddWriterRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgAddWriterRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceAddWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgAddWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -855,7 +855,7 @@ func (m *MsgServiceAddWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceAddWriterResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgAddWriterResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -865,12 +865,12 @@ func (m *MsgServiceAddWriterResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceAddWriterResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgAddWriterResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceAddWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgAddWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -878,7 +878,7 @@ func (m *MsgServiceAddWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeleteWriterRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteWriterRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -888,12 +888,12 @@ func (m *MsgServiceDeleteWriterRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeleteWriterRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteWriterRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeleteWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -922,7 +922,7 @@ func (m *MsgServiceDeleteWriterRequest) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeleteWriterResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteWriterResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -932,12 +932,12 @@ func (m *MsgServiceDeleteWriterResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeleteWriterResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteWriterResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeleteWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -945,7 +945,7 @@ func (m *MsgServiceDeleteWriterResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceAddRecordRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgAddRecordRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -955,12 +955,12 @@ func (m *MsgServiceAddRecordRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceAddRecordRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgAddRecordRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceAddRecordRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgAddRecordRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1010,7 +1010,7 @@ func (m *MsgServiceAddRecordRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceAddRecordResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgAddRecordResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1020,12 +1020,12 @@ func (m *MsgServiceAddRecordResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceAddRecordResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgAddRecordResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceAddRecordResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgAddRecordResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1063,7 +1063,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *MsgServiceCreateTopicRequest) Size() (n int) {
+func (m *MsgCreateTopicRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1084,7 +1084,7 @@ func (m *MsgServiceCreateTopicRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceCreateTopicResponse) Size() (n int) {
+func (m *MsgCreateTopicResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1093,7 +1093,7 @@ func (m *MsgServiceCreateTopicResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceAddWriterRequest) Size() (n int) {
+func (m *MsgAddWriterRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1122,7 +1122,7 @@ func (m *MsgServiceAddWriterRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceAddWriterResponse) Size() (n int) {
+func (m *MsgAddWriterResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1131,7 +1131,7 @@ func (m *MsgServiceAddWriterResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeleteWriterRequest) Size() (n int) {
+func (m *MsgDeleteWriterRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1152,7 +1152,7 @@ func (m *MsgServiceDeleteWriterRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeleteWriterResponse) Size() (n int) {
+func (m *MsgDeleteWriterResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1161,7 +1161,7 @@ func (m *MsgServiceDeleteWriterResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceAddRecordRequest) Size() (n int) {
+func (m *MsgAddRecordRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1194,7 +1194,7 @@ func (m *MsgServiceAddRecordRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceAddRecordResponse) Size() (n int) {
+func (m *MsgAddRecordResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1220,7 +1220,7 @@ func sovTx(x uint64) (n int) {
 func sozTx(x uint64) (n int) {
 	return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *MsgServiceCreateTopicRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateTopicRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1243,10 +1243,10 @@ func (m *MsgServiceCreateTopicRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateTopicRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateTopicRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateTopicRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateTopicRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1366,7 +1366,7 @@ func (m *MsgServiceCreateTopicRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceCreateTopicResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateTopicResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1389,10 +1389,10 @@ func (m *MsgServiceCreateTopicResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateTopicResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateTopicResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateTopicResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateTopicResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -1416,7 +1416,7 @@ func (m *MsgServiceCreateTopicResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceAddWriterRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgAddWriterRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1439,10 +1439,10 @@ func (m *MsgServiceAddWriterRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceAddWriterRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgAddWriterRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceAddWriterRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgAddWriterRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1626,7 +1626,7 @@ func (m *MsgServiceAddWriterRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceAddWriterResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgAddWriterResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1649,10 +1649,10 @@ func (m *MsgServiceAddWriterResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceAddWriterResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgAddWriterResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceAddWriterResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgAddWriterResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -1676,7 +1676,7 @@ func (m *MsgServiceAddWriterResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeleteWriterRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteWriterRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1699,10 +1699,10 @@ func (m *MsgServiceDeleteWriterRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeleteWriterRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteWriterRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeleteWriterRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteWriterRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1822,7 +1822,7 @@ func (m *MsgServiceDeleteWriterRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeleteWriterResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteWriterResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1845,10 +1845,10 @@ func (m *MsgServiceDeleteWriterResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeleteWriterResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteWriterResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeleteWriterResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteWriterResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -1872,7 +1872,7 @@ func (m *MsgServiceDeleteWriterResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceAddRecordRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgAddRecordRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1895,10 +1895,10 @@ func (m *MsgServiceAddRecordRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceAddRecordRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgAddRecordRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceAddRecordRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgAddRecordRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2118,7 +2118,7 @@ func (m *MsgServiceAddRecordRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceAddRecordResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgAddRecordResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2141,10 +2141,10 @@ func (m *MsgServiceAddRecordResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceAddRecordResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgAddRecordResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceAddRecordResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgAddRecordResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
diff --git a/x/did/client/cli/txDID.go b/x/did/client/cli/txDID.go
index 095761cb..311de497 100644
--- a/x/did/client/cli/txDID.go
+++ b/x/did/client/cli/txDID.go
@@ -164,7 +164,7 @@ func CmdDeactivateDID() *cobra.Command {
 			}
 
 			fromAddress := clientCtx.GetFromAddress()
-			msg := types.NewMsgServiceDeactivateDIDRequest(did, verificationMethodID, sig, fromAddress.String())
+			msg := types.NewMsgDeactivateDIDRequest(did, verificationMethodID, sig, fromAddress.String())
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}
@@ -254,7 +254,7 @@ func getCheckPassword(reader *bufio.Reader) (string, error) {
 // newMsgCreateDID creates a MsgCreateDID by generating a DID and a DID document from the networkID and privKey.
 // It generates the minimal DID document which contains only one public key information,
 // so that it can be extended by MsgUpdateDID later.
-func newMsgCreateDID(fromAddress sdk.AccAddress, privKey secp256k1.PrivKey) (types.MsgServiceCreateDIDRequest, error) {
+func newMsgCreateDID(fromAddress sdk.AccAddress, privKey secp256k1.PrivKey) (types.MsgCreateDIDRequest, error) {
 	pubKey := secp256k1util.PubKeyBytes(secp256k1util.DerivePubKey(privKey))
 	did := types.NewDID(pubKey)
 	verificationMethodID := types.NewVerificationMethodID(did, "key1")
@@ -270,12 +270,12 @@ func newMsgCreateDID(fromAddress sdk.AccAddress, privKey secp256k1.PrivKey) (typ
 
 	sig, err := types.Sign(&doc, types.InitialSequence, privKey)
 	if err != nil {
-		return types.MsgServiceCreateDIDRequest{}, err
+		return types.MsgCreateDIDRequest{}, err
 	}
 
-	msg := types.NewMsgServiceCreateDIDResponse(did, doc, verificationMethodID, sig, fromAddress.String())
+	msg := types.NewMsgCreateDIDResponse(did, doc, verificationMethodID, sig, fromAddress.String())
 	if err := msg.ValidateBasic(); err != nil {
-		return types.MsgServiceCreateDIDRequest{}, err
+		return types.MsgCreateDIDRequest{}, err
 	}
 	return msg, nil
 }
diff --git a/x/did/keeper/msg_server.go b/x/did/keeper/msg_server.go
index 89a89e7d..c1b3a543 100644
--- a/x/did/keeper/msg_server.go
+++ b/x/did/keeper/msg_server.go
@@ -6,8 +6,8 @@ type msgServer struct {
 	Keeper
 }
 
-func NewMsgServerImpl(keeper Keeper) types.MsgServiceServer {
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
 	return &msgServer{Keeper: keeper}
 }
 
-var _ types.MsgServiceServer = msgServer{}
+var _ types.MsgServer = msgServer{}
diff --git a/x/did/keeper/msg_server_did.go b/x/did/keeper/msg_server_did.go
index 47b4034c..f09f2cda 100644
--- a/x/did/keeper/msg_server_did.go
+++ b/x/did/keeper/msg_server_did.go
@@ -9,7 +9,7 @@ import (
 	"github.com/medibloc/panacea-core/v2/x/did/types"
 )
 
-func (m msgServer) CreateDID(goCtx context.Context, msg *types.MsgServiceCreateDIDRequest) (*types.MsgServiceCreateDIDResponse, error) {
+func (m msgServer) CreateDID(goCtx context.Context, msg *types.MsgCreateDIDRequest) (*types.MsgCreateDIDResponse, error) {
 	keeper := m.Keeper
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
@@ -29,10 +29,10 @@ func (m msgServer) CreateDID(goCtx context.Context, msg *types.MsgServiceCreateD
 
 	docWithSeq := types.NewDIDDocumentWithSeq(msg.Document, uint64(seq))
 	keeper.SetDIDDocument(ctx, msg.Did, docWithSeq)
-	return &types.MsgServiceCreateDIDResponse{}, nil
+	return &types.MsgCreateDIDResponse{}, nil
 }
 
-func (m msgServer) UpdateDID(goCtx context.Context, msg *types.MsgServiceUpdateDIDRequest) (*types.MsgServiceUpdateDIDResponse, error) {
+func (m msgServer) UpdateDID(goCtx context.Context, msg *types.MsgUpdateDIDRequest) (*types.MsgUpdateDIDResponse, error) {
 	keeper := m.Keeper
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
@@ -51,10 +51,10 @@ func (m msgServer) UpdateDID(goCtx context.Context, msg *types.MsgServiceUpdateD
 
 	newDocWithSeq := types.NewDIDDocumentWithSeq(msg.Document, newSeq)
 	keeper.SetDIDDocument(ctx, msg.Did, newDocWithSeq)
-	return &types.MsgServiceUpdateDIDResponse{}, nil
+	return &types.MsgUpdateDIDResponse{}, nil
 }
 
-func (m msgServer) DeactivateDID(goCtx context.Context, msg *types.MsgServiceDeactivateDIDRequest) (*types.MsgServiceDeactivateDIDResponse, error) {
+func (m msgServer) DeactivateDID(goCtx context.Context, msg *types.MsgDeactivateDIDRequest) (*types.MsgDeactivateDIDResponse, error) {
 	keeper := m.Keeper
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
@@ -76,7 +76,7 @@ func (m msgServer) DeactivateDID(goCtx context.Context, msg *types.MsgServiceDea
 	}
 
 	keeper.SetDIDDocument(ctx, msg.Did, docWithSeq.Deactivate(newSeq))
-	return &types.MsgServiceDeactivateDIDResponse{}, nil
+	return &types.MsgDeactivateDIDResponse{}, nil
 
 }
 
diff --git a/x/did/keeper/msg_server_did_test.go b/x/did/keeper/msg_server_did_test.go
index a9815038..e1139f2d 100644
--- a/x/did/keeper/msg_server_did_test.go
+++ b/x/did/keeper/msg_server_did_test.go
@@ -90,7 +90,7 @@ func (suite *msgServerTestSuite) TestHandleMsgCreateDID_SigVerificationFailed()
 	sig, _ := types.Sign(doc, types.InitialSequence, privKey)
 	sig[0] += 1 // pollute the signature
 
-	msg := types.NewMsgServiceCreateDIDResponse(did, *doc, veriMethodID, sig, sdk.AccAddress{}.String())
+	msg := types.NewMsgCreateDIDResponse(did, *doc, veriMethodID, sig, sdk.AccAddress{}.String())
 
 	res, err := didMsgServer.CreateDID(goContext, &msg)
 	suite.Require().ErrorIs(types.ErrSigVerificationFailed, err)
@@ -263,7 +263,7 @@ func (suite *msgServerTestSuite) TestHandleMsgDeactivateDID_SigVerificationFaile
 	sig, _ := types.Sign(&doc, docWithSeq.Sequence, privKey)
 	sig[0] += 1 // pollute the signature
 
-	deactivateMsg := types.NewMsgServiceDeactivateDIDRequest(did, verificationMethodID, sig, sdk.AccAddress{}.String())
+	deactivateMsg := types.NewMsgDeactivateDIDRequest(did, verificationMethodID, sig, sdk.AccAddress{}.String())
 	deactivateRes, err := didMsgServer.DeactivateDID(goContext, deactivateMsg)
 	suite.Require().Nil(deactivateRes)
 	suite.Require().ErrorIs(types.ErrSigVerificationFailed, err)
@@ -320,24 +320,24 @@ func (suite *msgServerTestSuite) newDIDDocumentWithSeq(did string) (types.DIDDoc
 	return docWithSeq, privKey
 }
 
-func newMsgCreateDID(suite *msgServerTestSuite, doc types.DIDDocument, verificationMethodID string, privKey crypto.PrivKey) types.MsgServiceCreateDIDRequest {
+func newMsgCreateDID(suite *msgServerTestSuite, doc types.DIDDocument, verificationMethodID string, privKey crypto.PrivKey) types.MsgCreateDIDRequest {
 	sig, err := types.Sign(&doc, types.InitialSequence, privKey)
 	suite.Require().NoError(err)
-	return types.NewMsgServiceCreateDIDResponse(doc.Id, doc, verificationMethodID, sig, sdk.AccAddress{}.String())
+	return types.NewMsgCreateDIDResponse(doc.Id, doc, verificationMethodID, sig, sdk.AccAddress{}.String())
 }
 
-func newMsgUpdateDID(suite *msgServerTestSuite, newDoc types.DIDDocument, verificationMethodID string, privKey crypto.PrivKey, seq uint64) types.MsgServiceUpdateDIDRequest {
+func newMsgUpdateDID(suite *msgServerTestSuite, newDoc types.DIDDocument, verificationMethodID string, privKey crypto.PrivKey, seq uint64) types.MsgUpdateDIDRequest {
 	sig, err := types.Sign(&newDoc, seq, privKey)
 	suite.Require().NoError(err)
 	return *types.NewMsgUpdateDID(newDoc.Id, newDoc, verificationMethodID, sig, sdk.AccAddress{}.String())
 }
 
-func newMsgDeactivateDID(suite *msgServerTestSuite, did string, verificationMethodID string, privKey crypto.PrivKey, seq uint64) types.MsgServiceDeactivateDIDRequest {
+func newMsgDeactivateDID(suite *msgServerTestSuite, did string, verificationMethodID string, privKey crypto.PrivKey, seq uint64) types.MsgDeactivateDIDRequest {
 	doc := types.DIDDocument{
 		Id: did,
 	}
 
 	sig, err := types.Sign(&doc, seq, privKey)
 	suite.Require().NoError(err)
-	return *types.NewMsgServiceDeactivateDIDRequest(did, verificationMethodID, sig, sdk.AccAddress{}.String())
+	return *types.NewMsgDeactivateDIDRequest(did, verificationMethodID, sig, sdk.AccAddress{}.String())
 }
diff --git a/x/did/module.go b/x/did/module.go
index 859a9457..315fe123 100644
--- a/x/did/module.go
+++ b/x/did/module.go
@@ -118,7 +118,7 @@ func (AppModule) QuerierRoute() string { return types.QuerierRoute }
 // module-specific GRPC queries.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
-	types.RegisterMsgServiceServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
+	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 }
 
 // RegisterInvariants registers the capability module's invariants.
diff --git a/x/did/types/codec.go b/x/did/types/codec.go
index 8c94f2b0..1d2422b6 100644
--- a/x/did/types/codec.go
+++ b/x/did/types/codec.go
@@ -9,20 +9,20 @@ import (
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
 	// this line is used by starport scaffolding # 2
-	cdc.RegisterConcrete(&MsgServiceCreateDIDRequest{}, "did/CreateDID", nil)
-	cdc.RegisterConcrete(&MsgServiceUpdateDIDRequest{}, "did/UpdateDID", nil)
-	cdc.RegisterConcrete(&MsgServiceDeactivateDIDRequest{}, "did/DeactivateDID", nil)
+	cdc.RegisterConcrete(&MsgCreateDIDRequest{}, "did/CreateDID", nil)
+	cdc.RegisterConcrete(&MsgUpdateDIDRequest{}, "did/UpdateDID", nil)
+	cdc.RegisterConcrete(&MsgDeactivateDIDRequest{}, "did/DeactivateDID", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	// this line is used by starport scaffolding # 3
 	registry.RegisterImplementations((*sdk.Msg)(nil),
-		&MsgServiceCreateDIDRequest{},
-		&MsgServiceUpdateDIDRequest{},
-		&MsgServiceDeactivateDIDRequest{},
+		&MsgCreateDIDRequest{},
+		&MsgUpdateDIDRequest{},
+		&MsgDeactivateDIDRequest{},
 	)
 
-	msgservice.RegisterMsgServiceDesc(registry, &_MsgService_serviceDesc)
+	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
 
 var (
diff --git a/x/did/types/messages_did.go b/x/did/types/messages_did.go
index 8f796f7e..9cd94fa1 100644
--- a/x/did/types/messages_did.go
+++ b/x/did/types/messages_did.go
@@ -6,10 +6,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var _ sdk.Msg = &MsgServiceCreateDIDRequest{}
+var _ sdk.Msg = &MsgCreateDIDRequest{}
 
-func NewMsgServiceCreateDIDResponse(did string, document DIDDocument, VerificationMethodID string, Signature []byte, FromAddress string) MsgServiceCreateDIDRequest {
-	return MsgServiceCreateDIDRequest{
+func NewMsgCreateDIDResponse(did string, document DIDDocument, VerificationMethodID string, Signature []byte, FromAddress string) MsgCreateDIDRequest {
+	return MsgCreateDIDRequest{
 		Did:                  did,
 		Document:             &document,
 		VerificationMethodId: VerificationMethodID,
@@ -18,15 +18,15 @@ func NewMsgServiceCreateDIDResponse(did string, document DIDDocument, Verificati
 	}
 }
 
-func (msg *MsgServiceCreateDIDRequest) Route() string {
+func (msg *MsgCreateDIDRequest) Route() string {
 	return RouterKey
 }
 
-func (msg *MsgServiceCreateDIDRequest) Type() string {
+func (msg *MsgCreateDIDRequest) Type() string {
 	return "create_did"
 }
 
-func (msg *MsgServiceCreateDIDRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgCreateDIDRequest) GetSigners() []sdk.AccAddress {
 	creator, err := sdk.AccAddressFromBech32(msg.FromAddress)
 	if err != nil {
 		panic(err)
@@ -34,11 +34,11 @@ func (msg *MsgServiceCreateDIDRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{creator}
 }
 
-func (msg *MsgServiceCreateDIDRequest) GetSignBytes() []byte {
+func (msg *MsgCreateDIDRequest) GetSignBytes() []byte {
 	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
 }
 
-func (msg *MsgServiceCreateDIDRequest) ValidateBasic() error {
+func (msg *MsgCreateDIDRequest) ValidateBasic() error {
 	if !ValidateDID(msg.Did) {
 		return errors.Wrapf(ErrInvalidDID, "did: %v", msg.Did)
 	}
@@ -59,11 +59,11 @@ func (msg *MsgServiceCreateDIDRequest) ValidateBasic() error {
 	return nil
 }
 
-var _ sdk.Msg = &MsgServiceUpdateDIDRequest{}
+var _ sdk.Msg = &MsgUpdateDIDRequest{}
 
 // NewMsgUpdateDID is a constructor of MsgUpdateDID.
-func NewMsgUpdateDID(did string, doc DIDDocument, verificationMethodID string, sig []byte, fromAddr string) *MsgServiceUpdateDIDRequest {
-	return &MsgServiceUpdateDIDRequest{
+func NewMsgUpdateDID(did string, doc DIDDocument, verificationMethodID string, sig []byte, fromAddr string) *MsgUpdateDIDRequest {
+	return &MsgUpdateDIDRequest{
 		Did:                  did,
 		Document:             &doc,
 		VerificationMethodId: verificationMethodID,
@@ -73,13 +73,13 @@ func NewMsgUpdateDID(did string, doc DIDDocument, verificationMethodID string, s
 }
 
 // Route returns the name of the module.
-func (msg *MsgServiceUpdateDIDRequest) Route() string { return RouterKey }
+func (msg *MsgUpdateDIDRequest) Route() string { return RouterKey }
 
 // Type returns the name of the action.
-func (msg *MsgServiceUpdateDIDRequest) Type() string { return "update_did" }
+func (msg *MsgUpdateDIDRequest) Type() string { return "update_did" }
 
 // ValidateBasic runs stateless checks on the message.
-func (msg *MsgServiceUpdateDIDRequest) ValidateBasic() error {
+func (msg *MsgUpdateDIDRequest) ValidateBasic() error {
 	if !ValidateDID(msg.Did) {
 		return errors.Wrapf(ErrInvalidDID, "DID: %v", msg.Did)
 	}
@@ -100,12 +100,12 @@ func (msg *MsgServiceUpdateDIDRequest) ValidateBasic() error {
 }
 
 // GetSignBytes returns the canonical byte representation of the message. Used to generate a signature.
-func (msg *MsgServiceUpdateDIDRequest) GetSignBytes() []byte {
+func (msg *MsgUpdateDIDRequest) GetSignBytes() []byte {
 	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
 }
 
 // GetSigners return the addresses of signers that must sign.
-func (msg *MsgServiceUpdateDIDRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgUpdateDIDRequest) GetSigners() []sdk.AccAddress {
 	creator, err := sdk.AccAddressFromBech32(msg.FromAddress)
 	if err != nil {
 		panic(err)
@@ -113,21 +113,21 @@ func (msg *MsgServiceUpdateDIDRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{creator}
 }
 
-var _ sdk.Msg = &MsgServiceDeactivateDIDRequest{}
+var _ sdk.Msg = &MsgDeactivateDIDRequest{}
 
-// NewMsgServiceDeactivateDIDRequest is a constructor of MsgDeactivateDID.
-func NewMsgServiceDeactivateDIDRequest(did string, verificationMethodID string, sig []byte, fromAddr string) *MsgServiceDeactivateDIDRequest {
-	return &MsgServiceDeactivateDIDRequest{did, verificationMethodID, sig, fromAddr}
+// NewMsgDeactivateDIDRequest is a constructor of MsgDeactivateDID.
+func NewMsgDeactivateDIDRequest(did string, verificationMethodID string, sig []byte, fromAddr string) *MsgDeactivateDIDRequest {
+	return &MsgDeactivateDIDRequest{did, verificationMethodID, sig, fromAddr}
 }
 
 // Route returns the name of the module.
-func (msg *MsgServiceDeactivateDIDRequest) Route() string { return RouterKey }
+func (msg *MsgDeactivateDIDRequest) Route() string { return RouterKey }
 
 // Type returns the name of the action.
-func (msg *MsgServiceDeactivateDIDRequest) Type() string { return "deactivate_did" }
+func (msg *MsgDeactivateDIDRequest) Type() string { return "deactivate_did" }
 
 // ValidateBasic runs stateless checks on the message.
-func (msg *MsgServiceDeactivateDIDRequest) ValidateBasic() error {
+func (msg *MsgDeactivateDIDRequest) ValidateBasic() error {
 	if !ValidateDID(msg.Did) {
 		return errors.Wrapf(ErrInvalidDID, "DID: %v", msg.Did)
 	}
@@ -146,12 +146,12 @@ func (msg *MsgServiceDeactivateDIDRequest) ValidateBasic() error {
 }
 
 // GetSignBytes returns the canonical byte representation of the message. Used to generate a signature.
-func (msg *MsgServiceDeactivateDIDRequest) GetSignBytes() []byte {
+func (msg *MsgDeactivateDIDRequest) GetSignBytes() []byte {
 	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
 }
 
 // GetSigners return the addresses of signers that must sign.
-func (msg *MsgServiceDeactivateDIDRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgDeactivateDIDRequest) GetSigners() []sdk.AccAddress {
 	creator, err := sdk.AccAddressFromBech32(msg.FromAddress)
 	if err != nil {
 		panic(err)
diff --git a/x/did/types/messages_did_test.go b/x/did/types/messages_did_test.go
index cffa338c..ccae8bbe 100644
--- a/x/did/types/messages_did_test.go
+++ b/x/did/types/messages_did_test.go
@@ -15,7 +15,7 @@ func TestMsgCreateDID(t *testing.T) {
 	sig := []byte("my-sig")
 	fromAddr := getFromAddress(t)
 
-	msg := types.NewMsgServiceCreateDIDResponse(doc.Id, doc, doc.VerificationMethods[0].Id, sig, fromAddr.String())
+	msg := types.NewMsgCreateDIDResponse(doc.Id, doc, doc.VerificationMethods[0].Id, sig, fromAddr.String())
 	require.Equal(t, doc.Id, msg.Did)
 	require.Equal(t, doc, *msg.Document)
 	require.Equal(t, doc.VerificationMethods[0].Id, msg.VerificationMethodId)
diff --git a/x/did/types/tx.pb.go b/x/did/types/tx.pb.go
index a36e151b..6c4fad58 100644
--- a/x/did/types/tx.pb.go
+++ b/x/did/types/tx.pb.go
@@ -28,7 +28,7 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // MsgCreateDID defines the Msg/CreateDID request type.
-type MsgServiceCreateDIDRequest struct {
+type MsgCreateDIDRequest struct {
 	Did                  string       `protobuf:"bytes,1,opt,name=did,proto3" json:"did,omitempty"`
 	Document             *DIDDocument `protobuf:"bytes,2,opt,name=document,proto3" json:"document,omitempty"`
 	VerificationMethodId string       `protobuf:"bytes,3,opt,name=verification_method_id,json=verificationMethodId,proto3" json:"verification_method_id,omitempty"`
@@ -36,18 +36,18 @@ type MsgServiceCreateDIDRequest struct {
 	FromAddress          string       `protobuf:"bytes,5,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
 }
 
-func (m *MsgServiceCreateDIDRequest) Reset()         { *m = MsgServiceCreateDIDRequest{} }
-func (m *MsgServiceCreateDIDRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateDIDRequest) ProtoMessage()    {}
-func (*MsgServiceCreateDIDRequest) Descriptor() ([]byte, []int) {
+func (m *MsgCreateDIDRequest) Reset()         { *m = MsgCreateDIDRequest{} }
+func (m *MsgCreateDIDRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateDIDRequest) ProtoMessage()    {}
+func (*MsgCreateDIDRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{0}
 }
-func (m *MsgServiceCreateDIDRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateDIDRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateDIDRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateDIDRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -57,47 +57,47 @@ func (m *MsgServiceCreateDIDRequest) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateDIDRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateDIDRequest.Merge(m, src)
+func (m *MsgCreateDIDRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateDIDRequest.Merge(m, src)
 }
-func (m *MsgServiceCreateDIDRequest) XXX_Size() int {
+func (m *MsgCreateDIDRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateDIDRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateDIDRequest.DiscardUnknown(m)
+func (m *MsgCreateDIDRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateDIDRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateDIDRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateDIDRequest proto.InternalMessageInfo
 
-func (m *MsgServiceCreateDIDRequest) GetDid() string {
+func (m *MsgCreateDIDRequest) GetDid() string {
 	if m != nil {
 		return m.Did
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDIDRequest) GetDocument() *DIDDocument {
+func (m *MsgCreateDIDRequest) GetDocument() *DIDDocument {
 	if m != nil {
 		return m.Document
 	}
 	return nil
 }
 
-func (m *MsgServiceCreateDIDRequest) GetVerificationMethodId() string {
+func (m *MsgCreateDIDRequest) GetVerificationMethodId() string {
 	if m != nil {
 		return m.VerificationMethodId
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDIDRequest) GetSignature() []byte {
+func (m *MsgCreateDIDRequest) GetSignature() []byte {
 	if m != nil {
 		return m.Signature
 	}
 	return nil
 }
 
-func (m *MsgServiceCreateDIDRequest) GetFromAddress() string {
+func (m *MsgCreateDIDRequest) GetFromAddress() string {
 	if m != nil {
 		return m.FromAddress
 	}
@@ -105,21 +105,21 @@ func (m *MsgServiceCreateDIDRequest) GetFromAddress() string {
 }
 
 // MsgCreateDIDResponse defines the Msg/CreateDID response type.
-type MsgServiceCreateDIDResponse struct {
+type MsgCreateDIDResponse struct {
 }
 
-func (m *MsgServiceCreateDIDResponse) Reset()         { *m = MsgServiceCreateDIDResponse{} }
-func (m *MsgServiceCreateDIDResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateDIDResponse) ProtoMessage()    {}
-func (*MsgServiceCreateDIDResponse) Descriptor() ([]byte, []int) {
+func (m *MsgCreateDIDResponse) Reset()         { *m = MsgCreateDIDResponse{} }
+func (m *MsgCreateDIDResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateDIDResponse) ProtoMessage()    {}
+func (*MsgCreateDIDResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{1}
 }
-func (m *MsgServiceCreateDIDResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateDIDResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateDIDResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateDIDResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -129,20 +129,20 @@ func (m *MsgServiceCreateDIDResponse) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateDIDResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateDIDResponse.Merge(m, src)
+func (m *MsgCreateDIDResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateDIDResponse.Merge(m, src)
 }
-func (m *MsgServiceCreateDIDResponse) XXX_Size() int {
+func (m *MsgCreateDIDResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateDIDResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateDIDResponse.DiscardUnknown(m)
+func (m *MsgCreateDIDResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateDIDResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateDIDResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateDIDResponse proto.InternalMessageInfo
 
 // MsgUpdateDID defines the Msg/UpdateDID request type.
-type MsgServiceUpdateDIDRequest struct {
+type MsgUpdateDIDRequest struct {
 	Did                  string       `protobuf:"bytes,1,opt,name=did,proto3" json:"did,omitempty"`
 	Document             *DIDDocument `protobuf:"bytes,2,opt,name=document,proto3" json:"document,omitempty"`
 	VerificationMethodId string       `protobuf:"bytes,3,opt,name=verification_method_id,json=verificationMethodId,proto3" json:"verification_method_id,omitempty"`
@@ -150,18 +150,18 @@ type MsgServiceUpdateDIDRequest struct {
 	FromAddress          string       `protobuf:"bytes,5,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
 }
 
-func (m *MsgServiceUpdateDIDRequest) Reset()         { *m = MsgServiceUpdateDIDRequest{} }
-func (m *MsgServiceUpdateDIDRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceUpdateDIDRequest) ProtoMessage()    {}
-func (*MsgServiceUpdateDIDRequest) Descriptor() ([]byte, []int) {
+func (m *MsgUpdateDIDRequest) Reset()         { *m = MsgUpdateDIDRequest{} }
+func (m *MsgUpdateDIDRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateDIDRequest) ProtoMessage()    {}
+func (*MsgUpdateDIDRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{2}
 }
-func (m *MsgServiceUpdateDIDRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgUpdateDIDRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceUpdateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgUpdateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceUpdateDIDRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgUpdateDIDRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -171,47 +171,47 @@ func (m *MsgServiceUpdateDIDRequest) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceUpdateDIDRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceUpdateDIDRequest.Merge(m, src)
+func (m *MsgUpdateDIDRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateDIDRequest.Merge(m, src)
 }
-func (m *MsgServiceUpdateDIDRequest) XXX_Size() int {
+func (m *MsgUpdateDIDRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceUpdateDIDRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceUpdateDIDRequest.DiscardUnknown(m)
+func (m *MsgUpdateDIDRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateDIDRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceUpdateDIDRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgUpdateDIDRequest proto.InternalMessageInfo
 
-func (m *MsgServiceUpdateDIDRequest) GetDid() string {
+func (m *MsgUpdateDIDRequest) GetDid() string {
 	if m != nil {
 		return m.Did
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDIDRequest) GetDocument() *DIDDocument {
+func (m *MsgUpdateDIDRequest) GetDocument() *DIDDocument {
 	if m != nil {
 		return m.Document
 	}
 	return nil
 }
 
-func (m *MsgServiceUpdateDIDRequest) GetVerificationMethodId() string {
+func (m *MsgUpdateDIDRequest) GetVerificationMethodId() string {
 	if m != nil {
 		return m.VerificationMethodId
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDIDRequest) GetSignature() []byte {
+func (m *MsgUpdateDIDRequest) GetSignature() []byte {
 	if m != nil {
 		return m.Signature
 	}
 	return nil
 }
 
-func (m *MsgServiceUpdateDIDRequest) GetFromAddress() string {
+func (m *MsgUpdateDIDRequest) GetFromAddress() string {
 	if m != nil {
 		return m.FromAddress
 	}
@@ -219,21 +219,21 @@ func (m *MsgServiceUpdateDIDRequest) GetFromAddress() string {
 }
 
 // MsgUpdateDIDResponse defines the Msg/UpdateDID response type.
-type MsgServiceUpdateDIDResponse struct {
+type MsgUpdateDIDResponse struct {
 }
 
-func (m *MsgServiceUpdateDIDResponse) Reset()         { *m = MsgServiceUpdateDIDResponse{} }
-func (m *MsgServiceUpdateDIDResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceUpdateDIDResponse) ProtoMessage()    {}
-func (*MsgServiceUpdateDIDResponse) Descriptor() ([]byte, []int) {
+func (m *MsgUpdateDIDResponse) Reset()         { *m = MsgUpdateDIDResponse{} }
+func (m *MsgUpdateDIDResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateDIDResponse) ProtoMessage()    {}
+func (*MsgUpdateDIDResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{3}
 }
-func (m *MsgServiceUpdateDIDResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgUpdateDIDResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceUpdateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgUpdateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceUpdateDIDResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgUpdateDIDResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -243,38 +243,38 @@ func (m *MsgServiceUpdateDIDResponse) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceUpdateDIDResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceUpdateDIDResponse.Merge(m, src)
+func (m *MsgUpdateDIDResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateDIDResponse.Merge(m, src)
 }
-func (m *MsgServiceUpdateDIDResponse) XXX_Size() int {
+func (m *MsgUpdateDIDResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceUpdateDIDResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceUpdateDIDResponse.DiscardUnknown(m)
+func (m *MsgUpdateDIDResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateDIDResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceUpdateDIDResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgUpdateDIDResponse proto.InternalMessageInfo
 
 // MsgDeactivateDID defines the Msg/DeactivateDID request type.
-type MsgServiceDeactivateDIDRequest struct {
+type MsgDeactivateDIDRequest struct {
 	Did                  string `protobuf:"bytes,1,opt,name=did,proto3" json:"did,omitempty"`
 	VerificationMethodId string `protobuf:"bytes,2,opt,name=verification_method_id,json=verificationMethodId,proto3" json:"verification_method_id,omitempty"`
 	Signature            []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
 	FromAddress          string `protobuf:"bytes,4,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
 }
 
-func (m *MsgServiceDeactivateDIDRequest) Reset()         { *m = MsgServiceDeactivateDIDRequest{} }
-func (m *MsgServiceDeactivateDIDRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeactivateDIDRequest) ProtoMessage()    {}
-func (*MsgServiceDeactivateDIDRequest) Descriptor() ([]byte, []int) {
+func (m *MsgDeactivateDIDRequest) Reset()         { *m = MsgDeactivateDIDRequest{} }
+func (m *MsgDeactivateDIDRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgDeactivateDIDRequest) ProtoMessage()    {}
+func (*MsgDeactivateDIDRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{4}
 }
-func (m *MsgServiceDeactivateDIDRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeactivateDIDRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeactivateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeactivateDIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeactivateDIDRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeactivateDIDRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -284,40 +284,40 @@ func (m *MsgServiceDeactivateDIDRequest) XXX_Marshal(b []byte, deterministic boo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeactivateDIDRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeactivateDIDRequest.Merge(m, src)
+func (m *MsgDeactivateDIDRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeactivateDIDRequest.Merge(m, src)
 }
-func (m *MsgServiceDeactivateDIDRequest) XXX_Size() int {
+func (m *MsgDeactivateDIDRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeactivateDIDRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeactivateDIDRequest.DiscardUnknown(m)
+func (m *MsgDeactivateDIDRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeactivateDIDRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeactivateDIDRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeactivateDIDRequest proto.InternalMessageInfo
 
-func (m *MsgServiceDeactivateDIDRequest) GetDid() string {
+func (m *MsgDeactivateDIDRequest) GetDid() string {
 	if m != nil {
 		return m.Did
 	}
 	return ""
 }
 
-func (m *MsgServiceDeactivateDIDRequest) GetVerificationMethodId() string {
+func (m *MsgDeactivateDIDRequest) GetVerificationMethodId() string {
 	if m != nil {
 		return m.VerificationMethodId
 	}
 	return ""
 }
 
-func (m *MsgServiceDeactivateDIDRequest) GetSignature() []byte {
+func (m *MsgDeactivateDIDRequest) GetSignature() []byte {
 	if m != nil {
 		return m.Signature
 	}
 	return nil
 }
 
-func (m *MsgServiceDeactivateDIDRequest) GetFromAddress() string {
+func (m *MsgDeactivateDIDRequest) GetFromAddress() string {
 	if m != nil {
 		return m.FromAddress
 	}
@@ -325,21 +325,21 @@ func (m *MsgServiceDeactivateDIDRequest) GetFromAddress() string {
 }
 
 // MsgDeactivateDIDResponse defines the Msg/DeactivateDID response type.
-type MsgServiceDeactivateDIDResponse struct {
+type MsgDeactivateDIDResponse struct {
 }
 
-func (m *MsgServiceDeactivateDIDResponse) Reset()         { *m = MsgServiceDeactivateDIDResponse{} }
-func (m *MsgServiceDeactivateDIDResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeactivateDIDResponse) ProtoMessage()    {}
-func (*MsgServiceDeactivateDIDResponse) Descriptor() ([]byte, []int) {
+func (m *MsgDeactivateDIDResponse) Reset()         { *m = MsgDeactivateDIDResponse{} }
+func (m *MsgDeactivateDIDResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgDeactivateDIDResponse) ProtoMessage()    {}
+func (*MsgDeactivateDIDResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_c90e89c02ae9a760, []int{5}
 }
-func (m *MsgServiceDeactivateDIDResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeactivateDIDResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeactivateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeactivateDIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeactivateDIDResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeactivateDIDResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -349,58 +349,58 @@ func (m *MsgServiceDeactivateDIDResponse) XXX_Marshal(b []byte, deterministic bo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeactivateDIDResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeactivateDIDResponse.Merge(m, src)
+func (m *MsgDeactivateDIDResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeactivateDIDResponse.Merge(m, src)
 }
-func (m *MsgServiceDeactivateDIDResponse) XXX_Size() int {
+func (m *MsgDeactivateDIDResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeactivateDIDResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeactivateDIDResponse.DiscardUnknown(m)
+func (m *MsgDeactivateDIDResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeactivateDIDResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeactivateDIDResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeactivateDIDResponse proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MsgServiceCreateDIDRequest)(nil), "panacea.did.v2.MsgServiceCreateDIDRequest")
-	proto.RegisterType((*MsgServiceCreateDIDResponse)(nil), "panacea.did.v2.MsgServiceCreateDIDResponse")
-	proto.RegisterType((*MsgServiceUpdateDIDRequest)(nil), "panacea.did.v2.MsgServiceUpdateDIDRequest")
-	proto.RegisterType((*MsgServiceUpdateDIDResponse)(nil), "panacea.did.v2.MsgServiceUpdateDIDResponse")
-	proto.RegisterType((*MsgServiceDeactivateDIDRequest)(nil), "panacea.did.v2.MsgServiceDeactivateDIDRequest")
-	proto.RegisterType((*MsgServiceDeactivateDIDResponse)(nil), "panacea.did.v2.MsgServiceDeactivateDIDResponse")
+	proto.RegisterType((*MsgCreateDIDRequest)(nil), "panacea.did.v2.MsgCreateDIDRequest")
+	proto.RegisterType((*MsgCreateDIDResponse)(nil), "panacea.did.v2.MsgCreateDIDResponse")
+	proto.RegisterType((*MsgUpdateDIDRequest)(nil), "panacea.did.v2.MsgUpdateDIDRequest")
+	proto.RegisterType((*MsgUpdateDIDResponse)(nil), "panacea.did.v2.MsgUpdateDIDResponse")
+	proto.RegisterType((*MsgDeactivateDIDRequest)(nil), "panacea.did.v2.MsgDeactivateDIDRequest")
+	proto.RegisterType((*MsgDeactivateDIDResponse)(nil), "panacea.did.v2.MsgDeactivateDIDResponse")
 }
 
 func init() { proto.RegisterFile("panacea/did/v2/tx.proto", fileDescriptor_c90e89c02ae9a760) }
 
 var fileDescriptor_c90e89c02ae9a760 = []byte{
-	// 422 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x94, 0xcb, 0x8e, 0xd3, 0x30,
-	0x14, 0x86, 0xeb, 0x76, 0x40, 0xd4, 0x33, 0x20, 0x64, 0x21, 0x88, 0x32, 0x10, 0x3a, 0xb3, 0xaa,
-	0xb8, 0x24, 0x52, 0x40, 0x62, 0x0d, 0x64, 0x41, 0x17, 0x23, 0xa1, 0x20, 0x36, 0x6c, 0x2a, 0xd7,
-	0x3e, 0xd3, 0x5a, 0x22, 0x71, 0xb0, 0x9d, 0xa8, 0xbc, 0x05, 0xaf, 0xc1, 0x9b, 0x20, 0x56, 0x5d,
-	0xb2, 0x42, 0xa8, 0x7d, 0x11, 0x94, 0x8b, 0x7a, 0x49, 0x9b, 0xb6, 0xeb, 0xd9, 0x45, 0xe7, 0xfc,
-	0x39, 0xbf, 0x3f, 0xff, 0xd6, 0xc1, 0x8f, 0x12, 0x1a, 0x53, 0x06, 0xd4, 0xe3, 0x82, 0x7b, 0x99,
-	0xef, 0x99, 0xa9, 0x9b, 0x28, 0x69, 0x24, 0xb9, 0x57, 0x35, 0x5c, 0x2e, 0xb8, 0x9b, 0xf9, 0xb6,
-	0x55, 0x13, 0xe6, 0xe5, 0x42, 0x79, 0xf9, 0x17, 0x61, 0xfb, 0x4a, 0x8f, 0x3f, 0x81, 0xca, 0x04,
-	0x83, 0xf7, 0x0a, 0xa8, 0x81, 0x60, 0x10, 0x84, 0xf0, 0x2d, 0x05, 0x6d, 0xc8, 0x7d, 0xdc, 0xe1,
-	0x82, 0x5b, 0xa8, 0x87, 0xfa, 0xdd, 0x30, 0xff, 0x24, 0x6f, 0xf0, 0x1d, 0x2e, 0x59, 0x1a, 0x41,
-	0x6c, 0xac, 0x76, 0x0f, 0xf5, 0x4f, 0xfd, 0x73, 0x77, 0xd3, 0xcd, 0x0d, 0x06, 0x41, 0x50, 0x49,
-	0xc2, 0xa5, 0x98, 0xbc, 0xc6, 0x0f, 0x33, 0x50, 0xe2, 0x5a, 0x30, 0x6a, 0x84, 0x8c, 0x87, 0x11,
-	0x98, 0x89, 0xe4, 0x43, 0xc1, 0xad, 0x4e, 0x31, 0xfd, 0xc1, 0x7a, 0xf7, 0xaa, 0x68, 0x0e, 0x38,
-	0x79, 0x8c, 0xbb, 0x5a, 0x8c, 0x63, 0x6a, 0x52, 0x05, 0xd6, 0x49, 0x0f, 0xf5, 0xcf, 0xc2, 0x55,
-	0x81, 0x5c, 0xe0, 0xb3, 0x6b, 0x25, 0xa3, 0x21, 0xe5, 0x5c, 0x81, 0xd6, 0xd6, 0xad, 0x62, 0xd2,
-	0x69, 0x5e, 0x7b, 0x5b, 0x96, 0x2e, 0x9f, 0xe0, 0xf3, 0x9d, 0x7c, 0x3a, 0x91, 0xb1, 0x86, 0x1a,
-	0xff, 0xe7, 0x84, 0xdf, 0x68, 0xfe, 0x35, 0xbe, 0x8a, 0xff, 0x27, 0xc2, 0xce, 0xaa, 0x1f, 0x00,
-	0x65, 0x46, 0x64, 0x87, 0xee, 0xa0, 0x19, 0xa5, 0x7d, 0x2c, 0x4a, 0xe7, 0x10, 0xca, 0xc9, 0x36,
-	0xca, 0x05, 0x7e, 0xda, 0x78, 0xd4, 0x12, 0xc7, 0xff, 0xdd, 0xc6, 0x78, 0xa5, 0x21, 0x1c, 0x77,
-	0x97, 0x91, 0x93, 0x67, 0xf5, 0x9c, 0x9a, 0xdf, 0xbd, 0xfd, 0xfc, 0x28, 0x6d, 0x69, 0x9a, 0xbb,
-	0x2c, 0x2f, 0x76, 0x9f, 0x4b, 0xfd, 0x75, 0xed, 0x73, 0xd9, 0x4a, 0x8a, 0x24, 0xf8, 0xee, 0x06,
-	0x33, 0x71, 0x9b, 0xff, 0xde, 0x95, 0xa3, 0xed, 0x1d, 0xad, 0x2f, 0x1d, 0xdf, 0x7d, 0xf8, 0x35,
-	0x77, 0xd0, 0x6c, 0xee, 0xa0, 0x7f, 0x73, 0x07, 0xfd, 0x58, 0x38, 0xad, 0xd9, 0xc2, 0x69, 0xfd,
-	0x59, 0x38, 0xad, 0x8f, 0xe8, 0xcb, 0x8b, 0xb1, 0x30, 0x93, 0x74, 0xe4, 0x32, 0x19, 0x79, 0x11,
-	0x70, 0x31, 0xfa, 0x2a, 0x99, 0x57, 0xcd, 0x7f, 0xc9, 0xa4, 0x02, 0x6f, 0x5a, 0x2c, 0x1b, 0xf3,
-	0x3d, 0x01, 0x3d, 0xba, 0x5d, 0x2c, 0x9b, 0x57, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x61,
-	0x1b, 0x60, 0xb1, 0x04, 0x00, 0x00,
+	// 419 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x94, 0x4f, 0x8b, 0xd3, 0x40,
+	0x18, 0xc6, 0x3b, 0x4d, 0x15, 0x3b, 0xad, 0x22, 0x63, 0x69, 0x43, 0x94, 0x50, 0xab, 0x60, 0x0e,
+	0x9a, 0x40, 0x14, 0x3c, 0xab, 0x39, 0xd8, 0x43, 0x40, 0x02, 0x7a, 0xf0, 0x52, 0x26, 0x99, 0x69,
+	0x3a, 0x60, 0x32, 0x31, 0x33, 0x09, 0xf5, 0x5b, 0x78, 0xf5, 0xea, 0xa7, 0xf1, 0xd8, 0x9b, 0x7b,
+	0x5c, 0xda, 0x2f, 0xb2, 0xe4, 0xcf, 0x76, 0xfb, 0x27, 0xbb, 0xdd, 0xf3, 0xde, 0xc2, 0xfb, 0x3e,
+	0x79, 0xe6, 0xf9, 0xcd, 0x3b, 0xbc, 0x70, 0x94, 0xe0, 0x18, 0x07, 0x14, 0x5b, 0x84, 0x11, 0x2b,
+	0xb7, 0x2d, 0xb9, 0x34, 0x93, 0x94, 0x4b, 0x8e, 0x1e, 0xd5, 0x0d, 0x93, 0x30, 0x62, 0xe6, 0xb6,
+	0xa6, 0x1e, 0x08, 0x8b, 0x72, 0xa9, 0x9c, 0xfc, 0x07, 0xf0, 0x89, 0x2b, 0xc2, 0x4f, 0x29, 0xc5,
+	0x92, 0x3a, 0x53, 0xc7, 0xa3, 0x3f, 0x33, 0x2a, 0x24, 0x7a, 0x0c, 0x15, 0xc2, 0x88, 0x0a, 0xc6,
+	0xc0, 0xe8, 0x7a, 0xc5, 0x27, 0x7a, 0x0f, 0x1f, 0x10, 0x1e, 0x64, 0x11, 0x8d, 0xa5, 0xda, 0x1e,
+	0x03, 0xa3, 0x67, 0x3f, 0x35, 0xf7, 0x8f, 0x31, 0x9d, 0xa9, 0xe3, 0xd4, 0x12, 0x6f, 0x2b, 0x46,
+	0xef, 0xe0, 0x30, 0xa7, 0x29, 0x9b, 0xb3, 0x00, 0x4b, 0xc6, 0xe3, 0x59, 0x44, 0xe5, 0x82, 0x93,
+	0x19, 0x23, 0xaa, 0x52, 0xba, 0x0f, 0x76, 0xbb, 0x6e, 0xd9, 0x9c, 0x12, 0xf4, 0x0c, 0x76, 0x05,
+	0x0b, 0x63, 0x2c, 0xb3, 0x94, 0xaa, 0x9d, 0x31, 0x30, 0xfa, 0xde, 0x55, 0x01, 0x3d, 0x87, 0xfd,
+	0x79, 0xca, 0xa3, 0x19, 0x26, 0x24, 0xa5, 0x42, 0xa8, 0xf7, 0x4a, 0xa7, 0x5e, 0x51, 0xfb, 0x50,
+	0x95, 0x26, 0x43, 0x38, 0xd8, 0x07, 0x13, 0x09, 0x8f, 0x05, 0xbd, 0x24, 0xfe, 0x9a, 0x90, 0xbb,
+	0x49, 0xbc, 0x03, 0x56, 0x13, 0xff, 0x05, 0x70, 0xe4, 0x8a, 0xd0, 0xa1, 0x38, 0x90, 0x2c, 0x3f,
+	0x45, 0x7d, 0x7d, 0xf8, 0xf6, 0x6d, 0xc3, 0x2b, 0xa7, 0xc2, 0x77, 0x8e, 0xc3, 0x6b, 0x50, 0x3d,
+	0xce, 0x58, 0x01, 0xd8, 0x7f, 0xda, 0x50, 0x71, 0x45, 0x88, 0xbe, 0xc1, 0xee, 0x76, 0x9e, 0xe8,
+	0xc5, 0xe1, 0x2c, 0x1a, 0x9e, 0xb1, 0xf6, 0xf2, 0x66, 0x51, 0xe5, 0x5f, 0xf8, 0x6e, 0x6f, 0xad,
+	0xd1, 0xf7, 0xf0, 0xb1, 0x34, 0xfa, 0x1e, 0x5d, 0x3c, 0xf2, 0xe1, 0xc3, 0x3d, 0x20, 0xf4, 0xaa,
+	0xe1, 0xb7, 0xa6, 0xb1, 0x68, 0xc6, 0x69, 0x61, 0x75, 0xc6, 0xc7, 0xcf, 0xff, 0xd6, 0x3a, 0x58,
+	0xad, 0x75, 0x70, 0xbe, 0xd6, 0xc1, 0xef, 0x8d, 0xde, 0x5a, 0x6d, 0xf4, 0xd6, 0xd9, 0x46, 0x6f,
+	0x7d, 0x01, 0xdf, 0x5f, 0x87, 0x4c, 0x2e, 0x32, 0xdf, 0x0c, 0x78, 0x64, 0x45, 0x94, 0x30, 0xff,
+	0x07, 0x0f, 0xac, 0xda, 0xf8, 0x4d, 0xc0, 0x53, 0x6a, 0x2d, 0xcb, 0x8d, 0x20, 0x7f, 0x25, 0x54,
+	0xf8, 0xf7, 0xcb, 0x8d, 0xf0, 0xf6, 0x22, 0x00, 0x00, 0xff, 0xff, 0x45, 0x8f, 0x32, 0xb9, 0x56,
+	0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -411,157 +411,157 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// MsgServiceClient is the client API for MsgService service.
+// MsgClient is the client API for Msg service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type MsgServiceClient interface {
+type MsgClient interface {
 	// CreateDID defines a method for creating a DID.
-	CreateDID(ctx context.Context, in *MsgServiceCreateDIDRequest, opts ...grpc.CallOption) (*MsgServiceCreateDIDResponse, error)
+	CreateDID(ctx context.Context, in *MsgCreateDIDRequest, opts ...grpc.CallOption) (*MsgCreateDIDResponse, error)
 	// UpdateDID defines a method for updating a DID.
-	UpdateDID(ctx context.Context, in *MsgServiceUpdateDIDRequest, opts ...grpc.CallOption) (*MsgServiceUpdateDIDResponse, error)
+	UpdateDID(ctx context.Context, in *MsgUpdateDIDRequest, opts ...grpc.CallOption) (*MsgUpdateDIDResponse, error)
 	// DeactivateDID defines a method for deactivating a DID.
-	DeactivateDID(ctx context.Context, in *MsgServiceDeactivateDIDRequest, opts ...grpc.CallOption) (*MsgServiceDeactivateDIDResponse, error)
+	DeactivateDID(ctx context.Context, in *MsgDeactivateDIDRequest, opts ...grpc.CallOption) (*MsgDeactivateDIDResponse, error)
 }
 
-type msgServiceClient struct {
+type msgClient struct {
 	cc grpc1.ClientConn
 }
 
-func NewMsgServiceClient(cc grpc1.ClientConn) MsgServiceClient {
-	return &msgServiceClient{cc}
+func NewMsgClient(cc grpc1.ClientConn) MsgClient {
+	return &msgClient{cc}
 }
 
-func (c *msgServiceClient) CreateDID(ctx context.Context, in *MsgServiceCreateDIDRequest, opts ...grpc.CallOption) (*MsgServiceCreateDIDResponse, error) {
-	out := new(MsgServiceCreateDIDResponse)
-	err := c.cc.Invoke(ctx, "/panacea.did.v2.MsgService/CreateDID", in, out, opts...)
+func (c *msgClient) CreateDID(ctx context.Context, in *MsgCreateDIDRequest, opts ...grpc.CallOption) (*MsgCreateDIDResponse, error) {
+	out := new(MsgCreateDIDResponse)
+	err := c.cc.Invoke(ctx, "/panacea.did.v2.Msg/CreateDID", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) UpdateDID(ctx context.Context, in *MsgServiceUpdateDIDRequest, opts ...grpc.CallOption) (*MsgServiceUpdateDIDResponse, error) {
-	out := new(MsgServiceUpdateDIDResponse)
-	err := c.cc.Invoke(ctx, "/panacea.did.v2.MsgService/UpdateDID", in, out, opts...)
+func (c *msgClient) UpdateDID(ctx context.Context, in *MsgUpdateDIDRequest, opts ...grpc.CallOption) (*MsgUpdateDIDResponse, error) {
+	out := new(MsgUpdateDIDResponse)
+	err := c.cc.Invoke(ctx, "/panacea.did.v2.Msg/UpdateDID", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) DeactivateDID(ctx context.Context, in *MsgServiceDeactivateDIDRequest, opts ...grpc.CallOption) (*MsgServiceDeactivateDIDResponse, error) {
-	out := new(MsgServiceDeactivateDIDResponse)
-	err := c.cc.Invoke(ctx, "/panacea.did.v2.MsgService/DeactivateDID", in, out, opts...)
+func (c *msgClient) DeactivateDID(ctx context.Context, in *MsgDeactivateDIDRequest, opts ...grpc.CallOption) (*MsgDeactivateDIDResponse, error) {
+	out := new(MsgDeactivateDIDResponse)
+	err := c.cc.Invoke(ctx, "/panacea.did.v2.Msg/DeactivateDID", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// MsgServiceServer is the server API for MsgService service.
-type MsgServiceServer interface {
+// MsgServer is the server API for Msg service.
+type MsgServer interface {
 	// CreateDID defines a method for creating a DID.
-	CreateDID(context.Context, *MsgServiceCreateDIDRequest) (*MsgServiceCreateDIDResponse, error)
+	CreateDID(context.Context, *MsgCreateDIDRequest) (*MsgCreateDIDResponse, error)
 	// UpdateDID defines a method for updating a DID.
-	UpdateDID(context.Context, *MsgServiceUpdateDIDRequest) (*MsgServiceUpdateDIDResponse, error)
+	UpdateDID(context.Context, *MsgUpdateDIDRequest) (*MsgUpdateDIDResponse, error)
 	// DeactivateDID defines a method for deactivating a DID.
-	DeactivateDID(context.Context, *MsgServiceDeactivateDIDRequest) (*MsgServiceDeactivateDIDResponse, error)
+	DeactivateDID(context.Context, *MsgDeactivateDIDRequest) (*MsgDeactivateDIDResponse, error)
 }
 
-// UnimplementedMsgServiceServer can be embedded to have forward compatible implementations.
-type UnimplementedMsgServiceServer struct {
+// UnimplementedMsgServer can be embedded to have forward compatible implementations.
+type UnimplementedMsgServer struct {
 }
 
-func (*UnimplementedMsgServiceServer) CreateDID(ctx context.Context, req *MsgServiceCreateDIDRequest) (*MsgServiceCreateDIDResponse, error) {
+func (*UnimplementedMsgServer) CreateDID(ctx context.Context, req *MsgCreateDIDRequest) (*MsgCreateDIDResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateDID not implemented")
 }
-func (*UnimplementedMsgServiceServer) UpdateDID(ctx context.Context, req *MsgServiceUpdateDIDRequest) (*MsgServiceUpdateDIDResponse, error) {
+func (*UnimplementedMsgServer) UpdateDID(ctx context.Context, req *MsgUpdateDIDRequest) (*MsgUpdateDIDResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateDID not implemented")
 }
-func (*UnimplementedMsgServiceServer) DeactivateDID(ctx context.Context, req *MsgServiceDeactivateDIDRequest) (*MsgServiceDeactivateDIDResponse, error) {
+func (*UnimplementedMsgServer) DeactivateDID(ctx context.Context, req *MsgDeactivateDIDRequest) (*MsgDeactivateDIDResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeactivateDID not implemented")
 }
 
-func RegisterMsgServiceServer(s grpc1.Server, srv MsgServiceServer) {
-	s.RegisterService(&_MsgService_serviceDesc, srv)
+func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
+	s.RegisterService(&_Msg_serviceDesc, srv)
 }
 
-func _MsgService_CreateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceCreateDIDRequest)
+func _Msg_CreateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgCreateDIDRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).CreateDID(ctx, in)
+		return srv.(MsgServer).CreateDID(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.did.v2.MsgService/CreateDID",
+		FullMethod: "/panacea.did.v2.Msg/CreateDID",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).CreateDID(ctx, req.(*MsgServiceCreateDIDRequest))
+		return srv.(MsgServer).CreateDID(ctx, req.(*MsgCreateDIDRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_UpdateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceUpdateDIDRequest)
+func _Msg_UpdateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgUpdateDIDRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).UpdateDID(ctx, in)
+		return srv.(MsgServer).UpdateDID(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.did.v2.MsgService/UpdateDID",
+		FullMethod: "/panacea.did.v2.Msg/UpdateDID",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).UpdateDID(ctx, req.(*MsgServiceUpdateDIDRequest))
+		return srv.(MsgServer).UpdateDID(ctx, req.(*MsgUpdateDIDRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_DeactivateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceDeactivateDIDRequest)
+func _Msg_DeactivateDID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgDeactivateDIDRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).DeactivateDID(ctx, in)
+		return srv.(MsgServer).DeactivateDID(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.did.v2.MsgService/DeactivateDID",
+		FullMethod: "/panacea.did.v2.Msg/DeactivateDID",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).DeactivateDID(ctx, req.(*MsgServiceDeactivateDIDRequest))
+		return srv.(MsgServer).DeactivateDID(ctx, req.(*MsgDeactivateDIDRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _MsgService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "panacea.did.v2.MsgService",
-	HandlerType: (*MsgServiceServer)(nil),
+var _Msg_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "panacea.did.v2.Msg",
+	HandlerType: (*MsgServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
 			MethodName: "CreateDID",
-			Handler:    _MsgService_CreateDID_Handler,
+			Handler:    _Msg_CreateDID_Handler,
 		},
 		{
 			MethodName: "UpdateDID",
-			Handler:    _MsgService_UpdateDID_Handler,
+			Handler:    _Msg_UpdateDID_Handler,
 		},
 		{
 			MethodName: "DeactivateDID",
-			Handler:    _MsgService_DeactivateDID_Handler,
+			Handler:    _Msg_DeactivateDID_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "panacea/did/v2/tx.proto",
 }
 
-func (m *MsgServiceCreateDIDRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateDIDRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -571,12 +571,12 @@ func (m *MsgServiceCreateDIDRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -624,7 +624,7 @@ func (m *MsgServiceCreateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceCreateDIDResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateDIDResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -634,12 +634,12 @@ func (m *MsgServiceCreateDIDResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -647,7 +647,7 @@ func (m *MsgServiceCreateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceUpdateDIDRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgUpdateDIDRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -657,12 +657,12 @@ func (m *MsgServiceUpdateDIDRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceUpdateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgUpdateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceUpdateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgUpdateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -710,7 +710,7 @@ func (m *MsgServiceUpdateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceUpdateDIDResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgUpdateDIDResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -720,12 +720,12 @@ func (m *MsgServiceUpdateDIDResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceUpdateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgUpdateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceUpdateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgUpdateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -733,7 +733,7 @@ func (m *MsgServiceUpdateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeactivateDIDRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeactivateDIDRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -743,12 +743,12 @@ func (m *MsgServiceDeactivateDIDRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeactivateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeactivateDIDRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeactivateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeactivateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -784,7 +784,7 @@ func (m *MsgServiceDeactivateDIDRequest) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeactivateDIDResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeactivateDIDResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -794,12 +794,12 @@ func (m *MsgServiceDeactivateDIDResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeactivateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeactivateDIDResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeactivateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeactivateDIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -818,7 +818,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *MsgServiceCreateDIDRequest) Size() (n int) {
+func (m *MsgCreateDIDRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -847,7 +847,7 @@ func (m *MsgServiceCreateDIDRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceCreateDIDResponse) Size() (n int) {
+func (m *MsgCreateDIDResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -856,7 +856,7 @@ func (m *MsgServiceCreateDIDResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceUpdateDIDRequest) Size() (n int) {
+func (m *MsgUpdateDIDRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -885,7 +885,7 @@ func (m *MsgServiceUpdateDIDRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceUpdateDIDResponse) Size() (n int) {
+func (m *MsgUpdateDIDResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -894,7 +894,7 @@ func (m *MsgServiceUpdateDIDResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeactivateDIDRequest) Size() (n int) {
+func (m *MsgDeactivateDIDRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -919,7 +919,7 @@ func (m *MsgServiceDeactivateDIDRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeactivateDIDResponse) Size() (n int) {
+func (m *MsgDeactivateDIDResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -934,7 +934,7 @@ func sovTx(x uint64) (n int) {
 func sozTx(x uint64) (n int) {
 	return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *MsgServiceCreateDIDRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateDIDRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -957,10 +957,10 @@ func (m *MsgServiceCreateDIDRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateDIDRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateDIDRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1150,7 +1150,7 @@ func (m *MsgServiceCreateDIDRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceCreateDIDResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateDIDResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1173,10 +1173,10 @@ func (m *MsgServiceCreateDIDResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateDIDResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateDIDResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -1200,7 +1200,7 @@ func (m *MsgServiceCreateDIDResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceUpdateDIDRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgUpdateDIDRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1223,10 +1223,10 @@ func (m *MsgServiceUpdateDIDRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceUpdateDIDRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgUpdateDIDRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceUpdateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgUpdateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1416,7 +1416,7 @@ func (m *MsgServiceUpdateDIDRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceUpdateDIDResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgUpdateDIDResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1439,10 +1439,10 @@ func (m *MsgServiceUpdateDIDResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceUpdateDIDResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgUpdateDIDResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceUpdateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgUpdateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -1466,7 +1466,7 @@ func (m *MsgServiceUpdateDIDResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeactivateDIDRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgDeactivateDIDRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1489,10 +1489,10 @@ func (m *MsgServiceDeactivateDIDRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeactivateDIDRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeactivateDIDRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeactivateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeactivateDIDRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1646,7 +1646,7 @@ func (m *MsgServiceDeactivateDIDRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeactivateDIDResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgDeactivateDIDResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1669,10 +1669,10 @@ func (m *MsgServiceDeactivateDIDResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeactivateDIDResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeactivateDIDResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeactivateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeactivateDIDResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
diff --git a/x/pnft/client/cli/tx_denom.go b/x/pnft/client/cli/tx_denom.go
index daf4a48c..46ffb8cd 100644
--- a/x/pnft/client/cli/tx_denom.go
+++ b/x/pnft/client/cli/tx_denom.go
@@ -63,7 +63,7 @@ func NewCmdCreateDenom() *cobra.Command {
 
 			creator := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceCreateDenomRequest(
+			msg := types.NewMsgCreateDenomRequest(
 				id,
 				symbol,
 				denomName,
@@ -138,7 +138,7 @@ func NewCmdUpdateDenom() *cobra.Command {
 
 			updater := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceUpdateDenomRequest(
+			msg := types.NewMsgUpdateDenomRequest(
 				denomId,
 				symbol,
 				denomName,
@@ -182,7 +182,7 @@ func NewCmdDeleteDenom() *cobra.Command {
 
 			remover := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceDeleteDenomRequest(denomId, remover)
+			msg := types.NewMsgDeleteDenomRequest(denomId, remover)
 
 			if err := msg.ValidateBasic(); err != nil {
 				return sdkerrors.Wrap(types.ErrDeleteDenom, err.Error())
@@ -211,7 +211,7 @@ func NewCmdTransferDenom() *cobra.Command {
 
 			sender := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceTransferRequest(denomId, sender, receiver)
+			msg := types.NewMsgTransferRequest(denomId, sender, receiver)
 
 			if err := msg.ValidateBasic(); err != nil {
 				return sdkerrors.Wrap(types.ErrTransferDenom, err.Error())
diff --git a/x/pnft/client/cli/tx_pnft.go b/x/pnft/client/cli/tx_pnft.go
index 772c8833..4c18f4bb 100644
--- a/x/pnft/client/cli/tx_pnft.go
+++ b/x/pnft/client/cli/tx_pnft.go
@@ -50,7 +50,7 @@ func NewCmdMintPNFT() *cobra.Command {
 
 			creator := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceMintPNFTRequest(
+			msg := types.NewMsgMintPNFTRequest(
 				denomId,
 				id,
 				name,
@@ -96,7 +96,7 @@ func NewCmdTransferPNFT() *cobra.Command {
 			receiver := args[2]
 			sender := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceTransferPNFTRequest(denomId, id, sender, receiver)
+			msg := types.NewMsgTransferPNFTRequest(denomId, id, sender, receiver)
 
 			if err := msg.ValidateBasic(); err != nil {
 				return sdkerrors.Wrap(types.ErrTransferPNFT, err.Error())
@@ -126,7 +126,7 @@ func NewCmdBurnPNFT() *cobra.Command {
 			id := args[1]
 			burner := clientCtx.GetFromAddress().String()
 
-			msg := types.NewMsgServiceBurnPNFTRequest(denomId, id, burner)
+			msg := types.NewMsgBurnPNFTRequest(denomId, id, burner)
 
 			if err := msg.ValidateBasic(); err != nil {
 				return sdkerrors.Wrap(types.ErrTransferPNFT, err.Error())
diff --git a/x/pnft/keeper/msg_server.go b/x/pnft/keeper/msg_server.go
index 588d5c93..c37730ba 100644
--- a/x/pnft/keeper/msg_server.go
+++ b/x/pnft/keeper/msg_server.go
@@ -11,11 +11,11 @@ type msgServer struct {
 	*Keeper
 }
 
-func NewMsgServerImpl(keeper *Keeper) types.MsgServiceServer {
+func NewMsgServerImpl(keeper *Keeper) types.MsgServer {
 	return &msgServer{Keeper: keeper}
 }
 
-func (m msgServer) CreateDenom(goCtx context.Context, request *types.MsgServiceCreateDenomRequest) (*types.MsgServiceCreateDenomResponse, error) {
+func (m msgServer) CreateDenom(goCtx context.Context, request *types.MsgCreateDenomRequest) (*types.MsgCreateDenomResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -38,10 +38,10 @@ func (m msgServer) CreateDenom(goCtx context.Context, request *types.MsgServiceC
 	if err != nil {
 		return nil, errors.Wrapf(types.ErrCreateDenom, err.Error())
 	}
-	return &types.MsgServiceCreateDenomResponse{}, nil
+	return &types.MsgCreateDenomResponse{}, nil
 }
 
-func (m msgServer) UpdateDenom(goCtx context.Context, request *types.MsgServiceUpdateDenomRequest) (*types.MsgServiceUpdateDenomResponse, error) {
+func (m msgServer) UpdateDenom(goCtx context.Context, request *types.MsgUpdateDenomRequest) (*types.MsgUpdateDenomResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -64,10 +64,10 @@ func (m msgServer) UpdateDenom(goCtx context.Context, request *types.MsgServiceU
 		return nil, errors.Wrapf(types.ErrUpdateDenom, err.Error())
 	}
 
-	return &types.MsgServiceUpdateDenomResponse{}, nil
+	return &types.MsgUpdateDenomResponse{}, nil
 }
 
-func (m msgServer) DeleteDenom(goCtx context.Context, request *types.MsgServiceDeleteDenomRequest) (*types.MsgServiceDeleteDenomResponse, error) {
+func (m msgServer) DeleteDenom(goCtx context.Context, request *types.MsgDeleteDenomRequest) (*types.MsgDeleteDenomResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -78,10 +78,10 @@ func (m msgServer) DeleteDenom(goCtx context.Context, request *types.MsgServiceD
 		return nil, errors.Wrapf(types.ErrDeleteDenom, err.Error())
 	}
 
-	return &types.MsgServiceDeleteDenomResponse{}, nil
+	return &types.MsgDeleteDenomResponse{}, nil
 }
 
-func (m msgServer) TransferDenom(goCtx context.Context, request *types.MsgServiceTransferDenomRequest) (*types.MsgServiceTransferDenomResponse, error) {
+func (m msgServer) TransferDenom(goCtx context.Context, request *types.MsgTransferDenomRequest) (*types.MsgTransferDenomResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -92,10 +92,10 @@ func (m msgServer) TransferDenom(goCtx context.Context, request *types.MsgServic
 		return nil, errors.Wrap(types.ErrTransferDenom, err.Error())
 	}
 
-	return &types.MsgServiceTransferDenomResponse{}, nil
+	return &types.MsgTransferDenomResponse{}, nil
 }
 
-func (m msgServer) MintPNFT(goCtx context.Context, request *types.MsgServiceMintPNFTRequest) (*types.MsgServiceMintPNFTResponse, error) {
+func (m msgServer) MintPNFT(goCtx context.Context, request *types.MsgMintPNFTRequest) (*types.MsgMintPNFTResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -118,10 +118,10 @@ func (m msgServer) MintPNFT(goCtx context.Context, request *types.MsgServiceMint
 		return nil, errors.Wrap(types.ErrMintPNFT, err.Error())
 	}
 
-	return &types.MsgServiceMintPNFTResponse{}, nil
+	return &types.MsgMintPNFTResponse{}, nil
 }
 
-func (m msgServer) TransferPNFT(goCtx context.Context, request *types.MsgServiceTransferPNFTRequest) (*types.MsgServiceTransferPNFTResponse, error) {
+func (m msgServer) TransferPNFT(goCtx context.Context, request *types.MsgTransferPNFTRequest) (*types.MsgTransferPNFTResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -138,10 +138,10 @@ func (m msgServer) TransferPNFT(goCtx context.Context, request *types.MsgService
 		return nil, errors.Wrap(types.ErrTransferPNFT, err.Error())
 	}
 
-	return &types.MsgServiceTransferPNFTResponse{}, nil
+	return &types.MsgTransferPNFTResponse{}, nil
 }
 
-func (m msgServer) BurnPNFT(goCtx context.Context, request *types.MsgServiceBurnPNFTRequest) (*types.MsgServiceBurnPNFTResponse, error) {
+func (m msgServer) BurnPNFT(goCtx context.Context, request *types.MsgBurnPNFTRequest) (*types.MsgBurnPNFTResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if err := request.ValidateBasic(); err != nil {
@@ -157,5 +157,5 @@ func (m msgServer) BurnPNFT(goCtx context.Context, request *types.MsgServiceBurn
 		return nil, errors.Wrap(types.ErrBurnPNFT, err.Error())
 	}
 
-	return &types.MsgServiceBurnPNFTResponse{}, nil
+	return &types.MsgBurnPNFTResponse{}, nil
 }
diff --git a/x/pnft/module.go b/x/pnft/module.go
index e4fd95e5..6775d9c0 100644
--- a/x/pnft/module.go
+++ b/x/pnft/module.go
@@ -94,7 +94,7 @@ func (AppModule) QuerierRoute() string { return types.QuerierRoute }
 // module-specific GRPC queries.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
-	types.RegisterMsgServiceServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
+	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 }
 
 // RegisterInvariants registers the capability module's invariants.
diff --git a/x/pnft/types/codec.go b/x/pnft/types/codec.go
index 7bddb27d..b3d92f37 100644
--- a/x/pnft/types/codec.go
+++ b/x/pnft/types/codec.go
@@ -8,28 +8,28 @@ import (
 )
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgServiceCreateDenomRequest{}, "pnft/CreateDenom", nil)
-	cdc.RegisterConcrete(&MsgServiceUpdateDenomRequest{}, "pnft/UpdateDenom", nil)
-	cdc.RegisterConcrete(&MsgServiceDeleteDenomRequest{}, "pnft/DeleteDenom", nil)
-	cdc.RegisterConcrete(&MsgServiceTransferDenomRequest{}, "pnft/TransferDenom", nil)
+	cdc.RegisterConcrete(&MsgCreateDenomRequest{}, "pnft/CreateDenom", nil)
+	cdc.RegisterConcrete(&MsgUpdateDenomRequest{}, "pnft/UpdateDenom", nil)
+	cdc.RegisterConcrete(&MsgDeleteDenomRequest{}, "pnft/DeleteDenom", nil)
+	cdc.RegisterConcrete(&MsgTransferDenomRequest{}, "pnft/TransferDenom", nil)
 
-	cdc.RegisterConcrete(&MsgServiceMintPNFTRequest{}, "pnft/MintPNFT", nil)
-	cdc.RegisterConcrete(&MsgServiceTransferPNFTRequest{}, "pnft/TransferPNFT", nil)
-	cdc.RegisterConcrete(&MsgServiceBurnPNFTRequest{}, "pnft/BurnPNFT", nil)
+	cdc.RegisterConcrete(&MsgMintPNFTRequest{}, "pnft/MintPNFT", nil)
+	cdc.RegisterConcrete(&MsgTransferPNFTRequest{}, "pnft/TransferPNFT", nil)
+	cdc.RegisterConcrete(&MsgBurnPNFTRequest{}, "pnft/BurnPNFT", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations((*sdk.Msg)(nil),
-		&MsgServiceCreateDenomRequest{},
-		&MsgServiceUpdateDenomRequest{},
-		&MsgServiceDeleteDenomRequest{},
-		&MsgServiceTransferDenomRequest{},
-		&MsgServiceMintPNFTRequest{},
-		&MsgServiceTransferPNFTRequest{},
-		&MsgServiceBurnPNFTRequest{},
+		&MsgCreateDenomRequest{},
+		&MsgUpdateDenomRequest{},
+		&MsgDeleteDenomRequest{},
+		&MsgTransferDenomRequest{},
+		&MsgMintPNFTRequest{},
+		&MsgTransferPNFTRequest{},
+		&MsgBurnPNFTRequest{},
 	)
 
-	msgservice.RegisterMsgServiceDesc(registry, &_MsgService_serviceDesc)
+	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
 
 var (
diff --git a/x/pnft/types/message_denom.go b/x/pnft/types/message_denom.go
index 60bc5cd8..ec229b11 100644
--- a/x/pnft/types/message_denom.go
+++ b/x/pnft/types/message_denom.go
@@ -5,7 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func NewMsgServiceCreateDenomRequest(
+func NewMsgCreateDenomRequest(
 	id string,
 	symbol string,
 	name string,
@@ -14,8 +14,8 @@ func NewMsgServiceCreateDenomRequest(
 	uriHash string,
 	creator string,
 	data string,
-) *MsgServiceCreateDenomRequest {
-	return &MsgServiceCreateDenomRequest{
+) *MsgCreateDenomRequest {
+	return &MsgCreateDenomRequest{
 		Id:          id,
 		Name:        name,
 		Symbol:      symbol,
@@ -28,12 +28,12 @@ func NewMsgServiceCreateDenomRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceCreateDenomRequest) GetSignBytes() []byte {
+func (msg *MsgCreateDenomRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceCreateDenomRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgCreateDenomRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
 		panic(err)
@@ -41,7 +41,7 @@ func (msg *MsgServiceCreateDenomRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceCreateDenomRequest) ValidateBasic() error {
+func (msg *MsgCreateDenomRequest) ValidateBasic() error {
 	if msg.Id == "" {
 		return errors.New("id cannot be empty")
 	}
@@ -65,7 +65,7 @@ func (msg *MsgServiceCreateDenomRequest) ValidateBasic() error {
 	return nil
 }
 
-func NewMsgServiceUpdateDenomRequest(
+func NewMsgUpdateDenomRequest(
 	id string,
 	symbol string,
 	name string,
@@ -74,8 +74,8 @@ func NewMsgServiceUpdateDenomRequest(
 	uriHash string,
 	data string,
 	update string,
-) *MsgServiceUpdateDenomRequest {
-	return &MsgServiceUpdateDenomRequest{
+) *MsgUpdateDenomRequest {
+	return &MsgUpdateDenomRequest{
 		Id:          id,
 		Name:        name,
 		Symbol:      symbol,
@@ -88,12 +88,12 @@ func NewMsgServiceUpdateDenomRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceUpdateDenomRequest) GetSignBytes() []byte {
+func (msg *MsgUpdateDenomRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceUpdateDenomRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgUpdateDenomRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Updater)
 	if err != nil {
 		panic(err)
@@ -101,7 +101,7 @@ func (msg *MsgServiceUpdateDenomRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceUpdateDenomRequest) ValidateBasic() error {
+func (msg *MsgUpdateDenomRequest) ValidateBasic() error {
 	if msg.Id == "" {
 		return errors.New("Id cannot be empty")
 	}
@@ -116,23 +116,23 @@ func (msg *MsgServiceUpdateDenomRequest) ValidateBasic() error {
 	return nil
 }
 
-func NewMsgServiceDeleteDenomRequest(
+func NewMsgDeleteDenomRequest(
 	id string,
 	remover string,
-) *MsgServiceDeleteDenomRequest {
-	return &MsgServiceDeleteDenomRequest{
+) *MsgDeleteDenomRequest {
+	return &MsgDeleteDenomRequest{
 		Id:      id,
 		Remover: remover,
 	}
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceDeleteDenomRequest) GetSignBytes() []byte {
+func (msg *MsgDeleteDenomRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceDeleteDenomRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgDeleteDenomRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Remover)
 	if err != nil {
 		panic(err)
@@ -140,7 +140,7 @@ func (msg *MsgServiceDeleteDenomRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceDeleteDenomRequest) ValidateBasic() error {
+func (msg *MsgDeleteDenomRequest) ValidateBasic() error {
 	if msg.Id == "" {
 		return errors.New("id cannot be empty")
 	}
@@ -156,12 +156,12 @@ func (msg *MsgServiceDeleteDenomRequest) ValidateBasic() error {
 	return nil
 }
 
-func NewMsgServiceTransferRequest(
+func NewMsgTransferRequest(
 	id string,
 	sender string,
 	receiver string,
-) *MsgServiceTransferDenomRequest {
-	return &MsgServiceTransferDenomRequest{
+) *MsgTransferDenomRequest {
+	return &MsgTransferDenomRequest{
 		Id:       id,
 		Sender:   sender,
 		Receiver: receiver,
@@ -169,12 +169,12 @@ func NewMsgServiceTransferRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceTransferDenomRequest) GetSignBytes() []byte {
+func (msg *MsgTransferDenomRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceTransferDenomRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgTransferDenomRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Sender)
 	if err != nil {
 		panic(err)
@@ -182,7 +182,7 @@ func (msg *MsgServiceTransferDenomRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceTransferDenomRequest) ValidateBasic() error {
+func (msg *MsgTransferDenomRequest) ValidateBasic() error {
 	if msg.Id == "" {
 		return errors.New("id cannot be empty")
 	}
diff --git a/x/pnft/types/message_pnft.go b/x/pnft/types/message_pnft.go
index 8d9475de..e882bf45 100644
--- a/x/pnft/types/message_pnft.go
+++ b/x/pnft/types/message_pnft.go
@@ -5,7 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func NewMsgServiceMintPNFTRequest(
+func NewMsgMintPNFTRequest(
 	denomId string,
 	id string,
 	name string,
@@ -14,8 +14,8 @@ func NewMsgServiceMintPNFTRequest(
 	uriHash string,
 	creator string,
 	data string,
-) *MsgServiceMintPNFTRequest {
-	return &MsgServiceMintPNFTRequest{
+) *MsgMintPNFTRequest {
+	return &MsgMintPNFTRequest{
 		DenomId:     denomId,
 		Id:          id,
 		Name:        name,
@@ -28,12 +28,12 @@ func NewMsgServiceMintPNFTRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceMintPNFTRequest) GetSignBytes() []byte {
+func (msg *MsgMintPNFTRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceMintPNFTRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgMintPNFTRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
 		panic(err)
@@ -41,7 +41,7 @@ func (msg *MsgServiceMintPNFTRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceMintPNFTRequest) ValidateBasic() error {
+func (msg *MsgMintPNFTRequest) ValidateBasic() error {
 	if msg.DenomId == "" {
 		return fmt.Errorf("denomId cannot be empty")
 	}
@@ -65,13 +65,13 @@ func (msg *MsgServiceMintPNFTRequest) ValidateBasic() error {
 	return nil
 }
 
-func NewMsgServiceTransferPNFTRequest(
+func NewMsgTransferPNFTRequest(
 	denomId string,
 	id string,
 	sender string,
 	receiver string,
-) *MsgServiceTransferPNFTRequest {
-	return &MsgServiceTransferPNFTRequest{
+) *MsgTransferPNFTRequest {
+	return &MsgTransferPNFTRequest{
 		DenomId:  denomId,
 		Id:       id,
 		Sender:   sender,
@@ -80,12 +80,12 @@ func NewMsgServiceTransferPNFTRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceTransferPNFTRequest) GetSignBytes() []byte {
+func (msg *MsgTransferPNFTRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceTransferPNFTRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgTransferPNFTRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Sender)
 	if err != nil {
 		panic(err)
@@ -93,7 +93,7 @@ func (msg *MsgServiceTransferPNFTRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceTransferPNFTRequest) ValidateBasic() error {
+func (msg *MsgTransferPNFTRequest) ValidateBasic() error {
 	if msg.DenomId == "" {
 		return fmt.Errorf("denomId cannot be empty")
 	}
@@ -119,12 +119,12 @@ func (msg *MsgServiceTransferPNFTRequest) ValidateBasic() error {
 	return nil
 }
 
-func NewMsgServiceBurnPNFTRequest(
+func NewMsgBurnPNFTRequest(
 	denomId string,
 	id string,
 	bunner string,
-) *MsgServiceBurnPNFTRequest {
-	return &MsgServiceBurnPNFTRequest{
+) *MsgBurnPNFTRequest {
+	return &MsgBurnPNFTRequest{
 		DenomId: denomId,
 		Id:      id,
 		Burner:  bunner,
@@ -132,12 +132,12 @@ func NewMsgServiceBurnPNFTRequest(
 }
 
 // GetSignBytes returns a byte array which is used to generate a signature for verifying DID ownership.
-func (msg *MsgServiceBurnPNFTRequest) GetSignBytes() []byte {
+func (msg *MsgBurnPNFTRequest) GetSignBytes() []byte {
 	bz := ModuleCdc.MustMarshalJSON(msg)
 	return sdk.MustSortJSON(bz)
 }
 
-func (msg *MsgServiceBurnPNFTRequest) GetSigners() []sdk.AccAddress {
+func (msg *MsgBurnPNFTRequest) GetSigners() []sdk.AccAddress {
 	from, err := sdk.AccAddressFromBech32(msg.Burner)
 	if err != nil {
 		panic(err)
@@ -145,7 +145,7 @@ func (msg *MsgServiceBurnPNFTRequest) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{from}
 }
 
-func (msg *MsgServiceBurnPNFTRequest) ValidateBasic() error {
+func (msg *MsgBurnPNFTRequest) ValidateBasic() error {
 	if msg.DenomId == "" {
 		return fmt.Errorf("denomId cannot be empty")
 	}
diff --git a/x/pnft/types/tx.pb.go b/x/pnft/types/tx.pb.go
index 570f372b..913677d8 100644
--- a/x/pnft/types/tx.pb.go
+++ b/x/pnft/types/tx.pb.go
@@ -27,7 +27,7 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-type MsgServiceCreateDenomRequest struct {
+type MsgCreateDenomRequest struct {
 	Id          string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Name        string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	Symbol      string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`
@@ -38,18 +38,18 @@ type MsgServiceCreateDenomRequest struct {
 	Creator     string `protobuf:"bytes,8,opt,name=creator,proto3" json:"creator,omitempty"`
 }
 
-func (m *MsgServiceCreateDenomRequest) Reset()         { *m = MsgServiceCreateDenomRequest{} }
-func (m *MsgServiceCreateDenomRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateDenomRequest) ProtoMessage()    {}
-func (*MsgServiceCreateDenomRequest) Descriptor() ([]byte, []int) {
+func (m *MsgCreateDenomRequest) Reset()         { *m = MsgCreateDenomRequest{} }
+func (m *MsgCreateDenomRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateDenomRequest) ProtoMessage()    {}
+func (*MsgCreateDenomRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{0}
 }
-func (m *MsgServiceCreateDenomRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateDenomRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateDenomRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateDenomRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -59,89 +59,89 @@ func (m *MsgServiceCreateDenomRequest) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateDenomRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateDenomRequest.Merge(m, src)
+func (m *MsgCreateDenomRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateDenomRequest.Merge(m, src)
 }
-func (m *MsgServiceCreateDenomRequest) XXX_Size() int {
+func (m *MsgCreateDenomRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateDenomRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateDenomRequest.DiscardUnknown(m)
+func (m *MsgCreateDenomRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateDenomRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateDenomRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateDenomRequest proto.InternalMessageInfo
 
-func (m *MsgServiceCreateDenomRequest) GetId() string {
+func (m *MsgCreateDenomRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetName() string {
+func (m *MsgCreateDenomRequest) GetName() string {
 	if m != nil {
 		return m.Name
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetSymbol() string {
+func (m *MsgCreateDenomRequest) GetSymbol() string {
 	if m != nil {
 		return m.Symbol
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetDescription() string {
+func (m *MsgCreateDenomRequest) GetDescription() string {
 	if m != nil {
 		return m.Description
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetUri() string {
+func (m *MsgCreateDenomRequest) GetUri() string {
 	if m != nil {
 		return m.Uri
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetUriHash() string {
+func (m *MsgCreateDenomRequest) GetUriHash() string {
 	if m != nil {
 		return m.UriHash
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetData() string {
+func (m *MsgCreateDenomRequest) GetData() string {
 	if m != nil {
 		return m.Data
 	}
 	return ""
 }
 
-func (m *MsgServiceCreateDenomRequest) GetCreator() string {
+func (m *MsgCreateDenomRequest) GetCreator() string {
 	if m != nil {
 		return m.Creator
 	}
 	return ""
 }
 
-type MsgServiceCreateDenomResponse struct {
+type MsgCreateDenomResponse struct {
 }
 
-func (m *MsgServiceCreateDenomResponse) Reset()         { *m = MsgServiceCreateDenomResponse{} }
-func (m *MsgServiceCreateDenomResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceCreateDenomResponse) ProtoMessage()    {}
-func (*MsgServiceCreateDenomResponse) Descriptor() ([]byte, []int) {
+func (m *MsgCreateDenomResponse) Reset()         { *m = MsgCreateDenomResponse{} }
+func (m *MsgCreateDenomResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgCreateDenomResponse) ProtoMessage()    {}
+func (*MsgCreateDenomResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{1}
 }
-func (m *MsgServiceCreateDenomResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgCreateDenomResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceCreateDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgCreateDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceCreateDenomResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgCreateDenomResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -151,19 +151,19 @@ func (m *MsgServiceCreateDenomResponse) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceCreateDenomResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceCreateDenomResponse.Merge(m, src)
+func (m *MsgCreateDenomResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCreateDenomResponse.Merge(m, src)
 }
-func (m *MsgServiceCreateDenomResponse) XXX_Size() int {
+func (m *MsgCreateDenomResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceCreateDenomResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceCreateDenomResponse.DiscardUnknown(m)
+func (m *MsgCreateDenomResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCreateDenomResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceCreateDenomResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgCreateDenomResponse proto.InternalMessageInfo
 
-type MsgServiceUpdateDenomRequest struct {
+type MsgUpdateDenomRequest struct {
 	Id          string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Name        string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	Symbol      string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`
@@ -174,18 +174,18 @@ type MsgServiceUpdateDenomRequest struct {
 	Updater     string `protobuf:"bytes,8,opt,name=updater,proto3" json:"updater,omitempty"`
 }
 
-func (m *MsgServiceUpdateDenomRequest) Reset()         { *m = MsgServiceUpdateDenomRequest{} }
-func (m *MsgServiceUpdateDenomRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceUpdateDenomRequest) ProtoMessage()    {}
-func (*MsgServiceUpdateDenomRequest) Descriptor() ([]byte, []int) {
+func (m *MsgUpdateDenomRequest) Reset()         { *m = MsgUpdateDenomRequest{} }
+func (m *MsgUpdateDenomRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateDenomRequest) ProtoMessage()    {}
+func (*MsgUpdateDenomRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{2}
 }
-func (m *MsgServiceUpdateDenomRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgUpdateDenomRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceUpdateDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgUpdateDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceUpdateDenomRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgUpdateDenomRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -195,89 +195,89 @@ func (m *MsgServiceUpdateDenomRequest) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceUpdateDenomRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceUpdateDenomRequest.Merge(m, src)
+func (m *MsgUpdateDenomRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateDenomRequest.Merge(m, src)
 }
-func (m *MsgServiceUpdateDenomRequest) XXX_Size() int {
+func (m *MsgUpdateDenomRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceUpdateDenomRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceUpdateDenomRequest.DiscardUnknown(m)
+func (m *MsgUpdateDenomRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateDenomRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceUpdateDenomRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgUpdateDenomRequest proto.InternalMessageInfo
 
-func (m *MsgServiceUpdateDenomRequest) GetId() string {
+func (m *MsgUpdateDenomRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetName() string {
+func (m *MsgUpdateDenomRequest) GetName() string {
 	if m != nil {
 		return m.Name
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetSymbol() string {
+func (m *MsgUpdateDenomRequest) GetSymbol() string {
 	if m != nil {
 		return m.Symbol
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetDescription() string {
+func (m *MsgUpdateDenomRequest) GetDescription() string {
 	if m != nil {
 		return m.Description
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetUri() string {
+func (m *MsgUpdateDenomRequest) GetUri() string {
 	if m != nil {
 		return m.Uri
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetUriHash() string {
+func (m *MsgUpdateDenomRequest) GetUriHash() string {
 	if m != nil {
 		return m.UriHash
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetData() string {
+func (m *MsgUpdateDenomRequest) GetData() string {
 	if m != nil {
 		return m.Data
 	}
 	return ""
 }
 
-func (m *MsgServiceUpdateDenomRequest) GetUpdater() string {
+func (m *MsgUpdateDenomRequest) GetUpdater() string {
 	if m != nil {
 		return m.Updater
 	}
 	return ""
 }
 
-type MsgServiceUpdateDenomResponse struct {
+type MsgUpdateDenomResponse struct {
 }
 
-func (m *MsgServiceUpdateDenomResponse) Reset()         { *m = MsgServiceUpdateDenomResponse{} }
-func (m *MsgServiceUpdateDenomResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceUpdateDenomResponse) ProtoMessage()    {}
-func (*MsgServiceUpdateDenomResponse) Descriptor() ([]byte, []int) {
+func (m *MsgUpdateDenomResponse) Reset()         { *m = MsgUpdateDenomResponse{} }
+func (m *MsgUpdateDenomResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgUpdateDenomResponse) ProtoMessage()    {}
+func (*MsgUpdateDenomResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{3}
 }
-func (m *MsgServiceUpdateDenomResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgUpdateDenomResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceUpdateDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgUpdateDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceUpdateDenomResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgUpdateDenomResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -287,35 +287,35 @@ func (m *MsgServiceUpdateDenomResponse) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceUpdateDenomResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceUpdateDenomResponse.Merge(m, src)
+func (m *MsgUpdateDenomResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgUpdateDenomResponse.Merge(m, src)
 }
-func (m *MsgServiceUpdateDenomResponse) XXX_Size() int {
+func (m *MsgUpdateDenomResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceUpdateDenomResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceUpdateDenomResponse.DiscardUnknown(m)
+func (m *MsgUpdateDenomResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgUpdateDenomResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceUpdateDenomResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgUpdateDenomResponse proto.InternalMessageInfo
 
-type MsgServiceDeleteDenomRequest struct {
+type MsgDeleteDenomRequest struct {
 	Id      string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Remover string `protobuf:"bytes,2,opt,name=remover,proto3" json:"remover,omitempty"`
 }
 
-func (m *MsgServiceDeleteDenomRequest) Reset()         { *m = MsgServiceDeleteDenomRequest{} }
-func (m *MsgServiceDeleteDenomRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeleteDenomRequest) ProtoMessage()    {}
-func (*MsgServiceDeleteDenomRequest) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteDenomRequest) Reset()         { *m = MsgDeleteDenomRequest{} }
+func (m *MsgDeleteDenomRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteDenomRequest) ProtoMessage()    {}
+func (*MsgDeleteDenomRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{4}
 }
-func (m *MsgServiceDeleteDenomRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteDenomRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeleteDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeleteDenomRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteDenomRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -325,47 +325,47 @@ func (m *MsgServiceDeleteDenomRequest) XXX_Marshal(b []byte, deterministic bool)
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeleteDenomRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeleteDenomRequest.Merge(m, src)
+func (m *MsgDeleteDenomRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteDenomRequest.Merge(m, src)
 }
-func (m *MsgServiceDeleteDenomRequest) XXX_Size() int {
+func (m *MsgDeleteDenomRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeleteDenomRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeleteDenomRequest.DiscardUnknown(m)
+func (m *MsgDeleteDenomRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteDenomRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeleteDenomRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteDenomRequest proto.InternalMessageInfo
 
-func (m *MsgServiceDeleteDenomRequest) GetId() string {
+func (m *MsgDeleteDenomRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceDeleteDenomRequest) GetRemover() string {
+func (m *MsgDeleteDenomRequest) GetRemover() string {
 	if m != nil {
 		return m.Remover
 	}
 	return ""
 }
 
-type MsgServiceDeleteDenomResponse struct {
+type MsgDeleteDenomResponse struct {
 }
 
-func (m *MsgServiceDeleteDenomResponse) Reset()         { *m = MsgServiceDeleteDenomResponse{} }
-func (m *MsgServiceDeleteDenomResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceDeleteDenomResponse) ProtoMessage()    {}
-func (*MsgServiceDeleteDenomResponse) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteDenomResponse) Reset()         { *m = MsgDeleteDenomResponse{} }
+func (m *MsgDeleteDenomResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteDenomResponse) ProtoMessage()    {}
+func (*MsgDeleteDenomResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{5}
 }
-func (m *MsgServiceDeleteDenomResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteDenomResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceDeleteDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceDeleteDenomResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteDenomResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -375,36 +375,36 @@ func (m *MsgServiceDeleteDenomResponse) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceDeleteDenomResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceDeleteDenomResponse.Merge(m, src)
+func (m *MsgDeleteDenomResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteDenomResponse.Merge(m, src)
 }
-func (m *MsgServiceDeleteDenomResponse) XXX_Size() int {
+func (m *MsgDeleteDenomResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceDeleteDenomResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceDeleteDenomResponse.DiscardUnknown(m)
+func (m *MsgDeleteDenomResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteDenomResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceDeleteDenomResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteDenomResponse proto.InternalMessageInfo
 
-type MsgServiceTransferDenomRequest struct {
+type MsgTransferDenomRequest struct {
 	Id       string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Sender   string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
 	Receiver string `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
 }
 
-func (m *MsgServiceTransferDenomRequest) Reset()         { *m = MsgServiceTransferDenomRequest{} }
-func (m *MsgServiceTransferDenomRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceTransferDenomRequest) ProtoMessage()    {}
-func (*MsgServiceTransferDenomRequest) Descriptor() ([]byte, []int) {
+func (m *MsgTransferDenomRequest) Reset()         { *m = MsgTransferDenomRequest{} }
+func (m *MsgTransferDenomRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgTransferDenomRequest) ProtoMessage()    {}
+func (*MsgTransferDenomRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{6}
 }
-func (m *MsgServiceTransferDenomRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgTransferDenomRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceTransferDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgTransferDenomRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceTransferDenomRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgTransferDenomRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -414,54 +414,54 @@ func (m *MsgServiceTransferDenomRequest) XXX_Marshal(b []byte, deterministic boo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceTransferDenomRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceTransferDenomRequest.Merge(m, src)
+func (m *MsgTransferDenomRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgTransferDenomRequest.Merge(m, src)
 }
-func (m *MsgServiceTransferDenomRequest) XXX_Size() int {
+func (m *MsgTransferDenomRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceTransferDenomRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceTransferDenomRequest.DiscardUnknown(m)
+func (m *MsgTransferDenomRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgTransferDenomRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceTransferDenomRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgTransferDenomRequest proto.InternalMessageInfo
 
-func (m *MsgServiceTransferDenomRequest) GetId() string {
+func (m *MsgTransferDenomRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceTransferDenomRequest) GetSender() string {
+func (m *MsgTransferDenomRequest) GetSender() string {
 	if m != nil {
 		return m.Sender
 	}
 	return ""
 }
 
-func (m *MsgServiceTransferDenomRequest) GetReceiver() string {
+func (m *MsgTransferDenomRequest) GetReceiver() string {
 	if m != nil {
 		return m.Receiver
 	}
 	return ""
 }
 
-type MsgServiceTransferDenomResponse struct {
+type MsgTransferDenomResponse struct {
 }
 
-func (m *MsgServiceTransferDenomResponse) Reset()         { *m = MsgServiceTransferDenomResponse{} }
-func (m *MsgServiceTransferDenomResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceTransferDenomResponse) ProtoMessage()    {}
-func (*MsgServiceTransferDenomResponse) Descriptor() ([]byte, []int) {
+func (m *MsgTransferDenomResponse) Reset()         { *m = MsgTransferDenomResponse{} }
+func (m *MsgTransferDenomResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgTransferDenomResponse) ProtoMessage()    {}
+func (*MsgTransferDenomResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{7}
 }
-func (m *MsgServiceTransferDenomResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgTransferDenomResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceTransferDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgTransferDenomResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceTransferDenomResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgTransferDenomResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -471,19 +471,19 @@ func (m *MsgServiceTransferDenomResponse) XXX_Marshal(b []byte, deterministic bo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceTransferDenomResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceTransferDenomResponse.Merge(m, src)
+func (m *MsgTransferDenomResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgTransferDenomResponse.Merge(m, src)
 }
-func (m *MsgServiceTransferDenomResponse) XXX_Size() int {
+func (m *MsgTransferDenomResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceTransferDenomResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceTransferDenomResponse.DiscardUnknown(m)
+func (m *MsgTransferDenomResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgTransferDenomResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceTransferDenomResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgTransferDenomResponse proto.InternalMessageInfo
 
-type MsgServiceMintPNFTRequest struct {
+type MsgMintPNFTRequest struct {
 	DenomId     string `protobuf:"bytes,1,opt,name=denom_id,json=denomId,proto3" json:"denom_id,omitempty"`
 	Id          string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	Name        string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
@@ -494,18 +494,18 @@ type MsgServiceMintPNFTRequest struct {
 	Creator     string `protobuf:"bytes,8,opt,name=creator,proto3" json:"creator,omitempty"`
 }
 
-func (m *MsgServiceMintPNFTRequest) Reset()         { *m = MsgServiceMintPNFTRequest{} }
-func (m *MsgServiceMintPNFTRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceMintPNFTRequest) ProtoMessage()    {}
-func (*MsgServiceMintPNFTRequest) Descriptor() ([]byte, []int) {
+func (m *MsgMintPNFTRequest) Reset()         { *m = MsgMintPNFTRequest{} }
+func (m *MsgMintPNFTRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgMintPNFTRequest) ProtoMessage()    {}
+func (*MsgMintPNFTRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{8}
 }
-func (m *MsgServiceMintPNFTRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgMintPNFTRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceMintPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgMintPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceMintPNFTRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgMintPNFTRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -515,89 +515,89 @@ func (m *MsgServiceMintPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceMintPNFTRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceMintPNFTRequest.Merge(m, src)
+func (m *MsgMintPNFTRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgMintPNFTRequest.Merge(m, src)
 }
-func (m *MsgServiceMintPNFTRequest) XXX_Size() int {
+func (m *MsgMintPNFTRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceMintPNFTRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceMintPNFTRequest.DiscardUnknown(m)
+func (m *MsgMintPNFTRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgMintPNFTRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceMintPNFTRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgMintPNFTRequest proto.InternalMessageInfo
 
-func (m *MsgServiceMintPNFTRequest) GetDenomId() string {
+func (m *MsgMintPNFTRequest) GetDenomId() string {
 	if m != nil {
 		return m.DenomId
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetId() string {
+func (m *MsgMintPNFTRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetName() string {
+func (m *MsgMintPNFTRequest) GetName() string {
 	if m != nil {
 		return m.Name
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetDescription() string {
+func (m *MsgMintPNFTRequest) GetDescription() string {
 	if m != nil {
 		return m.Description
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetUri() string {
+func (m *MsgMintPNFTRequest) GetUri() string {
 	if m != nil {
 		return m.Uri
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetUriHash() string {
+func (m *MsgMintPNFTRequest) GetUriHash() string {
 	if m != nil {
 		return m.UriHash
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetData() string {
+func (m *MsgMintPNFTRequest) GetData() string {
 	if m != nil {
 		return m.Data
 	}
 	return ""
 }
 
-func (m *MsgServiceMintPNFTRequest) GetCreator() string {
+func (m *MsgMintPNFTRequest) GetCreator() string {
 	if m != nil {
 		return m.Creator
 	}
 	return ""
 }
 
-type MsgServiceMintPNFTResponse struct {
+type MsgMintPNFTResponse struct {
 }
 
-func (m *MsgServiceMintPNFTResponse) Reset()         { *m = MsgServiceMintPNFTResponse{} }
-func (m *MsgServiceMintPNFTResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceMintPNFTResponse) ProtoMessage()    {}
-func (*MsgServiceMintPNFTResponse) Descriptor() ([]byte, []int) {
+func (m *MsgMintPNFTResponse) Reset()         { *m = MsgMintPNFTResponse{} }
+func (m *MsgMintPNFTResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgMintPNFTResponse) ProtoMessage()    {}
+func (*MsgMintPNFTResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{9}
 }
-func (m *MsgServiceMintPNFTResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgMintPNFTResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceMintPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgMintPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceMintPNFTResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgMintPNFTResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -607,37 +607,37 @@ func (m *MsgServiceMintPNFTResponse) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceMintPNFTResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceMintPNFTResponse.Merge(m, src)
+func (m *MsgMintPNFTResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgMintPNFTResponse.Merge(m, src)
 }
-func (m *MsgServiceMintPNFTResponse) XXX_Size() int {
+func (m *MsgMintPNFTResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceMintPNFTResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceMintPNFTResponse.DiscardUnknown(m)
+func (m *MsgMintPNFTResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgMintPNFTResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceMintPNFTResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgMintPNFTResponse proto.InternalMessageInfo
 
-type MsgServiceTransferPNFTRequest struct {
+type MsgTransferPNFTRequest struct {
 	DenomId  string `protobuf:"bytes,1,opt,name=denom_id,json=denomId,proto3" json:"denom_id,omitempty"`
 	Id       string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	Sender   string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"`
 	Receiver string `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"`
 }
 
-func (m *MsgServiceTransferPNFTRequest) Reset()         { *m = MsgServiceTransferPNFTRequest{} }
-func (m *MsgServiceTransferPNFTRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceTransferPNFTRequest) ProtoMessage()    {}
-func (*MsgServiceTransferPNFTRequest) Descriptor() ([]byte, []int) {
+func (m *MsgTransferPNFTRequest) Reset()         { *m = MsgTransferPNFTRequest{} }
+func (m *MsgTransferPNFTRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgTransferPNFTRequest) ProtoMessage()    {}
+func (*MsgTransferPNFTRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{10}
 }
-func (m *MsgServiceTransferPNFTRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgTransferPNFTRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceTransferPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgTransferPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceTransferPNFTRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgTransferPNFTRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -647,61 +647,61 @@ func (m *MsgServiceTransferPNFTRequest) XXX_Marshal(b []byte, deterministic bool
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceTransferPNFTRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceTransferPNFTRequest.Merge(m, src)
+func (m *MsgTransferPNFTRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgTransferPNFTRequest.Merge(m, src)
 }
-func (m *MsgServiceTransferPNFTRequest) XXX_Size() int {
+func (m *MsgTransferPNFTRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceTransferPNFTRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceTransferPNFTRequest.DiscardUnknown(m)
+func (m *MsgTransferPNFTRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgTransferPNFTRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceTransferPNFTRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgTransferPNFTRequest proto.InternalMessageInfo
 
-func (m *MsgServiceTransferPNFTRequest) GetDenomId() string {
+func (m *MsgTransferPNFTRequest) GetDenomId() string {
 	if m != nil {
 		return m.DenomId
 	}
 	return ""
 }
 
-func (m *MsgServiceTransferPNFTRequest) GetId() string {
+func (m *MsgTransferPNFTRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceTransferPNFTRequest) GetSender() string {
+func (m *MsgTransferPNFTRequest) GetSender() string {
 	if m != nil {
 		return m.Sender
 	}
 	return ""
 }
 
-func (m *MsgServiceTransferPNFTRequest) GetReceiver() string {
+func (m *MsgTransferPNFTRequest) GetReceiver() string {
 	if m != nil {
 		return m.Receiver
 	}
 	return ""
 }
 
-type MsgServiceTransferPNFTResponse struct {
+type MsgTransferPNFTResponse struct {
 }
 
-func (m *MsgServiceTransferPNFTResponse) Reset()         { *m = MsgServiceTransferPNFTResponse{} }
-func (m *MsgServiceTransferPNFTResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceTransferPNFTResponse) ProtoMessage()    {}
-func (*MsgServiceTransferPNFTResponse) Descriptor() ([]byte, []int) {
+func (m *MsgTransferPNFTResponse) Reset()         { *m = MsgTransferPNFTResponse{} }
+func (m *MsgTransferPNFTResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgTransferPNFTResponse) ProtoMessage()    {}
+func (*MsgTransferPNFTResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{11}
 }
-func (m *MsgServiceTransferPNFTResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgTransferPNFTResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceTransferPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgTransferPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceTransferPNFTResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgTransferPNFTResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -711,36 +711,36 @@ func (m *MsgServiceTransferPNFTResponse) XXX_Marshal(b []byte, deterministic boo
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceTransferPNFTResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceTransferPNFTResponse.Merge(m, src)
+func (m *MsgTransferPNFTResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgTransferPNFTResponse.Merge(m, src)
 }
-func (m *MsgServiceTransferPNFTResponse) XXX_Size() int {
+func (m *MsgTransferPNFTResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceTransferPNFTResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceTransferPNFTResponse.DiscardUnknown(m)
+func (m *MsgTransferPNFTResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgTransferPNFTResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceTransferPNFTResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgTransferPNFTResponse proto.InternalMessageInfo
 
-type MsgServiceBurnPNFTRequest struct {
+type MsgBurnPNFTRequest struct {
 	DenomId string `protobuf:"bytes,1,opt,name=denom_id,json=denomId,proto3" json:"denom_id,omitempty"`
 	Id      string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
 	Burner  string `protobuf:"bytes,3,opt,name=burner,proto3" json:"burner,omitempty"`
 }
 
-func (m *MsgServiceBurnPNFTRequest) Reset()         { *m = MsgServiceBurnPNFTRequest{} }
-func (m *MsgServiceBurnPNFTRequest) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceBurnPNFTRequest) ProtoMessage()    {}
-func (*MsgServiceBurnPNFTRequest) Descriptor() ([]byte, []int) {
+func (m *MsgBurnPNFTRequest) Reset()         { *m = MsgBurnPNFTRequest{} }
+func (m *MsgBurnPNFTRequest) String() string { return proto.CompactTextString(m) }
+func (*MsgBurnPNFTRequest) ProtoMessage()    {}
+func (*MsgBurnPNFTRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{12}
 }
-func (m *MsgServiceBurnPNFTRequest) XXX_Unmarshal(b []byte) error {
+func (m *MsgBurnPNFTRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceBurnPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgBurnPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceBurnPNFTRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgBurnPNFTRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -750,54 +750,54 @@ func (m *MsgServiceBurnPNFTRequest) XXX_Marshal(b []byte, deterministic bool) ([
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceBurnPNFTRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceBurnPNFTRequest.Merge(m, src)
+func (m *MsgBurnPNFTRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgBurnPNFTRequest.Merge(m, src)
 }
-func (m *MsgServiceBurnPNFTRequest) XXX_Size() int {
+func (m *MsgBurnPNFTRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceBurnPNFTRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceBurnPNFTRequest.DiscardUnknown(m)
+func (m *MsgBurnPNFTRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgBurnPNFTRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceBurnPNFTRequest proto.InternalMessageInfo
+var xxx_messageInfo_MsgBurnPNFTRequest proto.InternalMessageInfo
 
-func (m *MsgServiceBurnPNFTRequest) GetDenomId() string {
+func (m *MsgBurnPNFTRequest) GetDenomId() string {
 	if m != nil {
 		return m.DenomId
 	}
 	return ""
 }
 
-func (m *MsgServiceBurnPNFTRequest) GetId() string {
+func (m *MsgBurnPNFTRequest) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *MsgServiceBurnPNFTRequest) GetBurner() string {
+func (m *MsgBurnPNFTRequest) GetBurner() string {
 	if m != nil {
 		return m.Burner
 	}
 	return ""
 }
 
-type MsgServiceBurnPNFTResponse struct {
+type MsgBurnPNFTResponse struct {
 }
 
-func (m *MsgServiceBurnPNFTResponse) Reset()         { *m = MsgServiceBurnPNFTResponse{} }
-func (m *MsgServiceBurnPNFTResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgServiceBurnPNFTResponse) ProtoMessage()    {}
-func (*MsgServiceBurnPNFTResponse) Descriptor() ([]byte, []int) {
+func (m *MsgBurnPNFTResponse) Reset()         { *m = MsgBurnPNFTResponse{} }
+func (m *MsgBurnPNFTResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgBurnPNFTResponse) ProtoMessage()    {}
+func (*MsgBurnPNFTResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_da49c5b4a63605b2, []int{13}
 }
-func (m *MsgServiceBurnPNFTResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgBurnPNFTResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgServiceBurnPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgBurnPNFTResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgServiceBurnPNFTResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgBurnPNFTResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -807,77 +807,77 @@ func (m *MsgServiceBurnPNFTResponse) XXX_Marshal(b []byte, deterministic bool) (
 		return b[:n], nil
 	}
 }
-func (m *MsgServiceBurnPNFTResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgServiceBurnPNFTResponse.Merge(m, src)
+func (m *MsgBurnPNFTResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgBurnPNFTResponse.Merge(m, src)
 }
-func (m *MsgServiceBurnPNFTResponse) XXX_Size() int {
+func (m *MsgBurnPNFTResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgServiceBurnPNFTResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgServiceBurnPNFTResponse.DiscardUnknown(m)
+func (m *MsgBurnPNFTResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgBurnPNFTResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgServiceBurnPNFTResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgBurnPNFTResponse proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MsgServiceCreateDenomRequest)(nil), "panacea.pnft.v2.MsgServiceCreateDenomRequest")
-	proto.RegisterType((*MsgServiceCreateDenomResponse)(nil), "panacea.pnft.v2.MsgServiceCreateDenomResponse")
-	proto.RegisterType((*MsgServiceUpdateDenomRequest)(nil), "panacea.pnft.v2.MsgServiceUpdateDenomRequest")
-	proto.RegisterType((*MsgServiceUpdateDenomResponse)(nil), "panacea.pnft.v2.MsgServiceUpdateDenomResponse")
-	proto.RegisterType((*MsgServiceDeleteDenomRequest)(nil), "panacea.pnft.v2.MsgServiceDeleteDenomRequest")
-	proto.RegisterType((*MsgServiceDeleteDenomResponse)(nil), "panacea.pnft.v2.MsgServiceDeleteDenomResponse")
-	proto.RegisterType((*MsgServiceTransferDenomRequest)(nil), "panacea.pnft.v2.MsgServiceTransferDenomRequest")
-	proto.RegisterType((*MsgServiceTransferDenomResponse)(nil), "panacea.pnft.v2.MsgServiceTransferDenomResponse")
-	proto.RegisterType((*MsgServiceMintPNFTRequest)(nil), "panacea.pnft.v2.MsgServiceMintPNFTRequest")
-	proto.RegisterType((*MsgServiceMintPNFTResponse)(nil), "panacea.pnft.v2.MsgServiceMintPNFTResponse")
-	proto.RegisterType((*MsgServiceTransferPNFTRequest)(nil), "panacea.pnft.v2.MsgServiceTransferPNFTRequest")
-	proto.RegisterType((*MsgServiceTransferPNFTResponse)(nil), "panacea.pnft.v2.MsgServiceTransferPNFTResponse")
-	proto.RegisterType((*MsgServiceBurnPNFTRequest)(nil), "panacea.pnft.v2.MsgServiceBurnPNFTRequest")
-	proto.RegisterType((*MsgServiceBurnPNFTResponse)(nil), "panacea.pnft.v2.MsgServiceBurnPNFTResponse")
+	proto.RegisterType((*MsgCreateDenomRequest)(nil), "panacea.pnft.v2.MsgCreateDenomRequest")
+	proto.RegisterType((*MsgCreateDenomResponse)(nil), "panacea.pnft.v2.MsgCreateDenomResponse")
+	proto.RegisterType((*MsgUpdateDenomRequest)(nil), "panacea.pnft.v2.MsgUpdateDenomRequest")
+	proto.RegisterType((*MsgUpdateDenomResponse)(nil), "panacea.pnft.v2.MsgUpdateDenomResponse")
+	proto.RegisterType((*MsgDeleteDenomRequest)(nil), "panacea.pnft.v2.MsgDeleteDenomRequest")
+	proto.RegisterType((*MsgDeleteDenomResponse)(nil), "panacea.pnft.v2.MsgDeleteDenomResponse")
+	proto.RegisterType((*MsgTransferDenomRequest)(nil), "panacea.pnft.v2.MsgTransferDenomRequest")
+	proto.RegisterType((*MsgTransferDenomResponse)(nil), "panacea.pnft.v2.MsgTransferDenomResponse")
+	proto.RegisterType((*MsgMintPNFTRequest)(nil), "panacea.pnft.v2.MsgMintPNFTRequest")
+	proto.RegisterType((*MsgMintPNFTResponse)(nil), "panacea.pnft.v2.MsgMintPNFTResponse")
+	proto.RegisterType((*MsgTransferPNFTRequest)(nil), "panacea.pnft.v2.MsgTransferPNFTRequest")
+	proto.RegisterType((*MsgTransferPNFTResponse)(nil), "panacea.pnft.v2.MsgTransferPNFTResponse")
+	proto.RegisterType((*MsgBurnPNFTRequest)(nil), "panacea.pnft.v2.MsgBurnPNFTRequest")
+	proto.RegisterType((*MsgBurnPNFTResponse)(nil), "panacea.pnft.v2.MsgBurnPNFTResponse")
 }
 
 func init() { proto.RegisterFile("panacea/pnft/v2/tx.proto", fileDescriptor_da49c5b4a63605b2) }
 
 var fileDescriptor_da49c5b4a63605b2 = []byte{
-	// 601 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0xad, 0x93, 0x90, 0x84, 0x29, 0x5f, 0xda, 0x03, 0xda, 0x44, 0xc5, 0x0d, 0x39, 0x21, 0x50,
-	0x6c, 0x14, 0xfe, 0x41, 0xa9, 0x50, 0x7b, 0x28, 0xaa, 0x4a, 0xb9, 0x70, 0xa0, 0x72, 0xec, 0x69,
-	0xb3, 0x52, 0xbc, 0x6b, 0xd6, 0x76, 0xd4, 0x5e, 0xb8, 0x71, 0xe7, 0x67, 0x71, 0xec, 0x0d, 0x8e,
-	0x28, 0xf9, 0x23, 0xc8, 0xf6, 0x26, 0xfe, 0x48, 0xb2, 0x44, 0xbd, 0x20, 0x6e, 0x3b, 0xbb, 0xe3,
-	0x7d, 0xef, 0xed, 0xcc, 0x1b, 0x19, 0x68, 0xe0, 0x70, 0xc7, 0x45, 0xc7, 0x0e, 0xf8, 0x65, 0x64,
-	0x4f, 0x87, 0x76, 0x74, 0x6d, 0x05, 0x52, 0x44, 0x82, 0x3c, 0x56, 0x27, 0x56, 0x72, 0x62, 0x4d,
-	0x87, 0xfd, 0x9f, 0x06, 0xec, 0x9d, 0x84, 0x57, 0x1f, 0x50, 0x4e, 0x99, 0x8b, 0x6f, 0x25, 0x3a,
-	0x11, 0x1e, 0x22, 0x17, 0xfe, 0x19, 0x7e, 0x89, 0x31, 0x8c, 0xc8, 0x23, 0xa8, 0x31, 0x8f, 0x1a,
-	0x3d, 0xe3, 0xc5, 0xfd, 0xb3, 0x1a, 0xf3, 0x08, 0x81, 0x06, 0x77, 0x7c, 0xa4, 0xb5, 0x74, 0x27,
-	0x5d, 0x93, 0xa7, 0xd0, 0x0c, 0x6f, 0xfc, 0x91, 0x98, 0xd0, 0x7a, 0xba, 0xab, 0x22, 0xd2, 0x83,
-	0x5d, 0x0f, 0x43, 0x57, 0xb2, 0x20, 0x62, 0x82, 0xd3, 0x46, 0x7a, 0x58, 0xdc, 0x22, 0x4f, 0xa0,
-	0x1e, 0x4b, 0x46, 0xef, 0xa5, 0x27, 0xc9, 0x92, 0x74, 0xa0, 0x1d, 0x4b, 0x76, 0x31, 0x76, 0xc2,
-	0x31, 0x6d, 0xa6, 0xdb, 0xad, 0x58, 0xb2, 0x23, 0x27, 0x1c, 0x27, 0xd0, 0x9e, 0x13, 0x39, 0xb4,
-	0x95, 0x41, 0x27, 0x6b, 0x42, 0xa1, 0xe5, 0x26, 0xa4, 0x85, 0xa4, 0xed, 0x2c, 0x5b, 0x85, 0xfd,
-	0x7d, 0x78, 0xb6, 0x41, 0x58, 0x18, 0x08, 0x1e, 0x62, 0x45, 0xfa, 0xc7, 0xc0, 0xfb, 0xff, 0xa4,
-	0xc7, 0x29, 0xe9, 0xa5, 0x74, 0x15, 0x96, 0xa5, 0x97, 0x84, 0x29, 0xe9, 0x47, 0x45, 0xe5, 0x87,
-	0x38, 0xc1, 0xbf, 0x28, 0xa7, 0xd0, 0x92, 0xe8, 0x8b, 0x29, 0x4a, 0x25, 0x7e, 0x11, 0x96, 0xa1,
-	0x4a, 0x37, 0x29, 0x28, 0x0f, 0xcc, 0x3c, 0xe1, 0x5c, 0x3a, 0x3c, 0xbc, 0x44, 0xa9, 0x05, 0x4b,
-	0x9e, 0x14, 0xb9, 0xb7, 0xc4, 0x52, 0x11, 0xe9, 0x42, 0x5b, 0xa2, 0x8b, 0x2c, 0x61, 0x91, 0x3d,
-	0xf6, 0x32, 0xee, 0x3f, 0x87, 0xfd, 0x8d, 0x28, 0x79, 0xb9, 0x3b, 0x79, 0xce, 0x09, 0xe3, 0xd1,
-	0xe9, 0xfb, 0x77, 0xe7, 0x0b, 0x12, 0x1d, 0x68, 0x7b, 0x49, 0xfa, 0xc5, 0x92, 0x4a, 0x2b, 0x8d,
-	0x8f, 0x3d, 0xc5, 0xaf, 0xb6, 0xd2, 0x06, 0xf5, 0x42, 0x1b, 0xfc, 0xd3, 0x4e, 0xdf, 0x83, 0xee,
-	0x3a, 0x61, 0x4a, 0xf7, 0xd7, 0x62, 0x85, 0x16, 0x4f, 0x73, 0x47, 0xe9, 0x79, 0x69, 0xea, 0x1b,
-	0x4b, 0xd3, 0xa8, 0x94, 0xa6, 0xb7, 0xae, 0x01, 0x4a, 0x0c, 0x3f, 0x17, 0x0b, 0x73, 0x10, 0x4b,
-	0x7e, 0x77, 0x76, 0xa3, 0x58, 0xf2, 0x9c, 0x5d, 0x16, 0x95, 0xdf, 0x27, 0xbf, 0x3f, 0x43, 0x1f,
-	0x7e, 0x6b, 0x02, 0xe4, 0xc7, 0x64, 0x02, 0xbb, 0x85, 0x61, 0x41, 0x06, 0x56, 0x65, 0x62, 0x5a,
-	0xba, 0x69, 0xd9, 0xb5, 0xb6, 0x4d, 0xcf, 0xc0, 0x13, 0xb4, 0x82, 0x3f, 0xb5, 0x68, 0xab, 0x03,
-	0x4a, 0x8b, 0xb6, 0xc6, 0xf6, 0x09, 0x5a, 0xc1, 0xa2, 0x5a, 0xb4, 0xd5, 0xa1, 0xa0, 0x45, 0x5b,
-	0xe3, 0x7c, 0x22, 0xe1, 0x61, 0xc9, 0x89, 0xc4, 0xd6, 0x5c, 0xb0, 0x6e, 0x32, 0x74, 0x5f, 0x6f,
-	0xff, 0x81, 0xc2, 0x74, 0xa1, 0xbd, 0x30, 0x00, 0x79, 0xa9, 0xf9, 0xba, 0x62, 0xff, 0xee, 0xab,
-	0xad, 0x72, 0x15, 0x88, 0x80, 0x07, 0xc5, 0x3e, 0x26, 0xd6, 0x16, 0x34, 0x8b, 0x60, 0xf6, 0xd6,
-	0xf9, 0xb9, 0xaa, 0x45, 0xdb, 0x6a, 0x55, 0x55, 0xbc, 0xa3, 0x55, 0x55, 0xf5, 0xc1, 0xc1, 0xf1,
-	0x8f, 0x99, 0x69, 0xdc, 0xce, 0x4c, 0xe3, 0xf7, 0xcc, 0x34, 0xbe, 0xcf, 0xcd, 0x9d, 0xdb, 0xb9,
-	0xb9, 0xf3, 0x6b, 0x6e, 0xee, 0x9c, 0x1a, 0x9f, 0x06, 0x57, 0x2c, 0x1a, 0xc7, 0x23, 0xcb, 0x15,
-	0xbe, 0xed, 0xa3, 0xc7, 0x46, 0x13, 0xe1, 0xda, 0xea, 0xee, 0x81, 0x2b, 0x24, 0xda, 0xd7, 0xd9,
-	0xbf, 0x46, 0x74, 0x13, 0x60, 0x38, 0x6a, 0xa6, 0x3f, 0x1b, 0x6f, 0xfe, 0x04, 0x00, 0x00, 0xff,
-	0xff, 0xfb, 0xd7, 0xd8, 0xe0, 0x88, 0x08, 0x00, 0x00,
+	// 597 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xdd, 0x6e, 0xd3, 0x30,
+	0x14, 0x6e, 0xda, 0xae, 0x2d, 0x1e, 0x7f, 0x32, 0xda, 0x70, 0x7b, 0x11, 0x4d, 0x05, 0xb1, 0x72,
+	0xb1, 0x44, 0x2a, 0x4f, 0xc0, 0x98, 0x10, 0xbb, 0x28, 0x9a, 0xa6, 0x4d, 0x48, 0x48, 0x30, 0xb9,
+	0x89, 0xd7, 0x5a, 0x6a, 0xec, 0x60, 0x27, 0x65, 0x7b, 0x0b, 0x1e, 0x80, 0x07, 0xe2, 0xb2, 0x97,
+	0x5c, 0xa2, 0xf6, 0x45, 0x50, 0x1c, 0xa7, 0x4d, 0x52, 0xd3, 0xa2, 0xdd, 0x20, 0xee, 0x7c, 0xec,
+	0x93, 0xef, 0x7c, 0xdf, 0xf1, 0xf9, 0x1c, 0x80, 0x42, 0xcc, 0xb0, 0x47, 0xb0, 0x1b, 0xb2, 0xeb,
+	0xc8, 0x9d, 0xf6, 0xdd, 0xe8, 0xc6, 0x09, 0x05, 0x8f, 0x38, 0x7c, 0xa4, 0x4f, 0x9c, 0xe4, 0xc4,
+	0x99, 0xf6, 0xbb, 0x33, 0x0b, 0xec, 0x0d, 0xe4, 0xe8, 0x8d, 0x20, 0x38, 0x22, 0x27, 0x84, 0xf1,
+	0xe0, 0x9c, 0x7c, 0x89, 0x89, 0x8c, 0xe0, 0x43, 0x50, 0xa5, 0x3e, 0xb2, 0x0e, 0xac, 0xde, 0xbd,
+	0xf3, 0x2a, 0xf5, 0x21, 0x04, 0x75, 0x86, 0x03, 0x82, 0xaa, 0x6a, 0x47, 0xad, 0xe1, 0x3e, 0x68,
+	0xc8, 0xdb, 0x60, 0xc8, 0x27, 0xa8, 0xa6, 0x76, 0x75, 0x04, 0x0f, 0xc0, 0xae, 0x4f, 0xa4, 0x27,
+	0x68, 0x18, 0x51, 0xce, 0x50, 0x5d, 0x1d, 0xe6, 0xb7, 0xe0, 0x63, 0x50, 0x8b, 0x05, 0x45, 0x3b,
+	0xea, 0x24, 0x59, 0xc2, 0x36, 0x68, 0xc5, 0x82, 0x5e, 0x8d, 0xb1, 0x1c, 0xa3, 0x86, 0xda, 0x6e,
+	0xc6, 0x82, 0xbe, 0xc3, 0x72, 0x9c, 0x94, 0xf6, 0x71, 0x84, 0x51, 0x33, 0x2d, 0x9d, 0xac, 0x21,
+	0x02, 0x4d, 0x2f, 0x21, 0xcd, 0x05, 0x6a, 0xa5, 0xd9, 0x3a, 0xec, 0x22, 0xb0, 0x5f, 0x56, 0x24,
+	0x43, 0xce, 0x24, 0xc9, 0xc4, 0x5e, 0x86, 0xfe, 0xff, 0x27, 0x36, 0x56, 0xa4, 0x97, 0x62, 0x75,
+	0xa8, 0xc5, 0x16, 0x14, 0x69, 0xb1, 0xaf, 0x95, 0xd6, 0x13, 0x32, 0x21, 0x5b, 0xb4, 0x22, 0xd0,
+	0x14, 0x24, 0xe0, 0x53, 0x22, 0xb4, 0xdc, 0x2c, 0xd4, 0xe0, 0x05, 0x08, 0x0d, 0xfe, 0x09, 0x3c,
+	0x1d, 0xc8, 0xd1, 0x85, 0xc0, 0x4c, 0x5e, 0x13, 0xb1, 0x11, 0x3e, 0x69, 0x1b, 0x61, 0xfe, 0x12,
+	0x5d, 0x47, 0xb0, 0x03, 0x5a, 0x82, 0x78, 0x84, 0x26, 0x75, 0xd3, 0x86, 0x2e, 0xe3, 0x6e, 0x07,
+	0xa0, 0x75, 0xf8, 0xd5, 0x25, 0xc2, 0x81, 0x1c, 0x0d, 0x28, 0x8b, 0xce, 0xde, 0xbf, 0xbd, 0xc8,
+	0xca, 0xb6, 0x41, 0xcb, 0x4f, 0xf2, 0xae, 0x96, 0xc5, 0x9b, 0x2a, 0x3e, 0xf5, 0x35, 0xa3, 0xea,
+	0xda, 0xe5, 0xd6, 0x72, 0x97, 0xfb, 0x4f, 0x27, 0x76, 0x0f, 0x3c, 0x29, 0x28, 0xd2, 0x4a, 0xbf,
+	0xaa, 0xf6, 0x67, 0x5d, 0xb8, 0xa3, 0xd8, 0x55, 0xfb, 0x6b, 0x7f, 0x6c, 0x7f, 0xbd, 0xd4, 0xfe,
+	0x76, 0xe1, 0x76, 0x0b, 0x9c, 0x3e, 0xa8, 0xe6, 0x1f, 0xc7, 0x82, 0xdd, 0x9d, 0xcf, 0x30, 0x16,
+	0x6c, 0xc5, 0x27, 0x8d, 0x74, 0x0f, 0x56, 0xc0, 0x69, 0xbd, 0xfe, 0xf7, 0x1d, 0x50, 0x1b, 0xc8,
+	0x11, 0xfc, 0x0c, 0x76, 0x73, 0x8e, 0x86, 0x2f, 0x9c, 0xd2, 0x43, 0xe6, 0x18, 0x1f, 0xb1, 0xce,
+	0xe1, 0xd6, 0xbc, 0xb4, 0x4e, 0x82, 0x9f, 0x33, 0x91, 0x19, 0x7f, 0xfd, 0xdd, 0x30, 0xe3, 0x1b,
+	0xdc, 0x98, 0xe0, 0xe7, 0x7c, 0x64, 0xc6, 0x5f, 0xf7, 0xaa, 0x19, 0xdf, 0x60, 0x48, 0xe8, 0x83,
+	0x07, 0x05, 0xbb, 0xc0, 0x9e, 0xe9, 0x4b, 0x93, 0x61, 0x3b, 0x2f, 0xff, 0x22, 0x53, 0x57, 0xb9,
+	0x04, 0xad, 0x6c, 0x4a, 0xe1, 0x33, 0xd3, 0x67, 0x25, 0x57, 0x76, 0x9e, 0x6f, 0x4e, 0xd2, 0xb0,
+	0x18, 0xdc, 0xcf, 0x0f, 0x1b, 0x3c, 0xdc, 0xc4, 0x28, 0x0f, 0xdf, 0xdb, 0x9e, 0xb8, 0x62, 0x9e,
+	0xcd, 0x96, 0x99, 0x79, 0x69, 0xa4, 0xcd, 0xcc, 0xcb, 0xe3, 0x79, 0x7c, 0xfa, 0x63, 0x6e, 0x5b,
+	0xb3, 0xb9, 0x6d, 0xfd, 0x9a, 0xdb, 0xd6, 0xb7, 0x85, 0x5d, 0x99, 0x2d, 0xec, 0xca, 0xcf, 0x85,
+	0x5d, 0x39, 0xb3, 0x3e, 0x1e, 0x8d, 0x68, 0x34, 0x8e, 0x87, 0x8e, 0xc7, 0x03, 0x37, 0x20, 0x3e,
+	0x1d, 0x4e, 0xb8, 0xe7, 0x6a, 0xd0, 0x23, 0x8f, 0x0b, 0xe2, 0xde, 0xa4, 0x3f, 0xe8, 0xe8, 0x36,
+	0x24, 0x72, 0xd8, 0x50, 0x7f, 0xe8, 0x57, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x58, 0x77,
+	0xa3, 0xbd, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -888,295 +888,295 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// MsgServiceClient is the client API for MsgService service.
+// MsgClient is the client API for Msg service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type MsgServiceClient interface {
-	CreateDenom(ctx context.Context, in *MsgServiceCreateDenomRequest, opts ...grpc.CallOption) (*MsgServiceCreateDenomResponse, error)
-	UpdateDenom(ctx context.Context, in *MsgServiceUpdateDenomRequest, opts ...grpc.CallOption) (*MsgServiceUpdateDenomResponse, error)
-	DeleteDenom(ctx context.Context, in *MsgServiceDeleteDenomRequest, opts ...grpc.CallOption) (*MsgServiceDeleteDenomResponse, error)
-	TransferDenom(ctx context.Context, in *MsgServiceTransferDenomRequest, opts ...grpc.CallOption) (*MsgServiceTransferDenomResponse, error)
-	MintPNFT(ctx context.Context, in *MsgServiceMintPNFTRequest, opts ...grpc.CallOption) (*MsgServiceMintPNFTResponse, error)
-	TransferPNFT(ctx context.Context, in *MsgServiceTransferPNFTRequest, opts ...grpc.CallOption) (*MsgServiceTransferPNFTResponse, error)
-	BurnPNFT(ctx context.Context, in *MsgServiceBurnPNFTRequest, opts ...grpc.CallOption) (*MsgServiceBurnPNFTResponse, error)
+type MsgClient interface {
+	CreateDenom(ctx context.Context, in *MsgCreateDenomRequest, opts ...grpc.CallOption) (*MsgCreateDenomResponse, error)
+	UpdateDenom(ctx context.Context, in *MsgUpdateDenomRequest, opts ...grpc.CallOption) (*MsgUpdateDenomResponse, error)
+	DeleteDenom(ctx context.Context, in *MsgDeleteDenomRequest, opts ...grpc.CallOption) (*MsgDeleteDenomResponse, error)
+	TransferDenom(ctx context.Context, in *MsgTransferDenomRequest, opts ...grpc.CallOption) (*MsgTransferDenomResponse, error)
+	MintPNFT(ctx context.Context, in *MsgMintPNFTRequest, opts ...grpc.CallOption) (*MsgMintPNFTResponse, error)
+	TransferPNFT(ctx context.Context, in *MsgTransferPNFTRequest, opts ...grpc.CallOption) (*MsgTransferPNFTResponse, error)
+	BurnPNFT(ctx context.Context, in *MsgBurnPNFTRequest, opts ...grpc.CallOption) (*MsgBurnPNFTResponse, error)
 }
 
-type msgServiceClient struct {
+type msgClient struct {
 	cc grpc1.ClientConn
 }
 
-func NewMsgServiceClient(cc grpc1.ClientConn) MsgServiceClient {
-	return &msgServiceClient{cc}
+func NewMsgClient(cc grpc1.ClientConn) MsgClient {
+	return &msgClient{cc}
 }
 
-func (c *msgServiceClient) CreateDenom(ctx context.Context, in *MsgServiceCreateDenomRequest, opts ...grpc.CallOption) (*MsgServiceCreateDenomResponse, error) {
-	out := new(MsgServiceCreateDenomResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/CreateDenom", in, out, opts...)
+func (c *msgClient) CreateDenom(ctx context.Context, in *MsgCreateDenomRequest, opts ...grpc.CallOption) (*MsgCreateDenomResponse, error) {
+	out := new(MsgCreateDenomResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/CreateDenom", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) UpdateDenom(ctx context.Context, in *MsgServiceUpdateDenomRequest, opts ...grpc.CallOption) (*MsgServiceUpdateDenomResponse, error) {
-	out := new(MsgServiceUpdateDenomResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/UpdateDenom", in, out, opts...)
+func (c *msgClient) UpdateDenom(ctx context.Context, in *MsgUpdateDenomRequest, opts ...grpc.CallOption) (*MsgUpdateDenomResponse, error) {
+	out := new(MsgUpdateDenomResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/UpdateDenom", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) DeleteDenom(ctx context.Context, in *MsgServiceDeleteDenomRequest, opts ...grpc.CallOption) (*MsgServiceDeleteDenomResponse, error) {
-	out := new(MsgServiceDeleteDenomResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/DeleteDenom", in, out, opts...)
+func (c *msgClient) DeleteDenom(ctx context.Context, in *MsgDeleteDenomRequest, opts ...grpc.CallOption) (*MsgDeleteDenomResponse, error) {
+	out := new(MsgDeleteDenomResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/DeleteDenom", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) TransferDenom(ctx context.Context, in *MsgServiceTransferDenomRequest, opts ...grpc.CallOption) (*MsgServiceTransferDenomResponse, error) {
-	out := new(MsgServiceTransferDenomResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/TransferDenom", in, out, opts...)
+func (c *msgClient) TransferDenom(ctx context.Context, in *MsgTransferDenomRequest, opts ...grpc.CallOption) (*MsgTransferDenomResponse, error) {
+	out := new(MsgTransferDenomResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/TransferDenom", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) MintPNFT(ctx context.Context, in *MsgServiceMintPNFTRequest, opts ...grpc.CallOption) (*MsgServiceMintPNFTResponse, error) {
-	out := new(MsgServiceMintPNFTResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/MintPNFT", in, out, opts...)
+func (c *msgClient) MintPNFT(ctx context.Context, in *MsgMintPNFTRequest, opts ...grpc.CallOption) (*MsgMintPNFTResponse, error) {
+	out := new(MsgMintPNFTResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/MintPNFT", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) TransferPNFT(ctx context.Context, in *MsgServiceTransferPNFTRequest, opts ...grpc.CallOption) (*MsgServiceTransferPNFTResponse, error) {
-	out := new(MsgServiceTransferPNFTResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/TransferPNFT", in, out, opts...)
+func (c *msgClient) TransferPNFT(ctx context.Context, in *MsgTransferPNFTRequest, opts ...grpc.CallOption) (*MsgTransferPNFTResponse, error) {
+	out := new(MsgTransferPNFTResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/TransferPNFT", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgServiceClient) BurnPNFT(ctx context.Context, in *MsgServiceBurnPNFTRequest, opts ...grpc.CallOption) (*MsgServiceBurnPNFTResponse, error) {
-	out := new(MsgServiceBurnPNFTResponse)
-	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.MsgService/BurnPNFT", in, out, opts...)
+func (c *msgClient) BurnPNFT(ctx context.Context, in *MsgBurnPNFTRequest, opts ...grpc.CallOption) (*MsgBurnPNFTResponse, error) {
+	out := new(MsgBurnPNFTResponse)
+	err := c.cc.Invoke(ctx, "/panacea.pnft.v2.Msg/BurnPNFT", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// MsgServiceServer is the server API for MsgService service.
-type MsgServiceServer interface {
-	CreateDenom(context.Context, *MsgServiceCreateDenomRequest) (*MsgServiceCreateDenomResponse, error)
-	UpdateDenom(context.Context, *MsgServiceUpdateDenomRequest) (*MsgServiceUpdateDenomResponse, error)
-	DeleteDenom(context.Context, *MsgServiceDeleteDenomRequest) (*MsgServiceDeleteDenomResponse, error)
-	TransferDenom(context.Context, *MsgServiceTransferDenomRequest) (*MsgServiceTransferDenomResponse, error)
-	MintPNFT(context.Context, *MsgServiceMintPNFTRequest) (*MsgServiceMintPNFTResponse, error)
-	TransferPNFT(context.Context, *MsgServiceTransferPNFTRequest) (*MsgServiceTransferPNFTResponse, error)
-	BurnPNFT(context.Context, *MsgServiceBurnPNFTRequest) (*MsgServiceBurnPNFTResponse, error)
+// MsgServer is the server API for Msg service.
+type MsgServer interface {
+	CreateDenom(context.Context, *MsgCreateDenomRequest) (*MsgCreateDenomResponse, error)
+	UpdateDenom(context.Context, *MsgUpdateDenomRequest) (*MsgUpdateDenomResponse, error)
+	DeleteDenom(context.Context, *MsgDeleteDenomRequest) (*MsgDeleteDenomResponse, error)
+	TransferDenom(context.Context, *MsgTransferDenomRequest) (*MsgTransferDenomResponse, error)
+	MintPNFT(context.Context, *MsgMintPNFTRequest) (*MsgMintPNFTResponse, error)
+	TransferPNFT(context.Context, *MsgTransferPNFTRequest) (*MsgTransferPNFTResponse, error)
+	BurnPNFT(context.Context, *MsgBurnPNFTRequest) (*MsgBurnPNFTResponse, error)
 }
 
-// UnimplementedMsgServiceServer can be embedded to have forward compatible implementations.
-type UnimplementedMsgServiceServer struct {
+// UnimplementedMsgServer can be embedded to have forward compatible implementations.
+type UnimplementedMsgServer struct {
 }
 
-func (*UnimplementedMsgServiceServer) CreateDenom(ctx context.Context, req *MsgServiceCreateDenomRequest) (*MsgServiceCreateDenomResponse, error) {
+func (*UnimplementedMsgServer) CreateDenom(ctx context.Context, req *MsgCreateDenomRequest) (*MsgCreateDenomResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateDenom not implemented")
 }
-func (*UnimplementedMsgServiceServer) UpdateDenom(ctx context.Context, req *MsgServiceUpdateDenomRequest) (*MsgServiceUpdateDenomResponse, error) {
+func (*UnimplementedMsgServer) UpdateDenom(ctx context.Context, req *MsgUpdateDenomRequest) (*MsgUpdateDenomResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateDenom not implemented")
 }
-func (*UnimplementedMsgServiceServer) DeleteDenom(ctx context.Context, req *MsgServiceDeleteDenomRequest) (*MsgServiceDeleteDenomResponse, error) {
+func (*UnimplementedMsgServer) DeleteDenom(ctx context.Context, req *MsgDeleteDenomRequest) (*MsgDeleteDenomResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDenom not implemented")
 }
-func (*UnimplementedMsgServiceServer) TransferDenom(ctx context.Context, req *MsgServiceTransferDenomRequest) (*MsgServiceTransferDenomResponse, error) {
+func (*UnimplementedMsgServer) TransferDenom(ctx context.Context, req *MsgTransferDenomRequest) (*MsgTransferDenomResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TransferDenom not implemented")
 }
-func (*UnimplementedMsgServiceServer) MintPNFT(ctx context.Context, req *MsgServiceMintPNFTRequest) (*MsgServiceMintPNFTResponse, error) {
+func (*UnimplementedMsgServer) MintPNFT(ctx context.Context, req *MsgMintPNFTRequest) (*MsgMintPNFTResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method MintPNFT not implemented")
 }
-func (*UnimplementedMsgServiceServer) TransferPNFT(ctx context.Context, req *MsgServiceTransferPNFTRequest) (*MsgServiceTransferPNFTResponse, error) {
+func (*UnimplementedMsgServer) TransferPNFT(ctx context.Context, req *MsgTransferPNFTRequest) (*MsgTransferPNFTResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TransferPNFT not implemented")
 }
-func (*UnimplementedMsgServiceServer) BurnPNFT(ctx context.Context, req *MsgServiceBurnPNFTRequest) (*MsgServiceBurnPNFTResponse, error) {
+func (*UnimplementedMsgServer) BurnPNFT(ctx context.Context, req *MsgBurnPNFTRequest) (*MsgBurnPNFTResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BurnPNFT not implemented")
 }
 
-func RegisterMsgServiceServer(s grpc1.Server, srv MsgServiceServer) {
-	s.RegisterService(&_MsgService_serviceDesc, srv)
+func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
+	s.RegisterService(&_Msg_serviceDesc, srv)
 }
 
-func _MsgService_CreateDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceCreateDenomRequest)
+func _Msg_CreateDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgCreateDenomRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).CreateDenom(ctx, in)
+		return srv.(MsgServer).CreateDenom(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/CreateDenom",
+		FullMethod: "/panacea.pnft.v2.Msg/CreateDenom",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).CreateDenom(ctx, req.(*MsgServiceCreateDenomRequest))
+		return srv.(MsgServer).CreateDenom(ctx, req.(*MsgCreateDenomRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_UpdateDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceUpdateDenomRequest)
+func _Msg_UpdateDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgUpdateDenomRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).UpdateDenom(ctx, in)
+		return srv.(MsgServer).UpdateDenom(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/UpdateDenom",
+		FullMethod: "/panacea.pnft.v2.Msg/UpdateDenom",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).UpdateDenom(ctx, req.(*MsgServiceUpdateDenomRequest))
+		return srv.(MsgServer).UpdateDenom(ctx, req.(*MsgUpdateDenomRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_DeleteDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceDeleteDenomRequest)
+func _Msg_DeleteDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgDeleteDenomRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).DeleteDenom(ctx, in)
+		return srv.(MsgServer).DeleteDenom(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/DeleteDenom",
+		FullMethod: "/panacea.pnft.v2.Msg/DeleteDenom",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).DeleteDenom(ctx, req.(*MsgServiceDeleteDenomRequest))
+		return srv.(MsgServer).DeleteDenom(ctx, req.(*MsgDeleteDenomRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_TransferDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceTransferDenomRequest)
+func _Msg_TransferDenom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgTransferDenomRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).TransferDenom(ctx, in)
+		return srv.(MsgServer).TransferDenom(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/TransferDenom",
+		FullMethod: "/panacea.pnft.v2.Msg/TransferDenom",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).TransferDenom(ctx, req.(*MsgServiceTransferDenomRequest))
+		return srv.(MsgServer).TransferDenom(ctx, req.(*MsgTransferDenomRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_MintPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceMintPNFTRequest)
+func _Msg_MintPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgMintPNFTRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).MintPNFT(ctx, in)
+		return srv.(MsgServer).MintPNFT(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/MintPNFT",
+		FullMethod: "/panacea.pnft.v2.Msg/MintPNFT",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).MintPNFT(ctx, req.(*MsgServiceMintPNFTRequest))
+		return srv.(MsgServer).MintPNFT(ctx, req.(*MsgMintPNFTRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_TransferPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceTransferPNFTRequest)
+func _Msg_TransferPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgTransferPNFTRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).TransferPNFT(ctx, in)
+		return srv.(MsgServer).TransferPNFT(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/TransferPNFT",
+		FullMethod: "/panacea.pnft.v2.Msg/TransferPNFT",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).TransferPNFT(ctx, req.(*MsgServiceTransferPNFTRequest))
+		return srv.(MsgServer).TransferPNFT(ctx, req.(*MsgTransferPNFTRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MsgService_BurnPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgServiceBurnPNFTRequest)
+func _Msg_BurnPNFT_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgBurnPNFTRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MsgServiceServer).BurnPNFT(ctx, in)
+		return srv.(MsgServer).BurnPNFT(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/panacea.pnft.v2.MsgService/BurnPNFT",
+		FullMethod: "/panacea.pnft.v2.Msg/BurnPNFT",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServiceServer).BurnPNFT(ctx, req.(*MsgServiceBurnPNFTRequest))
+		return srv.(MsgServer).BurnPNFT(ctx, req.(*MsgBurnPNFTRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-var _MsgService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "panacea.pnft.v2.MsgService",
-	HandlerType: (*MsgServiceServer)(nil),
+var _Msg_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "panacea.pnft.v2.Msg",
+	HandlerType: (*MsgServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
 			MethodName: "CreateDenom",
-			Handler:    _MsgService_CreateDenom_Handler,
+			Handler:    _Msg_CreateDenom_Handler,
 		},
 		{
 			MethodName: "UpdateDenom",
-			Handler:    _MsgService_UpdateDenom_Handler,
+			Handler:    _Msg_UpdateDenom_Handler,
 		},
 		{
 			MethodName: "DeleteDenom",
-			Handler:    _MsgService_DeleteDenom_Handler,
+			Handler:    _Msg_DeleteDenom_Handler,
 		},
 		{
 			MethodName: "TransferDenom",
-			Handler:    _MsgService_TransferDenom_Handler,
+			Handler:    _Msg_TransferDenom_Handler,
 		},
 		{
 			MethodName: "MintPNFT",
-			Handler:    _MsgService_MintPNFT_Handler,
+			Handler:    _Msg_MintPNFT_Handler,
 		},
 		{
 			MethodName: "TransferPNFT",
-			Handler:    _MsgService_TransferPNFT_Handler,
+			Handler:    _Msg_TransferPNFT_Handler,
 		},
 		{
 			MethodName: "BurnPNFT",
-			Handler:    _MsgService_BurnPNFT_Handler,
+			Handler:    _Msg_BurnPNFT_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "panacea/pnft/v2/tx.proto",
 }
 
-func (m *MsgServiceCreateDenomRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateDenomRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1186,12 +1186,12 @@ func (m *MsgServiceCreateDenomRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateDenomRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateDenomRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1255,7 +1255,7 @@ func (m *MsgServiceCreateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceCreateDenomResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgCreateDenomResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1265,12 +1265,12 @@ func (m *MsgServiceCreateDenomResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceCreateDenomResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgCreateDenomResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceCreateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgCreateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1278,7 +1278,7 @@ func (m *MsgServiceCreateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceUpdateDenomRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgUpdateDenomRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1288,12 +1288,12 @@ func (m *MsgServiceUpdateDenomRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceUpdateDenomRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgUpdateDenomRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceUpdateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgUpdateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1357,7 +1357,7 @@ func (m *MsgServiceUpdateDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceUpdateDenomResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgUpdateDenomResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1367,12 +1367,12 @@ func (m *MsgServiceUpdateDenomResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceUpdateDenomResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgUpdateDenomResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceUpdateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgUpdateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1380,7 +1380,7 @@ func (m *MsgServiceUpdateDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeleteDenomRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteDenomRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1390,12 +1390,12 @@ func (m *MsgServiceDeleteDenomRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeleteDenomRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteDenomRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeleteDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1417,7 +1417,7 @@ func (m *MsgServiceDeleteDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceDeleteDenomResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteDenomResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1427,12 +1427,12 @@ func (m *MsgServiceDeleteDenomResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceDeleteDenomResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteDenomResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceDeleteDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1440,7 +1440,7 @@ func (m *MsgServiceDeleteDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceTransferDenomRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgTransferDenomRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1450,12 +1450,12 @@ func (m *MsgServiceTransferDenomRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceTransferDenomRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgTransferDenomRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceTransferDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgTransferDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1484,7 +1484,7 @@ func (m *MsgServiceTransferDenomRequest) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceTransferDenomResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgTransferDenomResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1494,12 +1494,12 @@ func (m *MsgServiceTransferDenomResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceTransferDenomResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgTransferDenomResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceTransferDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgTransferDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1507,7 +1507,7 @@ func (m *MsgServiceTransferDenomResponse) MarshalToSizedBuffer(dAtA []byte) (int
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceMintPNFTRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgMintPNFTRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1517,12 +1517,12 @@ func (m *MsgServiceMintPNFTRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceMintPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgMintPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceMintPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgMintPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1586,7 +1586,7 @@ func (m *MsgServiceMintPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceMintPNFTResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgMintPNFTResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1596,12 +1596,12 @@ func (m *MsgServiceMintPNFTResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceMintPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgMintPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceMintPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgMintPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1609,7 +1609,7 @@ func (m *MsgServiceMintPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceTransferPNFTRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgTransferPNFTRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1619,12 +1619,12 @@ func (m *MsgServiceTransferPNFTRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceTransferPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgTransferPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceTransferPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgTransferPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1660,7 +1660,7 @@ func (m *MsgServiceTransferPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceTransferPNFTResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgTransferPNFTResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1670,12 +1670,12 @@ func (m *MsgServiceTransferPNFTResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceTransferPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgTransferPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceTransferPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgTransferPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1683,7 +1683,7 @@ func (m *MsgServiceTransferPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceBurnPNFTRequest) Marshal() (dAtA []byte, err error) {
+func (m *MsgBurnPNFTRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1693,12 +1693,12 @@ func (m *MsgServiceBurnPNFTRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceBurnPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgBurnPNFTRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceBurnPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgBurnPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1727,7 +1727,7 @@ func (m *MsgServiceBurnPNFTRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgServiceBurnPNFTResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgBurnPNFTResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1737,12 +1737,12 @@ func (m *MsgServiceBurnPNFTResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgServiceBurnPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgBurnPNFTResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgServiceBurnPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgBurnPNFTResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1761,7 +1761,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *MsgServiceCreateDenomRequest) Size() (n int) {
+func (m *MsgCreateDenomRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1802,7 +1802,7 @@ func (m *MsgServiceCreateDenomRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceCreateDenomResponse) Size() (n int) {
+func (m *MsgCreateDenomResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1811,7 +1811,7 @@ func (m *MsgServiceCreateDenomResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceUpdateDenomRequest) Size() (n int) {
+func (m *MsgUpdateDenomRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1852,7 +1852,7 @@ func (m *MsgServiceUpdateDenomRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceUpdateDenomResponse) Size() (n int) {
+func (m *MsgUpdateDenomResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1861,7 +1861,7 @@ func (m *MsgServiceUpdateDenomResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeleteDenomRequest) Size() (n int) {
+func (m *MsgDeleteDenomRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1878,7 +1878,7 @@ func (m *MsgServiceDeleteDenomRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceDeleteDenomResponse) Size() (n int) {
+func (m *MsgDeleteDenomResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1887,7 +1887,7 @@ func (m *MsgServiceDeleteDenomResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceTransferDenomRequest) Size() (n int) {
+func (m *MsgTransferDenomRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1908,7 +1908,7 @@ func (m *MsgServiceTransferDenomRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceTransferDenomResponse) Size() (n int) {
+func (m *MsgTransferDenomResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1917,7 +1917,7 @@ func (m *MsgServiceTransferDenomResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceMintPNFTRequest) Size() (n int) {
+func (m *MsgMintPNFTRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1958,7 +1958,7 @@ func (m *MsgServiceMintPNFTRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceMintPNFTResponse) Size() (n int) {
+func (m *MsgMintPNFTResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1967,7 +1967,7 @@ func (m *MsgServiceMintPNFTResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceTransferPNFTRequest) Size() (n int) {
+func (m *MsgTransferPNFTRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1992,7 +1992,7 @@ func (m *MsgServiceTransferPNFTRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceTransferPNFTResponse) Size() (n int) {
+func (m *MsgTransferPNFTResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -2001,7 +2001,7 @@ func (m *MsgServiceTransferPNFTResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceBurnPNFTRequest) Size() (n int) {
+func (m *MsgBurnPNFTRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -2022,7 +2022,7 @@ func (m *MsgServiceBurnPNFTRequest) Size() (n int) {
 	return n
 }
 
-func (m *MsgServiceBurnPNFTResponse) Size() (n int) {
+func (m *MsgBurnPNFTResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -2037,7 +2037,7 @@ func sovTx(x uint64) (n int) {
 func sozTx(x uint64) (n int) {
 	return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *MsgServiceCreateDenomRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateDenomRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2060,10 +2060,10 @@ func (m *MsgServiceCreateDenomRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateDenomRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateDenomRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2343,7 +2343,7 @@ func (m *MsgServiceCreateDenomRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceCreateDenomResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgCreateDenomResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2366,10 +2366,10 @@ func (m *MsgServiceCreateDenomResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceCreateDenomResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgCreateDenomResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceCreateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgCreateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -2393,7 +2393,7 @@ func (m *MsgServiceCreateDenomResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceUpdateDenomRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgUpdateDenomRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2416,10 +2416,10 @@ func (m *MsgServiceUpdateDenomRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceUpdateDenomRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgUpdateDenomRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceUpdateDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgUpdateDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2699,7 +2699,7 @@ func (m *MsgServiceUpdateDenomRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceUpdateDenomResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgUpdateDenomResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2722,10 +2722,10 @@ func (m *MsgServiceUpdateDenomResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceUpdateDenomResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgUpdateDenomResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceUpdateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgUpdateDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -2749,7 +2749,7 @@ func (m *MsgServiceUpdateDenomResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeleteDenomRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteDenomRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2772,10 +2772,10 @@ func (m *MsgServiceDeleteDenomRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeleteDenomRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteDenomRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeleteDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -2863,7 +2863,7 @@ func (m *MsgServiceDeleteDenomRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceDeleteDenomResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteDenomResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2886,10 +2886,10 @@ func (m *MsgServiceDeleteDenomResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceDeleteDenomResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteDenomResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceDeleteDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -2913,7 +2913,7 @@ func (m *MsgServiceDeleteDenomResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceTransferDenomRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgTransferDenomRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -2936,10 +2936,10 @@ func (m *MsgServiceTransferDenomRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceTransferDenomRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgTransferDenomRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceTransferDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgTransferDenomRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -3059,7 +3059,7 @@ func (m *MsgServiceTransferDenomRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceTransferDenomResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgTransferDenomResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3082,10 +3082,10 @@ func (m *MsgServiceTransferDenomResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceTransferDenomResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgTransferDenomResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceTransferDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgTransferDenomResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -3109,7 +3109,7 @@ func (m *MsgServiceTransferDenomResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceMintPNFTRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgMintPNFTRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3132,10 +3132,10 @@ func (m *MsgServiceMintPNFTRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceMintPNFTRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgMintPNFTRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceMintPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgMintPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -3415,7 +3415,7 @@ func (m *MsgServiceMintPNFTRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceMintPNFTResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgMintPNFTResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3438,10 +3438,10 @@ func (m *MsgServiceMintPNFTResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceMintPNFTResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgMintPNFTResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceMintPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgMintPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -3465,7 +3465,7 @@ func (m *MsgServiceMintPNFTResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceTransferPNFTRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgTransferPNFTRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3488,10 +3488,10 @@ func (m *MsgServiceTransferPNFTRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceTransferPNFTRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgTransferPNFTRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceTransferPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgTransferPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -3643,7 +3643,7 @@ func (m *MsgServiceTransferPNFTRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceTransferPNFTResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgTransferPNFTResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3666,10 +3666,10 @@ func (m *MsgServiceTransferPNFTResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceTransferPNFTResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgTransferPNFTResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceTransferPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgTransferPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:
@@ -3693,7 +3693,7 @@ func (m *MsgServiceTransferPNFTResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceBurnPNFTRequest) Unmarshal(dAtA []byte) error {
+func (m *MsgBurnPNFTRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3716,10 +3716,10 @@ func (m *MsgServiceBurnPNFTRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceBurnPNFTRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgBurnPNFTRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceBurnPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgBurnPNFTRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -3839,7 +3839,7 @@ func (m *MsgServiceBurnPNFTRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgServiceBurnPNFTResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgBurnPNFTResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3862,10 +3862,10 @@ func (m *MsgServiceBurnPNFTResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgServiceBurnPNFTResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgBurnPNFTResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgServiceBurnPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgBurnPNFTResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default: