diff --git a/indexer/packages/v4-protos/src/codegen/dydxprotocol/accountplus/query.ts b/indexer/packages/v4-protos/src/codegen/dydxprotocol/accountplus/query.ts
index b9a66832ac..b109634853 100644
--- a/indexer/packages/v4-protos/src/codegen/dydxprotocol/accountplus/query.ts
+++ b/indexer/packages/v4-protos/src/codegen/dydxprotocol/accountplus/query.ts
@@ -3,38 +3,38 @@ import { Params, ParamsSDKType } from "./params";
 import { AccountAuthenticator, AccountAuthenticatorSDKType } from "./models";
 import * as _m0 from "protobufjs/minimal";
 import { DeepPartial, Long } from "../../helpers";
-/** AccountStateResponse is request type for the Query/AccountState RPC method. */
+/** AccountStateRequest is request type for the Query/AccountState RPC method. */
 
 export interface AccountStateRequest {
-  /** AccountStateResponse is request type for the Query/AccountState RPC method. */
+  /** AccountStateRequest is request type for the Query/AccountState RPC method. */
   address: string;
 }
-/** AccountStateResponse is request type for the Query/AccountState RPC method. */
+/** AccountStateRequest is request type for the Query/AccountState RPC method. */
 
 export interface AccountStateRequestSDKType {
-  /** AccountStateResponse is request type for the Query/AccountState RPC method. */
+  /** AccountStateRequest is request type for the Query/AccountState RPC method. */
   address: string;
 }
 /**
- * GetAccountStateResponse is response type for the Query/GetAccountState RPC
+ * AccountStateResponse is response type for the Query/GetAccountState RPC
  * method.
  */
 
 export interface AccountStateResponse {
   /**
-   * GetAccountStateResponse is response type for the Query/GetAccountState RPC
+   * AccountStateResponse is response type for the Query/GetAccountState RPC
    * method.
    */
   accountState?: AccountState;
 }
 /**
- * GetAccountStateResponse is response type for the Query/GetAccountState RPC
+ * AccountStateResponse is response type for the Query/GetAccountState RPC
  * method.
  */
 
 export interface AccountStateResponseSDKType {
   /**
-   * GetAccountStateResponse is response type for the Query/GetAccountState RPC
+   * AccountStateResponse is response type for the Query/GetAccountState RPC
    * method.
    */
   account_state?: AccountStateSDKType;
diff --git a/proto/dydxprotocol/accountplus/query.proto b/proto/dydxprotocol/accountplus/query.proto
index 59fe40aa90..0262262615 100644
--- a/proto/dydxprotocol/accountplus/query.proto
+++ b/proto/dydxprotocol/accountplus/query.proto
@@ -37,10 +37,10 @@ service Query {
   }
 }
 
-// AccountStateResponse is request type for the Query/AccountState RPC method.
+// AccountStateRequest is request type for the Query/AccountState RPC method.
 message AccountStateRequest { string address = 1; }
 
-// GetAccountStateResponse is response type for the Query/GetAccountState RPC
+// AccountStateResponse is response type for the Query/GetAccountState RPC
 // method.
 message AccountStateResponse { AccountState account_state = 1; }
 
diff --git a/protocol/x/accountplus/client/cli/query.go b/protocol/x/accountplus/client/cli/query.go
index 9e9c345c92..866edfc454 100644
--- a/protocol/x/accountplus/client/cli/query.go
+++ b/protocol/x/accountplus/client/cli/query.go
@@ -119,7 +119,7 @@ func CmdQueryGetAllAuthenticators() *cobra.Command {
 func CmdQueryAccountState() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "account-state [address]",
-		Short: "Geta account state for an address",
+		Short: "Get account state for an address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
diff --git a/protocol/x/accountplus/keeper/query.go b/protocol/x/accountplus/keeper/query.go
index 04c7041200..2b7065797b 100644
--- a/protocol/x/accountplus/keeper/query.go
+++ b/protocol/x/accountplus/keeper/query.go
@@ -68,7 +68,7 @@ func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*t
 	return &types.QueryParamsResponse{Params: k.GetParams(ctx)}, nil
 }
 
-// GetAccountState returns the x/accountplus account state for an address
+// AccountState returns the x/accountplus account state for an address
 func (k Keeper) AccountState(
 	ctx context.Context,
 	request *types.AccountStateRequest,
diff --git a/protocol/x/accountplus/types/query.pb.go b/protocol/x/accountplus/types/query.pb.go
index 3be0cd378b..ecfc23c071 100644
--- a/protocol/x/accountplus/types/query.pb.go
+++ b/protocol/x/accountplus/types/query.pb.go
@@ -29,7 +29,7 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// AccountStateResponse is request type for the Query/AccountState RPC method.
+// AccountStateRequest is request type for the Query/AccountState RPC method.
 type AccountStateRequest struct {
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 }
@@ -74,7 +74,8 @@ func (m *AccountStateRequest) GetAddress() string {
 	return ""
 }
 
-// GetAccountStateResponse is response type for the Query/GetAccountState RPC method.
+// AccountStateResponse is response type for the Query/GetAccountState RPC
+// method.
 type AccountStateResponse struct {
 	AccountState *AccountState `protobuf:"bytes,1,opt,name=account_state,json=accountState,proto3" json:"account_state,omitempty"`
 }