diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
index 01d0a88..0c86c82 100644
--- a/docs/static/openapi.yml
+++ b/docs/static/openapi.yml
@@ -46640,6 +46640,58 @@ paths:
                   additionalProperties: {}
       tags:
         - Query
+  /planetmint/dao/challenge/{height}:
+    get:
+      summary: Queries a list of GetChallenge items.
+      operationId: PlanetmintgoDaoGetChallenge
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              challenge:
+                type: object
+                properties:
+                  initiator:
+                    type: string
+                  challenger:
+                    type: string
+                  challengee:
+                    type: string
+                  height:
+                    type: string
+                    format: int64
+                  success:
+                    type: boolean
+                  finished:
+                    type: boolean
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      parameters:
+        - name: height
+          in: path
+          required: true
+          type: string
+          format: int64
+      tags:
+        - Query
   /planetmint/dao/challenges:
     get:
       summary: Queries a list of Challenges items.
@@ -46773,59 +46825,7 @@ paths:
           type: boolean
       tags:
         - Query
-  /planetmint/dao/get_challenge/{height}:
-    get:
-      summary: Queries a list of GetChallenge items.
-      operationId: PlanetmintgoDaoGetChallenge
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              challenge:
-                type: object
-                properties:
-                  initiator:
-                    type: string
-                  challenger:
-                    type: string
-                  challengee:
-                    type: string
-                  height:
-                    type: string
-                    format: int64
-                  success:
-                    type: boolean
-                  finished:
-                    type: boolean
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      parameters:
-        - name: height
-          in: path
-          required: true
-          type: string
-          format: int64
-      tags:
-        - Query
-  /planetmint/dao/get_distribution/{height}:
+  /planetmint/dao/distribution/{height}:
     get:
       summary: Queries a list of GetDistribution items.
       operationId: PlanetmintgoDaoGetDistribution
@@ -46890,7 +46890,57 @@ paths:
           format: int64
       tags:
         - Query
-  /planetmint/dao/get_mint_requests_by_hash/{hash}:
+  /planetmint/dao/mint_requests/address/{address}:
+    get:
+      summary: Queries a list of MintRequestsByAddress items.
+      operationId: PlanetmintgoDaoMintRequestsByAddress
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              mintRequests:
+                type: object
+                properties:
+                  Requests:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        beneficiary:
+                          type: string
+                        amount:
+                          type: string
+                          format: uint64
+                        liquidTxHash:
+                          type: string
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      parameters:
+        - name: address
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
+  /planetmint/dao/mint_requests/hash/{hash}:
     get:
       summary: Queries a list of GetMintRequestsByHash items.
       operationId: PlanetmintgoDaoGetMintRequestsByHash
@@ -46935,7 +46985,46 @@ paths:
           type: string
       tags:
         - Query
-  /planetmint/dao/get_reissuance/{blockHeight}:
+  /planetmint/dao/params:
+    get:
+      summary: Parameters queries the parameters of the module.
+      operationId: PlanetmintgoDaoParams
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              params:
+                description: params holds all the parameters of this module.
+                type: object
+                properties:
+                  mint_address:
+                    type: string
+            description: >-
+              QueryParamsResponse is response type for the Query/Params RPC
+              method.
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      tags:
+        - Query
+  /planetmint/dao/reissuance/{blockHeight}:
     get:
       summary: Queries a list of GetReissuance items.
       operationId: PlanetmintgoDaoGetReissuance
@@ -46989,95 +47078,6 @@ paths:
           format: int64
       tags:
         - Query
-  /planetmint/dao/mint_requests_by_address/{address}:
-    get:
-      summary: Queries a list of MintRequestsByAddress items.
-      operationId: PlanetmintgoDaoMintRequestsByAddress
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              mintRequests:
-                type: object
-                properties:
-                  Requests:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        beneficiary:
-                          type: string
-                        amount:
-                          type: string
-                          format: uint64
-                        liquidTxHash:
-                          type: string
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      parameters:
-        - name: address
-          in: path
-          required: true
-          type: string
-      tags:
-        - Query
-  /planetmint/dao/params:
-    get:
-      summary: Parameters queries the parameters of the module.
-      operationId: PlanetmintgoDaoParams
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              params:
-                description: params holds all the parameters of this module.
-                type: object
-                properties:
-                  mint_address:
-                    type: string
-            description: >-
-              QueryParamsResponse is response type for the Query/Params RPC
-              method.
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      tags:
-        - Query
   /planetmint/dao/reissuances:
     get:
       summary: Queries a list of Reissuances items.
@@ -47213,53 +47213,7 @@ paths:
           type: boolean
       tags:
         - Query
-  /planetmint/machine/get_liquid_assets_by_machineid/{machineID}:
-    get:
-      summary: Queries a list of GetLiquidAssetsByMachineid items.
-      operationId: PlanetmintgoMachineGetLiquidAssetsByMachineid
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              liquidAssetEntry:
-                type: object
-                properties:
-                  machineID:
-                    type: string
-                  machineAddress:
-                    type: string
-                  assetID:
-                    type: string
-                  registered:
-                    type: boolean
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      parameters:
-        - name: machineID
-          in: path
-          required: true
-          type: string
-      tags:
-        - Query
-  /planetmint/machine/get_machine_by_address/{address}:
+  /planetmint/machine/address/{address}:
     get:
       summary: Queries a list of GetMachineByAddress items.
       operationId: PlanetmintgoMachineGetMachineByAddress
@@ -47335,7 +47289,89 @@ paths:
           type: string
       tags:
         - Query
-  /planetmint/machine/get_machine_by_public_key/{publicKey}:
+  /planetmint/machine/liquid_assets/{machineID}:
+    get:
+      summary: Queries a list of GetLiquidAssetsByMachineid items.
+      operationId: PlanetmintgoMachineGetLiquidAssetsByMachineid
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              liquidAssetEntry:
+                type: object
+                properties:
+                  machineID:
+                    type: string
+                  machineAddress:
+                    type: string
+                  assetID:
+                    type: string
+                  registered:
+                    type: boolean
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      parameters:
+        - name: machineID
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
+  /planetmint/machine/params:
+    get:
+      summary: Parameters queries the parameters of the module.
+      operationId: PlanetmintgoMachineParams
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              params:
+                description: params holds all the parameters of this module.
+                type: object
+            description: >-
+              QueryParamsResponse is response type for the Query/Params RPC
+              method.
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      tags:
+        - Query
+  /planetmint/machine/public_key/{publicKey}:
     get:
       summary: Queries a list of GetMachineByPublicKey items.
       operationId: PlanetmintgoMachineGetMachineByPublicKey
@@ -47411,7 +47447,7 @@ paths:
           type: string
       tags:
         - Query
-  /planetmint/machine/get_trust_anchor_status/{machineid}:
+  /planetmint/machine/trust_anchor/status/{machineid}:
     get:
       summary: Queries a list of GetTrustAnchorStatus items.
       operationId: PlanetmintgoMachineGetTrustAnchorStatus
@@ -47450,42 +47486,6 @@ paths:
           type: string
       tags:
         - Query
-  /planetmint/machine/params:
-    get:
-      summary: Parameters queries the parameters of the module.
-      operationId: PlanetmintgoMachineParams
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              params:
-                description: params holds all the parameters of this module.
-                type: object
-            description: >-
-              QueryParamsResponse is response type for the Query/Params RPC
-              method.
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      tags:
-        - Query
 definitions:
   cosmos.auth.v1beta1.AddressBytesToStringResponse:
     type: object
diff --git a/proto/planetmintgo/dao/query.proto b/proto/planetmintgo/dao/query.proto
index 99963b4..e40695c 100644
--- a/proto/planetmintgo/dao/query.proto
+++ b/proto/planetmintgo/dao/query.proto
@@ -26,19 +26,19 @@ service Query {
   
   // Queries a list of GetMintRequestsByHash items.
   rpc GetMintRequestsByHash (QueryGetMintRequestsByHashRequest) returns (QueryGetMintRequestsByHashResponse) {
-    option (google.api.http).get = "/planetmint/dao/get_mint_requests_by_hash/{hash}";
+    option (google.api.http).get = "/planetmint/dao/mint_requests/hash/{hash}";
   
   }
   
   // Queries a list of MintRequestsByAddress items.
   rpc MintRequestsByAddress (QueryMintRequestsByAddressRequest) returns (QueryMintRequestsByAddressResponse) {
-    option (google.api.http).get = "/planetmint/dao/mint_requests_by_address/{address}";
+    option (google.api.http).get = "/planetmint/dao/mint_requests/address/{address}";
   
   }
   
   // Queries a list of GetReissuance items.
   rpc GetReissuance (QueryGetReissuanceRequest) returns (QueryGetReissuanceResponse) {
-    option (google.api.http).get = "/planetmint/dao/get_reissuance/{blockHeight}";
+    option (google.api.http).get = "/planetmint/dao/reissuance/{blockHeight}";
   
   }
   
@@ -50,7 +50,7 @@ service Query {
   
   // Queries a list of GetChallenge items.
   rpc GetChallenge (QueryGetChallengeRequest) returns (QueryGetChallengeResponse) {
-    option (google.api.http).get = "/planetmint/dao/get_challenge/{height}";
+    option (google.api.http).get = "/planetmint/dao/challenge/{height}";
   
   }
   
@@ -61,7 +61,7 @@ service Query {
   
   // Queries a list of GetDistribution items.
   rpc GetDistribution (QueryGetDistributionRequest) returns (QueryGetDistributionResponse) {
-    option (google.api.http).get = "/planetmint/dao/get_distribution/{height}";
+    option (google.api.http).get = "/planetmint/dao/distribution/{height}";
   
   }
 }
diff --git a/proto/planetmintgo/machine/query.proto b/proto/planetmintgo/machine/query.proto
index 1cb7fb3..ae2bed4 100644
--- a/proto/planetmintgo/machine/query.proto
+++ b/proto/planetmintgo/machine/query.proto
@@ -22,25 +22,25 @@ service Query {
   
   // Queries a list of GetMachineByPublicKey items.
   rpc GetMachineByPublicKey (QueryGetMachineByPublicKeyRequest) returns (QueryGetMachineByPublicKeyResponse) {
-    option (google.api.http).get = "/planetmint/machine/get_machine_by_public_key/{publicKey}";
+    option (google.api.http).get = "/planetmint/machine/public_key/{publicKey}";
   
   }
   
   // Queries a list of GetTrustAnchorStatus items.
   rpc GetTrustAnchorStatus (QueryGetTrustAnchorStatusRequest) returns (QueryGetTrustAnchorStatusResponse) {
-    option (google.api.http).get = "/planetmint/machine/get_trust_anchor_status/{machineid}";
+    option (google.api.http).get = "/planetmint/machine/trust_anchor/status/{machineid}";
   
   }
   
   // Queries a list of GetMachineByAddress items.
   rpc GetMachineByAddress (QueryGetMachineByAddressRequest) returns (QueryGetMachineByAddressResponse) {
-    option (google.api.http).get = "/planetmint/machine/get_machine_by_address/{address}";
+    option (google.api.http).get = "/planetmint/machine/address/{address}";
   
   }
   
   // Queries a list of GetLiquidAssetsByMachineid items.
   rpc GetLiquidAssetsByMachineid (QueryGetLiquidAssetsByMachineidRequest) returns (QueryGetLiquidAssetsByMachineidResponse) {
-    option (google.api.http).get = "/planetmint/machine/get_liquid_assets_by_machineid/{machineID}";
+    option (google.api.http).get = "/planetmint/machine/liquid_assets/{machineID}";
   
   }
 }
diff --git a/x/asset/client/cli/query_get_notarized_asset.go b/x/asset/client/cli/query_notarized.go
similarity index 91%
rename from x/asset/client/cli/query_get_notarized_asset.go
rename to x/asset/client/cli/query_notarized.go
index 1ea1cfc..e2f2d56 100644
--- a/x/asset/client/cli/query_get_notarized_asset.go
+++ b/x/asset/client/cli/query_notarized.go
@@ -13,8 +13,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetNotarizedAsset() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-notarized-asset [cid]",
-		Short: "Query get_notarized_asset",
+		Use:   "notarized [cid]",
+		Short: "Query for notarized assets by CID",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqCid := args[0]
diff --git a/x/asset/client/cli/query_params.go b/x/asset/client/cli/query_params.go
index 2be743f..d2e5396 100644
--- a/x/asset/client/cli/query_params.go
+++ b/x/asset/client/cli/query_params.go
@@ -11,7 +11,7 @@ import (
 func CmdQueryParams() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "params",
-		Short: "shows the parameters of the module",
+		Short: "Query the current asset parameters information",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/x/asset/client/cli/query_get_assets_by_pub_key.go b/x/asset/client/cli/query_public_key.go
similarity index 91%
rename from x/asset/client/cli/query_get_assets_by_pub_key.go
rename to x/asset/client/cli/query_public_key.go
index cc35cb0..6f3e084 100644
--- a/x/asset/client/cli/query_get_assets_by_pub_key.go
+++ b/x/asset/client/cli/query_public_key.go
@@ -14,8 +14,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetCIDsByAddress() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-assets-by-pub-key [ext-pub-key] [lookup-period-in-min]",
-		Short: "Query get_cids_by_address",
+		Use:   "public-key [pub-key] [lookup-period-in-min]",
+		Short: "Query for assets by public key",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqAddress := args[0]
diff --git a/x/dao/client/cli/query.go b/x/dao/client/cli/query.go
index a93e230..462a11d 100644
--- a/x/dao/client/cli/query.go
+++ b/x/dao/client/cli/query.go
@@ -23,9 +23,7 @@ func GetQueryCmd(_ string) *cobra.Command {
 
 	cmd.AddCommand(CmdQueryParams())
 
-	cmd.AddCommand(CmdGetMintRequestsByHash())
-
-	cmd.AddCommand(CmdMintRequestsByAddress())
+	cmd.AddCommand(CmdGetMintRequests())
 
 	cmd.AddCommand(CmdGetReissuance())
 
diff --git a/x/dao/client/cli/query_get_challenge.go b/x/dao/client/cli/query_challenge.go
similarity index 92%
rename from x/dao/client/cli/query_get_challenge.go
rename to x/dao/client/cli/query_challenge.go
index 924a83f..84feea5 100644
--- a/x/dao/client/cli/query_get_challenge.go
+++ b/x/dao/client/cli/query_challenge.go
@@ -14,8 +14,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetChallenge() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-challenge [height]",
-		Short: "Query get_challenge",
+		Use:   "challenge [height]",
+		Short: "Query for challenge by height",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqHeight, err := cast.ToInt64E(args[0])
diff --git a/x/dao/client/cli/query_challenges.go b/x/dao/client/cli/query_challenges.go
index 09a849f..cc562b1 100644
--- a/x/dao/client/cli/query_challenges.go
+++ b/x/dao/client/cli/query_challenges.go
@@ -14,7 +14,7 @@ var _ = strconv.Itoa(0)
 func CmdChallenges() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "challenges",
-		Short: "Query challenges",
+		Short: "Query for challenges",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/x/dao/client/cli/query_get_distribution.go b/x/dao/client/cli/query_distribution.go
similarity index 98%
rename from x/dao/client/cli/query_get_distribution.go
rename to x/dao/client/cli/query_distribution.go
index c8e7a21..fb3d862 100644
--- a/x/dao/client/cli/query_get_distribution.go
+++ b/x/dao/client/cli/query_distribution.go
@@ -17,7 +17,7 @@ var _ = strconv.Itoa(0)
 
 func CmdGetDistribution() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-distribution [height]",
+		Use:   "distribution [height]",
 		Short: "Query for distributions by height",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
diff --git a/x/dao/client/cli/query_get_mint_requests_by_hash.go b/x/dao/client/cli/query_get_mint_requests_by_hash.go
deleted file mode 100644
index 2d90869..0000000
--- a/x/dao/client/cli/query_get_mint_requests_by_hash.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cli
-
-import (
-	"strconv"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/planetmint/planetmint-go/x/dao/types"
-	"github.com/spf13/cobra"
-)
-
-var _ = strconv.Itoa(0)
-
-func CmdGetMintRequestsByHash() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "get-mint-requests-by-hash [hash]",
-		Short: "Query get-mint-requests-by-hash",
-		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			reqHash := args[0]
-
-			clientCtx, err := client.GetClientQueryContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			queryClient := types.NewQueryClient(clientCtx)
-
-			params := &types.QueryGetMintRequestsByHashRequest{
-
-				Hash: reqHash,
-			}
-
-			res, err := queryClient.GetMintRequestsByHash(cmd.Context(), params)
-			if err != nil {
-				return err
-			}
-
-			return clientCtx.PrintProto(res)
-		},
-	}
-
-	flags.AddQueryFlagsToCmd(cmd)
-
-	return cmd
-}
diff --git a/x/dao/client/cli/query_mint_requests.go b/x/dao/client/cli/query_mint_requests.go
new file mode 100644
index 0000000..bb7f692
--- /dev/null
+++ b/x/dao/client/cli/query_mint_requests.go
@@ -0,0 +1,96 @@
+package cli
+
+import (
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/planetmint/planetmint-go/x/dao/types"
+	"github.com/spf13/cobra"
+)
+
+var _ = strconv.Itoa(0)
+
+func CmdGetMintRequests() *cobra.Command {
+	// Group mint-requests queries under a subcommand
+	cmd := &cobra.Command{
+		Use:                        "mint-requests",
+		Short:                      "Query for mint requests subcommand",
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	cmd.AddCommand(CmdGetAddress())
+	cmd.AddCommand(CmdGetHash())
+
+	return cmd
+}
+
+func CmdGetAddress() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "address [address]",
+		Short: "Query for mint requests by address",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			reqAddress := args[0]
+
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			params := &types.QueryMintRequestsByAddressRequest{
+
+				Address: reqAddress,
+			}
+
+			res, err := queryClient.MintRequestsByAddress(cmd.Context(), params)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdGetHash() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "hash [hash]",
+		Short: "Query for mint requests by hash",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			reqHash := args[0]
+
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			params := &types.QueryGetMintRequestsByHashRequest{
+
+				Hash: reqHash,
+			}
+
+			res, err := queryClient.GetMintRequestsByHash(cmd.Context(), params)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}
diff --git a/x/dao/client/cli/query_mint_requests_by_address.go b/x/dao/client/cli/query_mint_requests_by_address.go
deleted file mode 100644
index bbc2ad6..0000000
--- a/x/dao/client/cli/query_mint_requests_by_address.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cli
-
-import (
-	"strconv"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/planetmint/planetmint-go/x/dao/types"
-	"github.com/spf13/cobra"
-)
-
-var _ = strconv.Itoa(0)
-
-func CmdMintRequestsByAddress() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "mint-requests-by-address [address]",
-		Short: "Query mint-requests-by-address",
-		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			reqAddress := args[0]
-
-			clientCtx, err := client.GetClientQueryContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			queryClient := types.NewQueryClient(clientCtx)
-
-			params := &types.QueryMintRequestsByAddressRequest{
-
-				Address: reqAddress,
-			}
-
-			res, err := queryClient.MintRequestsByAddress(cmd.Context(), params)
-			if err != nil {
-				return err
-			}
-
-			return clientCtx.PrintProto(res)
-		},
-	}
-
-	flags.AddQueryFlagsToCmd(cmd)
-
-	return cmd
-}
diff --git a/x/dao/client/cli/query_params.go b/x/dao/client/cli/query_params.go
index 891b256..207138e 100644
--- a/x/dao/client/cli/query_params.go
+++ b/x/dao/client/cli/query_params.go
@@ -11,7 +11,7 @@ import (
 func CmdQueryParams() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "params",
-		Short: "shows the parameters of the module",
+		Short: "Query the current dao parameters information",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/x/dao/client/cli/query_get_reissuance.go b/x/dao/client/cli/query_reissuance.go
similarity index 92%
rename from x/dao/client/cli/query_get_reissuance.go
rename to x/dao/client/cli/query_reissuance.go
index 7e18ebd..ab76fc2 100644
--- a/x/dao/client/cli/query_get_reissuance.go
+++ b/x/dao/client/cli/query_reissuance.go
@@ -14,8 +14,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetReissuance() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-reissuance [block-height]",
-		Short: "Query get_reissuance",
+		Use:   "reissuance [height]",
+		Short: "Query for reissuance by height",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqBlockHeight, err := cast.ToInt64E(args[0])
diff --git a/x/dao/client/cli/query_reissuances.go b/x/dao/client/cli/query_reissuances.go
index 9511070..f035f84 100644
--- a/x/dao/client/cli/query_reissuances.go
+++ b/x/dao/client/cli/query_reissuances.go
@@ -14,7 +14,7 @@ var _ = strconv.Itoa(0)
 func CmdGetReissuances() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "reissuances",
-		Short: "Query reissuances",
+		Short: "Query for reissuances",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/x/dao/types/query.pb.go b/x/dao/types/query.pb.go
index c7e0488..f7cc6ea 100644
--- a/x/dao/types/query.pb.go
+++ b/x/dao/types/query.pb.go
@@ -768,68 +768,67 @@ func init() {
 func init() { proto.RegisterFile("planetmintgo/dao/query.proto", fileDescriptor_07bad0eeb5b27724) }
 
 var fileDescriptor_07bad0eeb5b27724 = []byte{
-	// 969 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xc7, 0xb3, 0x6d, 0x09, 0xca, 0x73, 0x10, 0x30, 0xb4, 0xc1, 0x6c, 0x1c, 0x93, 0x6e, 0x4a,
-	0xc9, 0x8f, 0x76, 0x87, 0xb8, 0xe1, 0xa7, 0xa8, 0x10, 0x06, 0x35, 0xed, 0xa1, 0xa2, 0xec, 0x81,
-	0x43, 0x2f, 0x66, 0x6c, 0x8f, 0x76, 0x57, 0xd8, 0x3b, 0xee, 0xce, 0x1a, 0x11, 0x45, 0xb9, 0x20,
-	0x71, 0xe0, 0x86, 0xc4, 0x81, 0x2b, 0x12, 0x17, 0xc4, 0x01, 0xf1, 0x07, 0x20, 0xce, 0x3d, 0x56,
-	0xe2, 0xc2, 0x09, 0xa1, 0x04, 0x89, 0xbf, 0x80, 0x3b, 0xda, 0xd9, 0xb7, 0xde, 0xb1, 0xc7, 0x6b,
-	0x1b, 0x29, 0x17, 0x6b, 0x76, 0xe7, 0xfb, 0xde, 0xfb, 0xcc, 0x9b, 0x9d, 0xef, 0x18, 0x6a, 0x83,
-	0x1e, 0x8b, 0x78, 0xd2, 0x0f, 0xa3, 0xc4, 0x17, 0xb4, 0xcb, 0x04, 0x7d, 0x34, 0xe4, 0xf1, 0x91,
-	0x3b, 0x88, 0x45, 0x22, 0xc8, 0x73, 0xfa, 0xac, 0xdb, 0x65, 0xc2, 0xbe, 0xec, 0x0b, 0x5f, 0xa8,
-	0x49, 0x9a, 0x8e, 0x32, 0x9d, 0x5d, 0xf3, 0x85, 0xf0, 0x7b, 0x9c, 0xb2, 0x41, 0x48, 0x59, 0x14,
-	0x89, 0x84, 0x25, 0xa1, 0x88, 0x24, 0xce, 0xee, 0x76, 0x84, 0xec, 0x0b, 0x49, 0xdb, 0x4c, 0xf2,
-	0x2c, 0x3d, 0xfd, 0x7c, 0xbf, 0xcd, 0x13, 0xb6, 0x4f, 0x07, 0xcc, 0x0f, 0x23, 0x25, 0x46, 0xed,
-	0x86, 0xc1, 0x33, 0x60, 0x31, 0xeb, 0xe7, 0xa9, 0xb6, 0x8c, 0xe9, 0x74, 0xd8, 0x8a, 0xf9, 0xa3,
-	0x21, 0x97, 0x09, 0x8a, 0xae, 0xcd, 0x14, 0xe5, 0xa9, 0xae, 0x1a, 0xaa, 0x98, 0x87, 0x52, 0x0e,
-	0x59, 0xd4, 0xe1, 0x28, 0xd9, 0x34, 0x24, 0x9d, 0x80, 0xf5, 0x7a, 0x3c, 0xf2, 0x73, 0xc5, 0xf3,
-	0xac, 0x1f, 0x46, 0x82, 0xaa, 0x5f, 0x7c, 0xb5, 0x63, 0x04, 0x75, 0x43, 0x99, 0xc4, 0x61, 0x7b,
-	0x98, 0x2e, 0xb3, 0x25, 0xe2, 0x2e, 0x8f, 0x33, 0xa9, 0x73, 0x19, 0xc8, 0xc7, 0x69, 0x3b, 0x1e,
-	0xa8, 0x25, 0x7a, 0x19, 0x9f, 0x73, 0x1f, 0x5e, 0x18, 0x7b, 0x2b, 0x07, 0x22, 0x92, 0x9c, 0xbc,
-	0x01, 0xcb, 0x59, 0x2b, 0xaa, 0xd6, 0xa6, 0xb5, 0x5d, 0x69, 0x54, 0xdd, 0xc9, 0xcd, 0x71, 0xb3,
-	0x88, 0xe6, 0xa5, 0xc7, 0x7f, 0xbe, 0xbc, 0xe4, 0xa1, 0xda, 0x79, 0x13, 0xae, 0xaa, 0x74, 0x87,
-	0x3c, 0xb9, 0x1f, 0x46, 0x09, 0x56, 0x91, 0xcd, 0xa3, 0xbb, 0x4c, 0x06, 0xf8, 0x44, 0x08, 0x5c,
-	0x0a, 0x98, 0x0c, 0x54, 0xea, 0x15, 0x4f, 0x8d, 0x1d, 0x0e, 0xce, 0xac, 0x40, 0xc4, 0x7a, 0x0f,
-	0x2a, 0xfd, 0x62, 0x16, 0xd9, 0x36, 0x4c, 0x36, 0x2d, 0x85, 0xa7, 0x47, 0x38, 0xb7, 0x91, 0x6f,
-	0xbc, 0xc6, 0xfb, 0xdd, 0x6e, 0xcc, 0x65, 0xde, 0x13, 0x52, 0x85, 0xa7, 0x59, 0xf6, 0x06, 0x11,
-	0xf3, 0x47, 0x27, 0x40, 0xca, 0x92, 0x70, 0xa4, 0x6c, 0xc2, 0xaa, 0x56, 0x33, 0x6f, 0x61, 0x7d,
-	0x26, 0xa6, 0xf4, 0xc6, 0x62, 0x9c, 0xdb, 0xf0, 0x52, 0xde, 0x0f, 0x6f, 0xf4, 0xa5, 0xe4, 0x80,
-	0x9b, 0x50, 0x69, 0xf7, 0x44, 0xe7, 0xb3, 0xbb, 0x3c, 0xf4, 0x83, 0xac, 0x0d, 0x17, 0x3d, 0xfd,
-	0x95, 0xf3, 0x10, 0xec, 0x69, 0xe1, 0x08, 0xf8, 0x2e, 0x40, 0xf1, 0xf9, 0x21, 0x5e, 0xcd, 0xc4,
-	0xd3, 0x22, 0x35, 0xbd, 0xc3, 0xe0, 0x45, 0x95, 0xbb, 0x98, 0x1e, 0x75, 0xee, 0x0e, 0x40, 0x71,
-	0xc8, 0x30, 0xf1, 0x75, 0x37, 0x3b, 0x91, 0x6e, 0x7a, 0x22, 0xdd, 0xec, 0xc0, 0xe3, 0x89, 0x74,
-	0x1f, 0x30, 0x3f, 0x5f, 0x94, 0xa7, 0x45, 0x3a, 0x3f, 0x5b, 0x50, 0x35, 0x6b, 0x20, 0xfd, 0x3d,
-	0xa8, 0x14, 0x34, 0x69, 0x77, 0x2f, 0xce, 0xc3, 0x6f, 0xae, 0xa4, 0x1f, 0xe9, 0x8f, 0xff, 0xfc,
-	0xb2, 0x6b, 0x79, 0x7a, 0x2c, 0x39, 0x1c, 0xe3, 0xbd, 0xa0, 0x78, 0x5f, 0x9d, 0xcb, 0x9b, 0x71,
-	0x8c, 0x01, 0x37, 0x90, 0xf7, 0x90, 0x27, 0x1f, 0xe4, 0xa7, 0x36, 0x6f, 0xca, 0x1a, 0x2c, 0x07,
-	0xfa, 0x46, 0xe1, 0x93, 0xf3, 0x49, 0xb1, 0xc5, 0x5a, 0x0c, 0x2e, 0xf2, 0x6d, 0x58, 0x19, 0x1d,
-	0x7f, 0x6c, 0xe4, 0xba, 0xb9, 0xc4, 0x22, 0xae, 0x50, 0x3b, 0x9f, 0xc2, 0x9a, 0xca, 0x3b, 0x9a,
-	0x3c, 0xf7, 0xed, 0xf9, 0xc9, 0xc2, 0x4f, 0x40, 0x2f, 0x81, 0xe0, 0x77, 0x00, 0x46, 0x28, 0xf9,
-	0xe6, 0xcc, 0x22, 0xd7, 0xf7, 0x46, 0x8b, 0x3c, 0xbf, 0xad, 0x79, 0x1d, 0xd6, 0xf3, 0x36, 0x7f,
-	0xa8, 0x79, 0xe3, 0xbc, 0xdd, 0xf1, 0xa1, 0x36, 0x3d, 0x0c, 0xd7, 0x79, 0x08, 0xab, 0xba, 0xd5,
-	0x62, 0x37, 0xb7, 0xcc, 0x95, 0xea, 0xd1, 0x1f, 0xa5, 0x7e, 0xec, 0x8d, 0x05, 0x36, 0xfe, 0x5d,
-	0x81, 0xa7, 0x54, 0x25, 0x32, 0x84, 0xe5, 0xcc, 0x54, 0xc9, 0x35, 0x33, 0x8d, 0xe9, 0xdd, 0xf6,
-	0x2b, 0x73, 0x54, 0x19, 0xa9, 0x53, 0xff, 0xf2, 0xf7, 0xbf, 0xbf, 0xbd, 0x50, 0x25, 0x6b, 0xb4,
-	0x90, 0x6b, 0x97, 0x1d, 0xf9, 0xd5, 0x82, 0x2b, 0x53, 0x6d, 0x97, 0xdc, 0x2a, 0x29, 0x30, 0xcb,
-	0xdd, 0xed, 0x83, 0xff, 0x17, 0x84, 0x90, 0x6f, 0x29, 0xc8, 0x06, 0x79, 0x6d, 0x12, 0xd2, 0xe7,
-	0x49, 0x6b, 0xec, 0x46, 0x6d, 0xb5, 0x8f, 0x5a, 0xe9, 0x95, 0x41, 0x8f, 0xd3, 0xdf, 0x13, 0xf2,
-	0x9b, 0x05, 0x57, 0xa6, 0xfa, 0x71, 0x29, 0xfe, 0x2c, 0xf3, 0x2f, 0xc5, 0x9f, 0x69, 0xf9, 0xce,
-	0x3b, 0x0a, 0xff, 0x80, 0x34, 0x26, 0xf1, 0x0d, 0x74, 0xbc, 0x4a, 0xe8, 0x31, 0x0e, 0x4e, 0xc8,
-	0xf7, 0x16, 0x3c, 0x33, 0xe6, 0xd3, 0x64, 0xaf, 0xbc, 0x85, 0xc6, 0x65, 0x60, 0xdf, 0x58, 0x4c,
-	0x8c, 0xa0, 0x07, 0x0a, 0xd4, 0x25, 0x37, 0xa6, 0xf5, 0xb9, 0xb0, 0x46, 0x7a, 0xac, 0xdd, 0x26,
-	0x27, 0xe4, 0x6b, 0x0b, 0x2a, 0x9a, 0x15, 0x93, 0x9d, 0x92, 0x9a, 0xe6, 0x95, 0x60, 0xef, 0x2e,
-	0x22, 0x45, 0xb8, 0x2d, 0x05, 0xb7, 0x41, 0xd6, 0x27, 0xe1, 0x74, 0xcf, 0xfe, 0xce, 0x82, 0x55,
-	0xdd, 0x32, 0xc9, 0x6e, 0x79, 0x03, 0x26, 0xbd, 0xd8, 0xde, 0x5b, 0x48, 0x8b, 0x38, 0xae, 0xc2,
-	0xd9, 0x26, 0xd7, 0xa7, 0xf5, 0x6a, 0x64, 0x55, 0xf4, 0x38, 0xc0, 0x2e, 0x7d, 0x65, 0x01, 0x14,
-	0x8e, 0x48, 0xb6, 0x4b, 0x6a, 0x19, 0xbe, 0x6c, 0xef, 0x2c, 0xa0, 0x44, 0x26, 0x47, 0x31, 0xd5,
-	0x88, 0x3d, 0xc9, 0xa4, 0x59, 0xe7, 0x0f, 0x16, 0x3c, 0x3b, 0x61, 0x5b, 0xe4, 0x66, 0xf9, 0xc2,
-	0xa7, 0xb8, 0xa2, 0xed, 0x2e, 0x2a, 0x47, 0xac, 0x7d, 0x85, 0xb5, 0x47, 0x76, 0xa6, 0xb5, 0x4a,
-	0xb7, 0xbb, 0x51, 0xb7, 0x9a, 0xf7, 0x1e, 0x9f, 0xd6, 0xad, 0x27, 0xa7, 0x75, 0xeb, 0xaf, 0xd3,
-	0xba, 0xf5, 0xcd, 0x59, 0x7d, 0xe9, 0xc9, 0x59, 0x7d, 0xe9, 0x8f, 0xb3, 0xfa, 0xd2, 0x43, 0xea,
-	0x87, 0x49, 0x30, 0x6c, 0xbb, 0x1d, 0xd1, 0xd7, 0xd3, 0x15, 0xc3, 0x9b, 0xbe, 0xa0, 0x5f, 0xa8,
-	0xf4, 0xc9, 0xd1, 0x80, 0xcb, 0xf6, 0xb2, 0xfa, 0x87, 0x7b, 0xeb, 0xbf, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xb0, 0xc0, 0xe8, 0x46, 0x60, 0x0c, 0x00, 0x00,
+	// 954 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x41, 0x6f, 0x1b, 0x45,
+	0x14, 0xc7, 0xb3, 0x6d, 0x09, 0xca, 0x73, 0x10, 0x30, 0xb4, 0xc1, 0x6c, 0x1c, 0x93, 0x4e, 0x52,
+	0x9a, 0x38, 0x64, 0x87, 0xa4, 0x40, 0x85, 0x44, 0x85, 0x30, 0xa8, 0x69, 0x0f, 0x15, 0x65, 0x0f,
+	0x1c, 0x7a, 0x29, 0x63, 0x7b, 0xb4, 0xbb, 0xc2, 0xde, 0x71, 0x77, 0xd6, 0x88, 0x28, 0xca, 0x05,
+	0x89, 0x03, 0x37, 0xa4, 0x5e, 0x91, 0xb8, 0x22, 0x0e, 0x88, 0x0b, 0x27, 0xbe, 0x40, 0x8f, 0x95,
+	0xb8, 0x70, 0x02, 0x94, 0x20, 0xf1, 0x35, 0xd0, 0xce, 0xbe, 0xf5, 0x8e, 0xbd, 0xde, 0xb5, 0x91,
+	0x7a, 0xb1, 0x66, 0x77, 0xfe, 0xef, 0xcd, 0xef, 0xbd, 0xd9, 0xf9, 0x8f, 0xa1, 0x31, 0xec, 0xf3,
+	0x50, 0xc4, 0x83, 0x20, 0x8c, 0x3d, 0xc9, 0x7a, 0x5c, 0xb2, 0x47, 0x23, 0x11, 0x1d, 0x3b, 0xc3,
+	0x48, 0xc6, 0x92, 0xbc, 0x64, 0xce, 0x3a, 0x3d, 0x2e, 0xed, 0xcb, 0x9e, 0xf4, 0xa4, 0x9e, 0x64,
+	0xc9, 0x28, 0xd5, 0xd9, 0x0d, 0x4f, 0x4a, 0xaf, 0x2f, 0x18, 0x1f, 0x06, 0x8c, 0x87, 0xa1, 0x8c,
+	0x79, 0x1c, 0xc8, 0x50, 0xe1, 0x6c, 0xab, 0x2b, 0xd5, 0x40, 0x2a, 0xd6, 0xe1, 0x4a, 0xa4, 0xe9,
+	0xd9, 0x97, 0x07, 0x1d, 0x11, 0xf3, 0x03, 0x36, 0xe4, 0x5e, 0x10, 0x6a, 0x31, 0x6a, 0x37, 0x0a,
+	0x3c, 0x43, 0x1e, 0xf1, 0x41, 0x96, 0x6a, 0xab, 0x30, 0x9d, 0x0c, 0x1f, 0x46, 0xe2, 0xd1, 0x48,
+	0xa8, 0x18, 0x45, 0xdb, 0x95, 0xa2, 0x2c, 0xd5, 0xd5, 0x82, 0x2a, 0x12, 0x81, 0x52, 0x23, 0x1e,
+	0x76, 0x05, 0x4a, 0x36, 0x0b, 0x92, 0xae, 0xcf, 0xfb, 0x7d, 0x11, 0x7a, 0x99, 0xe2, 0x65, 0x3e,
+	0x08, 0x42, 0xc9, 0xf4, 0x2f, 0xbe, 0xda, 0x2d, 0x04, 0xf5, 0x02, 0x15, 0x47, 0x41, 0x67, 0x94,
+	0x94, 0xf9, 0x50, 0x46, 0x3d, 0x11, 0xa5, 0x52, 0x7a, 0x19, 0xc8, 0xa7, 0x49, 0x3b, 0xee, 0xeb,
+	0x12, 0xdd, 0x94, 0x8f, 0xde, 0x83, 0x57, 0x26, 0xde, 0xaa, 0xa1, 0x0c, 0x95, 0x20, 0xef, 0xc2,
+	0x72, 0xda, 0x8a, 0xba, 0xb5, 0x69, 0xed, 0xd4, 0x0e, 0xeb, 0xce, 0xf4, 0xe6, 0x38, 0x69, 0x44,
+	0xfb, 0xd2, 0x93, 0x3f, 0x5f, 0x5f, 0x72, 0x51, 0x4d, 0x6f, 0xc2, 0x55, 0x9d, 0xee, 0x48, 0xc4,
+	0xf7, 0x82, 0x30, 0xc6, 0x55, 0x54, 0xfb, 0xf8, 0x0e, 0x57, 0x3e, 0x3e, 0x11, 0x02, 0x97, 0x7c,
+	0xae, 0x7c, 0x9d, 0x7a, 0xc5, 0xd5, 0x63, 0x2a, 0x80, 0x56, 0x05, 0x22, 0xd6, 0x07, 0x50, 0x1b,
+	0xe4, 0xb3, 0xc8, 0xb6, 0x51, 0x64, 0x33, 0x52, 0xb8, 0x66, 0x04, 0xbd, 0x85, 0x7c, 0x93, 0x6b,
+	0x7c, 0xd8, 0xeb, 0x45, 0x42, 0x65, 0x3d, 0x21, 0x75, 0x78, 0x9e, 0xa7, 0x6f, 0x10, 0x31, 0x7b,
+	0xa4, 0x3e, 0x52, 0x96, 0x84, 0x23, 0x65, 0x1b, 0x56, 0x8d, 0x35, 0xb3, 0x16, 0x36, 0x2b, 0x31,
+	0x95, 0x3b, 0x11, 0x43, 0x6f, 0xc1, 0x6b, 0x59, 0x3f, 0xdc, 0xf1, 0x97, 0x92, 0x01, 0x6e, 0x42,
+	0xad, 0xd3, 0x97, 0xdd, 0x2f, 0xee, 0x88, 0xc0, 0xf3, 0xd3, 0x36, 0x5c, 0x74, 0xcd, 0x57, 0xf4,
+	0x01, 0xd8, 0xb3, 0xc2, 0x11, 0xf0, 0x7d, 0x80, 0xfc, 0xf3, 0x43, 0xbc, 0x46, 0x11, 0xcf, 0x88,
+	0x34, 0xf4, 0x94, 0xc3, 0xab, 0x3a, 0x77, 0x3e, 0x3d, 0xee, 0xdc, 0x6d, 0x80, 0xfc, 0x90, 0x61,
+	0xe2, 0x37, 0x9c, 0xf4, 0x44, 0x3a, 0xc9, 0x89, 0x74, 0xd2, 0x03, 0x8f, 0x27, 0xd2, 0xb9, 0xcf,
+	0xbd, 0xac, 0x28, 0xd7, 0x88, 0xa4, 0x3f, 0x5b, 0x50, 0x2f, 0xae, 0x81, 0xf4, 0x77, 0xa1, 0x96,
+	0xd3, 0x24, 0xdd, 0xbd, 0x38, 0x0f, 0xbf, 0xbd, 0x92, 0x7c, 0xa4, 0x3f, 0xfe, 0xfb, 0x4b, 0xcb,
+	0x72, 0xcd, 0x58, 0x72, 0x34, 0xc1, 0x7b, 0x41, 0xf3, 0x5e, 0x9f, 0xcb, 0x9b, 0x72, 0x4c, 0x00,
+	0x1f, 0x22, 0xef, 0x91, 0x88, 0x3f, 0xca, 0x4e, 0x6d, 0xd6, 0x94, 0x35, 0x58, 0xf6, 0xcd, 0x8d,
+	0xc2, 0x27, 0xfa, 0x59, 0xbe, 0xc5, 0x46, 0x0c, 0x16, 0xf9, 0x1e, 0xac, 0x8c, 0x8f, 0x3f, 0x36,
+	0x72, 0xbd, 0x58, 0x62, 0x1e, 0x97, 0xab, 0xe9, 0xe7, 0xb0, 0xa6, 0xf3, 0x8e, 0x27, 0x9f, 0xf9,
+	0xf6, 0xfc, 0x64, 0xe1, 0x27, 0x60, 0x2e, 0x81, 0xe0, 0xb7, 0x01, 0xc6, 0x28, 0xd9, 0xe6, 0x54,
+	0x91, 0x9b, 0x7b, 0x63, 0x44, 0x3e, 0xbb, 0xad, 0x79, 0x07, 0xd6, 0xb3, 0x36, 0x7f, 0x6c, 0x78,
+	0xe3, 0xbc, 0xdd, 0xf1, 0xa0, 0x31, 0x3b, 0x0c, 0xeb, 0x3c, 0x82, 0x55, 0xd3, 0x6a, 0xb1, 0x9b,
+	0x5b, 0xc5, 0x4a, 0xcd, 0xe8, 0x4f, 0x12, 0x3f, 0x76, 0x27, 0x02, 0x0f, 0xff, 0x5a, 0x81, 0xe7,
+	0xf4, 0x4a, 0x64, 0x04, 0xcb, 0xa9, 0xa9, 0x92, 0xed, 0x62, 0x9a, 0xa2, 0x77, 0xdb, 0xd7, 0xe6,
+	0xa8, 0x52, 0x52, 0xda, 0xfc, 0xfa, 0xf7, 0x7f, 0x1e, 0x5f, 0xa8, 0x93, 0x35, 0x96, 0xcb, 0x8d,
+	0xcb, 0x8e, 0xfc, 0x6a, 0xc1, 0x95, 0x99, 0xb6, 0x4b, 0x6e, 0x94, 0x2c, 0x50, 0xe5, 0xee, 0xf6,
+	0xdb, 0xff, 0x2f, 0x08, 0x21, 0x0f, 0x34, 0xe4, 0x1e, 0xd9, 0x9d, 0x86, 0x9c, 0xb8, 0x4d, 0x59,
+	0x72, 0x57, 0xb0, 0x93, 0xe4, 0xf7, 0x94, 0xfc, 0x66, 0xc1, 0x95, 0x99, 0x46, 0x5c, 0xca, 0x5d,
+	0xe5, 0xfa, 0xa5, 0xdc, 0x95, 0x5e, 0x4f, 0x6f, 0x6a, 0xee, 0x03, 0xc2, 0xaa, 0xb9, 0xf1, 0x02,
+	0x61, 0x27, 0x38, 0x38, 0x25, 0xdf, 0x5b, 0xf0, 0xc2, 0x84, 0x3b, 0x93, 0xbd, 0xf2, 0xc6, 0x15,
+	0xae, 0x00, 0xfb, 0xcd, 0xc5, 0xc4, 0x48, 0xf9, 0x96, 0xa6, 0x6c, 0x91, 0x9d, 0x69, 0xca, 0xdc,
+	0x0c, 0xd9, 0x89, 0x71, 0x7f, 0x9c, 0x92, 0x6f, 0x2d, 0xa8, 0x19, 0xe6, 0x4b, 0x76, 0x4b, 0xd6,
+	0x2b, 0x5e, 0x02, 0x76, 0x6b, 0x11, 0x29, 0x82, 0x6d, 0x69, 0xb0, 0x0d, 0xb2, 0x5e, 0x0e, 0xa6,
+	0xc8, 0x63, 0x0b, 0x56, 0x4d, 0x93, 0x24, 0xad, 0xf2, 0xe2, 0xa7, 0xdd, 0xd7, 0xde, 0x5b, 0x48,
+	0x8b, 0x38, 0x2d, 0x8d, 0xb3, 0x4d, 0xe8, 0x34, 0xce, 0xd8, 0x98, 0xd8, 0x89, 0x8f, 0x1d, 0xfa,
+	0xc6, 0x02, 0xc8, 0xfd, 0x8f, 0xec, 0x94, 0xac, 0x53, 0x70, 0x61, 0x7b, 0x77, 0x01, 0x25, 0xf2,
+	0x50, 0xcd, 0xd3, 0x20, 0x76, 0x29, 0x8f, 0x22, 0x3f, 0x58, 0xf0, 0xe2, 0x94, 0x49, 0x91, 0xfd,
+	0xf2, 0xa2, 0x67, 0x78, 0xa0, 0xed, 0x2c, 0x2a, 0x47, 0xac, 0x7d, 0x8d, 0x75, 0x9d, 0x5c, 0x9b,
+	0xc6, 0x32, 0x8d, 0x6d, 0xdc, 0xa9, 0xf6, 0xdd, 0x27, 0x67, 0x4d, 0xeb, 0xe9, 0x59, 0xd3, 0xfa,
+	0xfb, 0xac, 0x69, 0x7d, 0x77, 0xde, 0x5c, 0x7a, 0x7a, 0xde, 0x5c, 0xfa, 0xe3, 0xbc, 0xb9, 0xf4,
+	0x80, 0x79, 0x41, 0xec, 0x8f, 0x3a, 0x4e, 0x57, 0x0e, 0xcc, 0x54, 0xf9, 0x70, 0xdf, 0x93, 0xec,
+	0x2b, 0x9d, 0x3a, 0x3e, 0x1e, 0x0a, 0xd5, 0x59, 0xd6, 0xff, 0x65, 0x6f, 0xfc, 0x17, 0x00, 0x00,
+	0xff, 0xff, 0x93, 0x15, 0x35, 0x23, 0x4a, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/dao/types/query.pb.gw.go b/x/dao/types/query.pb.gw.go
index ae0d157..2d4120f 100644
--- a/x/dao/types/query.pb.gw.go
+++ b/x/dao/types/query.pb.gw.go
@@ -790,19 +790,19 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 var (
 	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"planetmint", "dao", "params"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetMintRequestsByHash_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "get_mint_requests_by_hash", "hash"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetMintRequestsByHash_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "mint_requests", "hash"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_MintRequestsByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "mint_requests_by_address", "address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_MintRequestsByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "mint_requests", "address"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetReissuance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "get_reissuance", "blockHeight"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetReissuance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "reissuance", "blockHeight"}, "", runtime.AssumeColonVerbOpt(true)))
 
 	pattern_Query_Reissuances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"planetmint", "dao", "reissuances"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetChallenge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "get_challenge", "height"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetChallenge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "challenge", "height"}, "", runtime.AssumeColonVerbOpt(true)))
 
 	pattern_Query_Challenges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"planetmint", "dao", "challenges"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetDistribution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "get_distribution", "height"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetDistribution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "dao", "distribution", "height"}, "", runtime.AssumeColonVerbOpt(true)))
 )
 
 var (
diff --git a/x/machine/client/cli/query.go b/x/machine/client/cli/query.go
index 00c2ab4..8b6ce5e 100644
--- a/x/machine/client/cli/query.go
+++ b/x/machine/client/cli/query.go
@@ -27,7 +27,7 @@ func GetQueryCmd(_ string) *cobra.Command {
 	cmd.AddCommand(CmdQueryParams())
 	cmd.AddCommand(CmdGetMachineByPublicKey())
 
-	cmd.AddCommand(CmdGetTrustAnchorStatus())
+	cmd.AddCommand(CmdGetTrustAnchor())
 	cmd.AddCommand(CmdGetMachineByAddress())
 
 	cmd.AddCommand(CmdGetLiquidAssetsByMachineid())
diff --git a/x/machine/client/cli/query_get_machine_by_address.go b/x/machine/client/cli/query_address.go
similarity index 90%
rename from x/machine/client/cli/query_get_machine_by_address.go
rename to x/machine/client/cli/query_address.go
index 17607a8..fe308bc 100644
--- a/x/machine/client/cli/query_get_machine_by_address.go
+++ b/x/machine/client/cli/query_address.go
@@ -13,8 +13,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetMachineByAddress() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-machine-by-address [address]",
-		Short: "Query get-machine-by-address",
+		Use:   "address [address]",
+		Short: "Query for machines by address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqAddress := args[0]
diff --git a/x/machine/client/cli/query_get_liquid_assets_by_machineid.go b/x/machine/client/cli/query_liquid_assets.go
similarity index 89%
rename from x/machine/client/cli/query_get_liquid_assets_by_machineid.go
rename to x/machine/client/cli/query_liquid_assets.go
index 55a6117..0f32dc9 100644
--- a/x/machine/client/cli/query_get_liquid_assets_by_machineid.go
+++ b/x/machine/client/cli/query_liquid_assets.go
@@ -13,8 +13,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetLiquidAssetsByMachineid() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-liquid-assets-by-machineid [machine-id]",
-		Short: "Query get_liquid_assets_by_machineid",
+		Use:   "liquid-assets [machine-id]",
+		Short: "Query for liquid assets by machine ID",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqMachineID := args[0]
diff --git a/x/machine/client/cli/query_params.go b/x/machine/client/cli/query_params.go
index 655c7ce..ac620cd 100644
--- a/x/machine/client/cli/query_params.go
+++ b/x/machine/client/cli/query_params.go
@@ -11,7 +11,7 @@ import (
 func CmdQueryParams() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "params",
-		Short: "shows the parameters of the module",
+		Short: "Query the current machine parameters information",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/x/machine/client/cli/query_get_machine_by_public_key.go b/x/machine/client/cli/query_public_key.go
similarity index 90%
rename from x/machine/client/cli/query_get_machine_by_public_key.go
rename to x/machine/client/cli/query_public_key.go
index 9da0ad7..86f3126 100644
--- a/x/machine/client/cli/query_get_machine_by_public_key.go
+++ b/x/machine/client/cli/query_public_key.go
@@ -13,8 +13,8 @@ var _ = strconv.Itoa(0)
 
 func CmdGetMachineByPublicKey() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-machine-by-public-key [public-key]",
-		Short: "Query get-machine-by-public-key",
+		Use:   "public-key [public-key]",
+		Short: "Query for machines by public key",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqPublicKey := args[0]
diff --git a/x/machine/client/cli/query_get_trust_anchor_status.go b/x/machine/client/cli/query_trust_anchor.go
similarity index 60%
rename from x/machine/client/cli/query_get_trust_anchor_status.go
rename to x/machine/client/cli/query_trust_anchor.go
index ee579e3..6d362ad 100644
--- a/x/machine/client/cli/query_get_trust_anchor_status.go
+++ b/x/machine/client/cli/query_trust_anchor.go
@@ -11,10 +11,25 @@ import (
 
 var _ = strconv.Itoa(0)
 
-func CmdGetTrustAnchorStatus() *cobra.Command {
+func CmdGetTrustAnchor() *cobra.Command {
+	// Group trust-anchor queries under a subcommand
 	cmd := &cobra.Command{
-		Use:   "get-trust-anchor-status [machineid]",
-		Short: "Query get_trust_anchor_status",
+		Use:                        "trust-anchor",
+		Short:                      "Query for trust anchor subcommand",
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	cmd.AddCommand(CmdGetStatus())
+
+	return cmd
+}
+
+func CmdGetStatus() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "status [machine-id]",
+		Short: "Query for trust anchor status by machine ID",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqMachineid := args[0]
diff --git a/x/machine/types/query.pb.go b/x/machine/types/query.pb.go
index c88bac2..e182cb7 100644
--- a/x/machine/types/query.pb.go
+++ b/x/machine/types/query.pb.go
@@ -493,51 +493,50 @@ func init() {
 func init() { proto.RegisterFile("planetmintgo/machine/query.proto", fileDescriptor_bf7841d43d757203) }
 
 var fileDescriptor_bf7841d43d757203 = []byte{
-	// 701 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x4f, 0x13, 0x41,
-	0x18, 0xed, 0x12, 0x05, 0x19, 0x2e, 0x66, 0xa8, 0x09, 0xd9, 0xd4, 0x52, 0xe6, 0x20, 0x68, 0x62,
-	0x27, 0x80, 0x52, 0x11, 0x54, 0xda, 0x20, 0x86, 0x68, 0x13, 0xa8, 0x9e, 0x34, 0x66, 0x33, 0xdd,
-	0x4e, 0x96, 0x8d, 0xed, 0xce, 0xb2, 0x33, 0x4b, 0xd8, 0x90, 0x1e, 0xf4, 0x17, 0x98, 0xf8, 0x8f,
-	0x3c, 0x71, 0x31, 0x92, 0x78, 0xf1, 0x64, 0x14, 0xfc, 0x21, 0xa6, 0xb3, 0xb3, 0xdb, 0x85, 0x6e,
-	0x57, 0xaa, 0xa7, 0x4e, 0xbf, 0xbe, 0xf7, 0x7d, 0xef, 0x7d, 0x3b, 0xaf, 0x0b, 0x4a, 0x6e, 0x9b,
-	0x38, 0x54, 0x74, 0x6c, 0x47, 0x58, 0x0c, 0x77, 0x88, 0xb9, 0x67, 0x3b, 0x14, 0xef, 0xfb, 0xd4,
-	0x0b, 0xca, 0xae, 0xc7, 0x04, 0x83, 0xf9, 0x24, 0xa2, 0xac, 0x10, 0x7a, 0xde, 0x62, 0x16, 0x93,
-	0x00, 0xdc, 0x3b, 0x85, 0x58, 0xbd, 0x60, 0x31, 0x66, 0xb5, 0x29, 0x26, 0xae, 0x8d, 0x89, 0xe3,
-	0x30, 0x41, 0x84, 0xcd, 0x1c, 0xae, 0x7e, 0xbd, 0x63, 0x32, 0xde, 0x61, 0x1c, 0x37, 0x09, 0x57,
-	0x23, 0xf0, 0xc1, 0x62, 0x93, 0x0a, 0xb2, 0x88, 0x5d, 0x62, 0xd9, 0x8e, 0x04, 0x2b, 0xec, 0x5c,
-	0xaa, 0x2e, 0x97, 0x78, 0xa4, 0x13, 0xb5, 0x43, 0xa9, 0x10, 0xf5, 0xa9, 0x30, 0xf3, 0xa9, 0x98,
-	0xb6, 0xbd, 0xef, 0xdb, 0x2d, 0x83, 0x70, 0x4e, 0x45, 0x08, 0x44, 0x79, 0x00, 0x77, 0x7b, 0x8a,
-	0x76, 0xe4, 0x84, 0x06, 0xdd, 0xf7, 0x29, 0x17, 0x68, 0x17, 0x4c, 0x9f, 0xab, 0x72, 0x97, 0x39,
-	0x9c, 0xc2, 0x87, 0x60, 0x3c, 0x54, 0x32, 0xa3, 0x95, 0xb4, 0x85, 0xa9, 0xa5, 0x42, 0x39, 0x6d,
-	0x47, 0xe5, 0x90, 0x55, 0xbb, 0x72, 0xfc, 0x63, 0x36, 0xd7, 0x50, 0x0c, 0x54, 0x05, 0x73, 0xb2,
-	0xe5, 0x33, 0x2a, 0xea, 0x21, 0xae, 0x16, 0xec, 0xf8, 0xcd, 0xb6, 0x6d, 0x3e, 0xa7, 0x81, 0x9a,
-	0x0b, 0x0b, 0x60, 0xd2, 0x8d, 0x6a, 0x72, 0xc6, 0x64, 0xa3, 0x5f, 0x40, 0x6f, 0x01, 0xca, 0x6a,
-	0xa1, 0x44, 0x56, 0xc0, 0x84, 0x12, 0xa2, 0x54, 0xde, 0x4c, 0x57, 0xa9, 0x5a, 0x34, 0x22, 0x34,
-	0xda, 0x00, 0xa5, 0xa8, 0xfd, 0x2b, 0xcf, 0xe7, 0xa2, 0xea, 0x98, 0x7b, 0xcc, 0x7b, 0x29, 0x88,
-	0xf0, 0x79, 0x42, 0xa0, 0x82, 0xdb, 0xad, 0x48, 0x60, 0x5c, 0x40, 0x66, 0xdf, 0x63, 0x4a, 0x07,
-	0xa5, 0x2f, 0xb3, 0x05, 0x2c, 0x81, 0x29, 0x9b, 0x13, 0x53, 0xd8, 0x07, 0x44, 0xd0, 0xd6, 0xcc,
-	0x58, 0x49, 0x5b, 0xb8, 0xd6, 0x48, 0x96, 0xd0, 0x1a, 0x98, 0x1d, 0xd8, 0x42, 0xb5, 0xd5, 0xf2,
-	0x28, 0x8f, 0x55, 0xce, 0x80, 0x09, 0x12, 0x56, 0xd4, 0x80, 0xe8, 0x2b, 0x7a, 0xd3, 0xf7, 0x38,
-	0x48, 0xfe, 0xdf, 0x05, 0x6e, 0x81, 0x5b, 0x51, 0xf3, 0x17, 0xf2, 0xa6, 0x55, 0x7b, 0x17, 0x8d,
-	0xd7, 0x82, 0x7a, 0x64, 0x6f, 0x70, 0x8d, 0xdb, 0x9b, 0x17, 0x76, 0xb0, 0xbd, 0x89, 0x0e, 0xc1,
-	0xfc, 0x5f, 0xfb, 0x28, 0xad, 0x75, 0x70, 0xbd, 0xdd, 0x87, 0x3c, 0x75, 0x84, 0x17, 0x28, 0xd1,
-	0x73, 0xe9, 0xa2, 0x13, 0x0d, 0x1b, 0x03, 0xd4, 0xa5, 0xaf, 0x13, 0xe0, 0xaa, 0x1c, 0x0d, 0xdf,
-	0x6b, 0x60, 0x3c, 0xbc, 0xc7, 0x70, 0x21, 0xbd, 0xd3, 0x60, 0x6c, 0xf4, 0xdb, 0x97, 0x40, 0x86,
-	0xc2, 0x11, 0xfa, 0xf0, 0xed, 0xf7, 0xa7, 0xb1, 0x02, 0xd4, 0x71, 0x9f, 0x72, 0x21, 0xee, 0xf0,
-	0x8b, 0x06, 0x6e, 0xa4, 0xde, 0x75, 0x58, 0xc9, 0x18, 0x94, 0x15, 0x30, 0xfd, 0xc1, 0xe8, 0x44,
-	0x25, 0xb8, 0x2a, 0x05, 0xaf, 0xc1, 0xd5, 0x34, 0xc1, 0x16, 0x15, 0x86, 0x3a, 0x1b, 0xcd, 0xc0,
-	0x08, 0x23, 0x6b, 0xbc, 0xa3, 0x01, 0x3e, 0x8a, 0xe3, 0xdb, 0x85, 0xc7, 0x1a, 0xc8, 0xa7, 0x45,
-	0x03, 0xae, 0x64, 0xab, 0x1a, 0x96, 0x46, 0xbd, 0x32, 0x32, 0x4f, 0x99, 0x79, 0x22, 0xcd, 0xac,
-	0xc2, 0xca, 0x30, 0x33, 0xa2, 0x47, 0x35, 0x88, 0xe4, 0x1a, 0x5c, 0x92, 0xf1, 0x51, 0x9c, 0xd2,
-	0x2e, 0xfc, 0xac, 0x81, 0xe9, 0x94, 0x0c, 0xc1, 0xfb, 0x97, 0xdc, 0xef, 0xf9, 0xc0, 0xea, 0x2b,
-	0xa3, 0xd2, 0x94, 0x8f, 0x75, 0xe9, 0x63, 0x05, 0xde, 0xbb, 0xc4, 0x43, 0x51, 0x7f, 0x01, 0xf8,
-	0x48, 0x1d, 0xba, 0xf0, 0x97, 0x06, 0xf4, 0xe1, 0x19, 0x83, 0xeb, 0xd9, 0xa2, 0xb2, 0x23, 0xae,
-	0x3f, 0xfa, 0x47, 0xb6, 0x72, 0xb6, 0x25, 0x9d, 0x6d, 0xc0, 0xc7, 0xc3, 0x9c, 0x25, 0xdf, 0x65,
-	0xbc, 0xe7, 0x2f, 0x7e, 0x3a, 0xf1, 0x83, 0xda, 0xde, 0xec, 0xd6, 0xea, 0xc7, 0xa7, 0x45, 0xed,
-	0xe4, 0xb4, 0xa8, 0xfd, 0x3c, 0x2d, 0x6a, 0x1f, 0xcf, 0x8a, 0xb9, 0x93, 0xb3, 0x62, 0xee, 0xfb,
-	0x59, 0x31, 0xf7, 0x7a, 0xd9, 0xb2, 0xc5, 0x9e, 0xdf, 0x2c, 0x9b, 0xac, 0x93, 0x9c, 0xd1, 0x3f,
-	0xde, 0xb5, 0x18, 0x3e, 0x8c, 0x67, 0x8a, 0xc0, 0xa5, 0xbc, 0x39, 0x2e, 0xdf, 0x9a, 0xcb, 0x7f,
-	0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x3b, 0x35, 0x9b, 0x3f, 0x08, 0x00, 0x00,
+	// 688 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x4f, 0x13, 0x4f,
+	0x18, 0xed, 0x92, 0xdf, 0x0f, 0x64, 0xb8, 0x98, 0xa1, 0x26, 0x64, 0x53, 0x4b, 0x99, 0x44, 0x41,
+	0x22, 0x9d, 0x00, 0x01, 0x8c, 0x68, 0x62, 0x1b, 0xd4, 0x10, 0x6d, 0x02, 0xd5, 0x93, 0xc6, 0x90,
+	0xe9, 0x76, 0xb2, 0x4c, 0x6c, 0x77, 0x96, 0x9d, 0x59, 0xc2, 0x86, 0xf4, 0xa0, 0x7f, 0x81, 0x89,
+	0x57, 0xff, 0x0b, 0xef, 0x9e, 0x3c, 0x70, 0x24, 0xf1, 0xe2, 0xc9, 0x18, 0xf0, 0x0f, 0x31, 0x9d,
+	0x9d, 0xed, 0x2e, 0x74, 0x58, 0x41, 0x4f, 0x9d, 0x7e, 0xfb, 0xde, 0xfb, 0xde, 0xf7, 0xed, 0xbc,
+	0x2c, 0xa8, 0xf8, 0x1d, 0xe2, 0x51, 0xd9, 0x65, 0x9e, 0x74, 0x39, 0xee, 0x12, 0x67, 0x97, 0x79,
+	0x14, 0xef, 0x85, 0x34, 0x88, 0xaa, 0x7e, 0xc0, 0x25, 0x87, 0xc5, 0x2c, 0xa2, 0xaa, 0x11, 0x76,
+	0xd1, 0xe5, 0x2e, 0x57, 0x00, 0xdc, 0x3f, 0xc5, 0x58, 0xbb, 0xe4, 0x72, 0xee, 0x76, 0x28, 0x26,
+	0x3e, 0xc3, 0xc4, 0xf3, 0xb8, 0x24, 0x92, 0x71, 0x4f, 0xe8, 0xa7, 0xf3, 0x0e, 0x17, 0x5d, 0x2e,
+	0x70, 0x8b, 0x08, 0xdd, 0x02, 0xef, 0x2f, 0xb6, 0xa8, 0x24, 0x8b, 0xd8, 0x27, 0x2e, 0xf3, 0x14,
+	0x58, 0x63, 0x67, 0x8c, 0xbe, 0x7c, 0x12, 0x90, 0x6e, 0x22, 0x87, 0x8c, 0x10, 0xfd, 0xab, 0x31,
+	0xb3, 0x46, 0x4c, 0x87, 0xed, 0x85, 0xac, 0xbd, 0x43, 0x84, 0xa0, 0x32, 0x06, 0xa2, 0x22, 0x80,
+	0xdb, 0x7d, 0x47, 0x5b, 0xaa, 0x43, 0x93, 0xee, 0x85, 0x54, 0x48, 0xb4, 0x0d, 0x26, 0xcf, 0x54,
+	0x85, 0xcf, 0x3d, 0x41, 0xe1, 0x7d, 0x30, 0x1a, 0x3b, 0x99, 0xb2, 0x2a, 0xd6, 0xdc, 0xc4, 0x52,
+	0xa9, 0x6a, 0xda, 0x51, 0x35, 0x66, 0xd5, 0xff, 0x3b, 0xfa, 0x31, 0x5d, 0x68, 0x6a, 0x06, 0xaa,
+	0x81, 0x19, 0x25, 0xf9, 0x94, 0xca, 0x46, 0x8c, 0xab, 0x47, 0x5b, 0x61, 0xab, 0xc3, 0x9c, 0x67,
+	0x34, 0xd2, 0x7d, 0x61, 0x09, 0x8c, 0xfb, 0x49, 0x4d, 0xf5, 0x18, 0x6f, 0xa6, 0x05, 0xf4, 0x06,
+	0xa0, 0x3c, 0x09, 0x6d, 0x72, 0x0d, 0x8c, 0x69, 0x23, 0xda, 0xe5, 0x4d, 0xb3, 0x4b, 0x2d, 0xd1,
+	0x4c, 0xd0, 0xe8, 0x11, 0xa8, 0x24, 0xf2, 0x2f, 0x83, 0x50, 0xc8, 0x9a, 0xe7, 0xec, 0xf2, 0xe0,
+	0x85, 0x24, 0x32, 0x14, 0x19, 0x83, 0x1a, 0xce, 0xda, 0x89, 0xc1, 0x41, 0x01, 0x39, 0xe9, 0x8c,
+	0x06, 0x05, 0xed, 0x2f, 0x57, 0x02, 0x56, 0xc0, 0x04, 0x13, 0xc4, 0x91, 0x6c, 0x9f, 0x48, 0xda,
+	0x9e, 0x1a, 0xa9, 0x58, 0x73, 0xd7, 0x9a, 0xd9, 0x12, 0x5a, 0x07, 0xd3, 0x43, 0x5b, 0xa8, 0xb5,
+	0xdb, 0x01, 0x15, 0x03, 0x97, 0x53, 0x60, 0x8c, 0xc4, 0x15, 0xdd, 0x20, 0xf9, 0x8b, 0x5e, 0xa7,
+	0x33, 0x0e, 0x93, 0xff, 0x75, 0x81, 0x4f, 0xc0, 0xed, 0x44, 0xfc, 0xb9, 0xba, 0x69, 0xb5, 0xfe,
+	0x45, 0x13, 0xf5, 0xa8, 0x91, 0x8c, 0x37, 0xbc, 0xc6, 0xcd, 0x8d, 0x73, 0x3b, 0xd8, 0xdc, 0x40,
+	0x07, 0x60, 0xf6, 0x8f, 0x3a, 0xda, 0x6b, 0x03, 0x5c, 0xef, 0xa4, 0x90, 0xc7, 0x9e, 0x0c, 0x22,
+	0x6d, 0x7a, 0xc6, 0x6c, 0x3a, 0x23, 0xd8, 0x1c, 0xa2, 0x2e, 0x7d, 0x1a, 0x03, 0xff, 0xab, 0xd6,
+	0xf0, 0x9d, 0x05, 0x46, 0xe3, 0x7b, 0x0c, 0xe7, 0xcc, 0x4a, 0xc3, 0xb1, 0xb1, 0xef, 0x5c, 0x02,
+	0x19, 0x1b, 0x47, 0xe8, 0xfd, 0xb7, 0x5f, 0x1f, 0x47, 0x4a, 0xd0, 0xc6, 0x29, 0xe5, 0x5c, 0xdc,
+	0xe1, 0x17, 0x0b, 0xdc, 0x30, 0xde, 0x75, 0xb8, 0x96, 0xd3, 0x28, 0x2f, 0x60, 0xf6, 0xbd, 0xab,
+	0x13, 0xb5, 0xe1, 0x25, 0x65, 0xf8, 0x2e, 0x9c, 0x37, 0x1a, 0x56, 0xf0, 0x9d, 0xb7, 0x34, 0xc2,
+	0x87, 0x83, 0xbc, 0xf6, 0xe0, 0x57, 0x0b, 0x14, 0x4d, 0x59, 0x80, 0xab, 0xf9, 0x36, 0x2e, 0x8a,
+	0x9f, 0xbd, 0x76, 0x65, 0x9e, 0x76, 0xbf, 0xae, 0xdc, 0xaf, 0xc0, 0x65, 0x93, 0x7b, 0xd9, 0xa7,
+	0xed, 0x10, 0xc5, 0xc3, 0x42, 0x11, 0xf1, 0xe1, 0x20, 0x92, 0x3d, 0xf8, 0xd9, 0x02, 0x93, 0x86,
+	0xc0, 0xc0, 0x95, 0x4b, 0x2e, 0xf3, 0x6c, 0x3a, 0xed, 0xd5, 0xab, 0xd2, 0xf4, 0x0c, 0x0b, 0x6a,
+	0x86, 0x59, 0x78, 0xcb, 0x34, 0x83, 0x0e, 0x38, 0x3e, 0xd4, 0x87, 0x1e, 0x3c, 0xb6, 0x80, 0x7d,
+	0x71, 0x82, 0xe0, 0x83, 0x7c, 0x17, 0xf9, 0x01, 0xb6, 0x1f, 0xfe, 0x25, 0x5b, 0x8f, 0xb2, 0xa2,
+	0x46, 0xc1, 0x70, 0xc1, 0x34, 0x4a, 0xf6, 0x2b, 0x95, 0xbe, 0x88, 0xcd, 0x8d, 0x5e, 0xbd, 0x71,
+	0x74, 0x52, 0xb6, 0x8e, 0x4f, 0xca, 0xd6, 0xcf, 0x93, 0xb2, 0xf5, 0xe1, 0xb4, 0x5c, 0x38, 0x3e,
+	0x2d, 0x17, 0xbe, 0x9f, 0x96, 0x0b, 0xaf, 0x96, 0x5d, 0x26, 0x77, 0xc3, 0x56, 0xd5, 0xe1, 0xdd,
+	0xac, 0x64, 0x7a, 0x5c, 0x70, 0x39, 0x3e, 0x48, 0xdf, 0x78, 0xe4, 0x53, 0xd1, 0x1a, 0x55, 0x9f,
+	0xc0, 0xe5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0x57, 0xb2, 0xca, 0x0c, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/machine/types/query.pb.gw.go b/x/machine/types/query.pb.gw.go
index d793616..f60eabf 100644
--- a/x/machine/types/query.pb.gw.go
+++ b/x/machine/types/query.pb.gw.go
@@ -535,13 +535,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 var (
 	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"planetmint", "machine", "params"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetMachineByPublicKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "get_machine_by_public_key", "publicKey"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetMachineByPublicKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "public_key", "publicKey"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetTrustAnchorStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "get_trust_anchor_status", "machineid"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetTrustAnchorStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"planetmint", "machine", "trust_anchor", "status", "machineid"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetMachineByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "get_machine_by_address", "address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetMachineByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2}, []string{"planetmint", "machine", "address"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_GetLiquidAssetsByMachineid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "get_liquid_assets_by_machineid", "machineID"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_GetLiquidAssetsByMachineid_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint", "machine", "liquid_assets", "machineID"}, "", runtime.AssumeColonVerbOpt(true)))
 )
 
 var (