diff --git a/precompiles/avs/tx.go b/precompiles/avs/tx.go
index 4f70f3589..834042781 100644
--- a/precompiles/avs/tx.go
+++ b/precompiles/avs/tx.go
@@ -49,7 +49,7 @@ func (p Precompile) RegisterAVS(
 	avsParams.AvsAddress = contract.CallerAddress.String()
 	avsParams.Action = avskeeper.RegisterAction
 	// Finally, update the AVS information in the keeper.
-	err = p.avsKeeper.AVSInfoUpdate(ctx, avsParams)
+	err = p.avsKeeper.UpdateAVSInfo(ctx, avsParams)
 	if err != nil {
 		fmt.Println("Failed to update AVS info", err)
 		return nil, err
@@ -82,7 +82,7 @@ func (p Precompile) DeregisterAVS(
 	// validates that this is owner
 	avsParams.CallerAddress = sdk.AccAddress(origin[:]).String()
 
-	err := p.avsKeeper.AVSInfoUpdate(ctx, avsParams)
+	err := p.avsKeeper.UpdateAVSInfo(ctx, avsParams)
 	if err != nil {
 		return nil, err
 	}
@@ -106,7 +106,7 @@ func (p Precompile) UpdateAVS(
 	avsParams.AvsAddress = contract.CallerAddress.String()
 	avsParams.CallerAddress = sdk.AccAddress(origin[:]).String()
 	avsParams.Action = avskeeper.UpdateAction
-	err = p.avsKeeper.AVSInfoUpdate(ctx, avsParams)
+	err = p.avsKeeper.UpdateAVSInfo(ctx, avsParams)
 	if err != nil {
 		return nil, err
 	}
diff --git a/precompiles/avs/utils_test.go b/precompiles/avs/utils_test.go
index 5bbbaceaa..0c98164e6 100644
--- a/precompiles/avs/utils_test.go
+++ b/precompiles/avs/utils_test.go
@@ -94,7 +94,7 @@ func (suite *AVSManagerPrecompileSuite) prepare() {
 }
 
 func (suite *AVSManagerPrecompileSuite) prepareAvs(assetIDs []string) {
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
 		Action:          avskeeper.RegisterAction,
 		EpochIdentifier: epochstypes.HourEpochID,
 		AvsAddress:      suite.avsAddr,
diff --git a/proto/exocore/operator/v1/query.proto b/proto/exocore/operator/v1/query.proto
index 140541d2e..05740969f 100644
--- a/proto/exocore/operator/v1/query.proto
+++ b/proto/exocore/operator/v1/query.proto
@@ -188,14 +188,14 @@ message OperatorConsAddrPair {
 
 // QueryAllOperatorsWithOptInAVSRequest is the request to obtain all opt-in operator addresses
 //  for a specific avs with pagination.
-message QueryAllOperatorsWithOptInAVSRequest {
+message QueryAllOperatorsByOptInAVSRequest {
   // avs address
   string avs = 1;
 }
 
 // QueryAllOperatorsWithOptInAVSResponse is the response that includes a list of all avs
 //   for a specified operator address.
-message QueryAllOperatorsWithOptInAVSResponse {
+message QueryAllOperatorsByOptInAVSResponse {
   // operator_list is a list of operator addresses.
   repeated string operator_list = 1;
 }
@@ -281,7 +281,8 @@ service Query {
   }
 
   // QueryAllOperatorsWithOptInAVS queries  operator list by avs.
-  rpc QueryAllOperatorsWithOptInAVS(QueryAllOperatorsWithOptInAVSRequest) returns (QueryAllOperatorsWithOptInAVSResponse) {
+  rpc QueryAllOperatorsWithOptInAVS(QueryAllOperatorsByOptInAVSRequest) returns (
+      QueryAllOperatorsByOptInAVSResponse) {
     option (google.api.http) = {
       get: "/exocore/operator/v1/opt/operator_list/{avs}"
     };
diff --git a/x/avs/client/cli/query.go b/x/avs/client/cli/query.go
index 185e7bdaa..795d40d1f 100644
--- a/x/avs/client/cli/query.go
+++ b/x/avs/client/cli/query.go
@@ -130,7 +130,7 @@ func QuerySubmitTaskResult() *cobra.Command {
 		Use:   "SubmitTaskResult <task-address-in-hex> <task-id> <operator-addreess>",
 		Short: "Query the SubmitTaskResult by taskAddr  taskID operatorAddr",
 		Long:  "Query the currently submitted Task Result",
-		Args:  cobra.ExactArgs(2),
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !common.IsHexAddress(args[0]) {
 				return xerrors.Errorf("invalid   address,err:%s", types.ErrInvalidAddr)
@@ -162,7 +162,7 @@ func QueryChallengeInfo() *cobra.Command {
 		Use:   "ChallengeInfo <task-address-in-hex> <task-id> <operator-addreess>",
 		Short: "Query the ChallengeInfo by taskAddr  taskID operatorAddr",
 		Long:  "Query the currently Challenge Info  ",
-		Args:  cobra.ExactArgs(2),
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !common.IsHexAddress(args[0]) {
 				return xerrors.Errorf("invalid task  address,err:%s", types.ErrInvalidAddr)
diff --git a/x/avs/keeper/avs.go b/x/avs/keeper/avs.go
index 45535caae..4317f2aeb 100644
--- a/x/avs/keeper/avs.go
+++ b/x/avs/keeper/avs.go
@@ -156,7 +156,7 @@ func (k Keeper) RegisterAVSWithChainID(
 	params.AvsAddress = avsAddr.String()
 	params.Action = RegisterAction
 
-	if err := k.AVSInfoUpdate(ctx, params); err != nil {
+	if err := k.UpdateAVSInfo(ctx, params); err != nil {
 		return common.Address{}, err
 	}
 	return avsAddr, nil
diff --git a/x/avs/keeper/avs_test.go b/x/avs/keeper/avs_test.go
index 857313152..7bdea089a 100644
--- a/x/avs/keeper/avs_test.go
+++ b/x/avs/keeper/avs_test.go
@@ -77,7 +77,7 @@ func (suite *AVSTestSuite) TestAVSInfoUpdate_Register() {
 		EpochIdentifier:    epochstypes.DayEpochID,
 	}
 
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, avsParams)
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, avsParams)
 	suite.NoError(err)
 
 	info, err := suite.App.AVSManagerKeeper.GetAVSInfo(suite.Ctx, avsAddres)
@@ -85,7 +85,7 @@ func (suite *AVSTestSuite) TestAVSInfoUpdate_Register() {
 	suite.NoError(err)
 	suite.Equal(avsAddres, info.GetInfo().AvsAddress)
 
-	err = suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, avsParams)
+	err = suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, avsParams)
 	suite.Error(err)
 	suite.Contains(err.Error(), types.ErrAlreadyRegistered.Error())
 }
@@ -108,19 +108,19 @@ func (suite *AVSTestSuite) TestAVSInfoUpdate_DeRegister() {
 		EpochIdentifier:   epochstypes.DayEpochID,
 	}
 
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, avsParams)
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, avsParams)
 	suite.Error(err)
 	suite.Contains(err.Error(), types.ErrUnregisterNonExistent.Error())
 
 	avsParams.Action = avstypes.RegisterAction
-	err = suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, avsParams)
+	err = suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, avsParams)
 	suite.NoError(err)
 	info, err := suite.App.AVSManagerKeeper.GetAVSInfo(suite.Ctx, avsAddres)
 	suite.Equal(avsAddres, info.GetInfo().AvsAddress)
 
 	avsParams.Action = avstypes.DeRegisterAction
 	avsParams.CallerAddress = "exo13h6xg79g82e2g2vhjwg7j4r2z2hlncelwutkjr"
-	err = suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, avsParams)
+	err = suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, avsParams)
 	suite.NoError(err)
 	info, err = suite.App.AVSManagerKeeper.GetAVSInfo(suite.Ctx, avsAddres)
 	suite.Error(err)
diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go
index ed77e6364..6e1c7390b 100644
--- a/x/avs/keeper/keeper.go
+++ b/x/avs/keeper/keeper.go
@@ -59,7 +59,7 @@ func (k Keeper) GetOperatorKeeper() types.OperatorKeeper {
 	return k.operatorKeeper
 }
 
-func (k Keeper) AVSInfoUpdate(ctx sdk.Context, params *types.AVSRegisterOrDeregisterParams) error {
+func (k Keeper) UpdateAVSInfo(ctx sdk.Context, params *types.AVSRegisterOrDeregisterParams) error {
 	avsInfo, _ := k.GetAVSInfo(ctx, params.AvsAddress)
 	action := params.Action
 	epochIdentifier := params.EpochIdentifier
diff --git a/x/avs/keeper/multi_operator_submit_task_test.go b/x/avs/keeper/multi_operator_submit_task_test.go
index c2ed43d97..27eb6897a 100644
--- a/x/avs/keeper/multi_operator_submit_task_test.go
+++ b/x/avs/keeper/multi_operator_submit_task_test.go
@@ -83,7 +83,7 @@ func (suite *AVSTestSuite) prepareMulDelegation(operatorAddress sdk.AccAddress,
 }
 
 func (suite *AVSTestSuite) prepareMulAvs(assetIDs []string) {
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
 		AvsName:             "avs01",
 		Action:              avskeeper.RegisterAction,
 		EpochIdentifier:     epochstypes.HourEpochID,
diff --git a/x/avs/keeper/submit_task_test.go b/x/avs/keeper/submit_task_test.go
index f4f0ecdb4..3db9f8c54 100644
--- a/x/avs/keeper/submit_task_test.go
+++ b/x/avs/keeper/submit_task_test.go
@@ -74,7 +74,7 @@ func (suite *AVSTestSuite) prepareDelegation(isDelegation bool, assetAddr common
 	suite.NoError(err)
 }
 func (suite *AVSTestSuite) prepareAvs(assetIDs []string) {
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
 		AvsName:             "avs01",
 		Action:              avskeeper.RegisterAction,
 		EpochIdentifier:     epochstypes.HourEpochID,
diff --git a/x/operator/client/cli/query.go b/x/operator/client/cli/query.go
index 35106c02f..4e7c56581 100644
--- a/x/operator/client/cli/query.go
+++ b/x/operator/client/cli/query.go
@@ -354,9 +354,9 @@ func QueryOperatorSlashInfo() *cobra.Command {
 // QueryAllOperatorsWithOptInAVS queries all operators
 func QueryAllOperatorsWithOptInAVS() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-operator-list-by-avs <avsAddr>",
-		Short: "get-operatorList",
-		Long:  "Get  operator list by avs",
+		Use:   "get-operatorList",
+		Short: "Get list of operators by AVS",
+		Long:  "Get the list of operators who have opted in to the specified AVS",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !common.IsHexAddress(args[0]) {
@@ -368,7 +368,7 @@ func QueryAllOperatorsWithOptInAVS() *cobra.Command {
 			}
 
 			queryClient := operatortypes.NewQueryClient(clientCtx)
-			req := operatortypes.QueryAllOperatorsWithOptInAVSRequest{
+			req := operatortypes.QueryAllOperatorsByOptInAVSRequest{
 				Avs: args[0],
 			}
 			res, err := queryClient.QueryAllOperatorsWithOptInAVS(context.Background(), &req)
@@ -385,9 +385,9 @@ func QueryAllOperatorsWithOptInAVS() *cobra.Command {
 // QueryAllAVSsByOperator queries all avs
 func QueryAllAVSsByOperator() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-avsList",
-		Short: "get-avsList",
-		Long:  "get-avsList by operator",
+		Use:   "get-avs-list <operatorAddr>",
+		Short: "Get list of AVSs by operator",
+		Long:  "Get a list of AVSs to which an operator has opted in",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			addr, err := sdk.AccAddressFromBech32(args[0])
diff --git a/x/operator/keeper/grpc_query.go b/x/operator/keeper/grpc_query.go
index c65bd03cf..f66730b44 100644
--- a/x/operator/keeper/grpc_query.go
+++ b/x/operator/keeper/grpc_query.go
@@ -226,13 +226,13 @@ func (k *Keeper) QueryOperatorSlashInfo(goCtx context.Context, req *types.QueryO
 	}, nil
 }
 
-func (k *Keeper) QueryAllOperatorsWithOptInAVS(goCtx context.Context, req *types.QueryAllOperatorsWithOptInAVSRequest) (*types.QueryAllOperatorsWithOptInAVSResponse, error) {
+func (k *Keeper) QueryAllOperatorsWithOptInAVS(goCtx context.Context, req *types.QueryAllOperatorsByOptInAVSRequest) (*types.QueryAllOperatorsByOptInAVSResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	operatorList, err := k.GetOptedInOperatorListByAVS(ctx, req.Avs)
 	if err != nil {
 		return nil, err
 	}
-	return &types.QueryAllOperatorsWithOptInAVSResponse{
+	return &types.QueryAllOperatorsByOptInAVSResponse{
 		OperatorList: operatorList,
 	}, nil
 }
diff --git a/x/operator/keeper/opt_test.go b/x/operator/keeper/opt_test.go
index 9d12c0a31..1b68e2988 100644
--- a/x/operator/keeper/opt_test.go
+++ b/x/operator/keeper/opt_test.go
@@ -94,7 +94,7 @@ func (suite *OperatorTestSuite) prepare() {
 }
 
 func (suite *OperatorTestSuite) prepareAvs(assetIDs []string) {
-	err := suite.App.AVSManagerKeeper.AVSInfoUpdate(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
+	err := suite.App.AVSManagerKeeper.UpdateAVSInfo(suite.Ctx, &avstypes.AVSRegisterOrDeregisterParams{
 		Action:          avskeeper.RegisterAction,
 		EpochIdentifier: epochstypes.HourEpochID,
 		AvsAddress:      suite.avsAddr,
diff --git a/x/operator/types/query.pb.go b/x/operator/types/query.pb.go
index d5a47b5da..1fd10f155 100644
--- a/x/operator/types/query.pb.go
+++ b/x/operator/types/query.pb.go
@@ -1140,23 +1140,23 @@ func (m *OperatorConsAddrPair) GetOptingOut() bool {
 // QueryAllOperatorsWithOptInAVSRequest is the request to obtain all opt-in operator addresses
 //
 //	for a specific avs with pagination.
-type QueryAllOperatorsWithOptInAVSRequest struct {
+type QueryAllOperatorsByOptInAVSRequest struct {
 	// avs address
 	Avs string `protobuf:"bytes,1,opt,name=avs,proto3" json:"avs,omitempty"`
 }
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) Reset()         { *m = QueryAllOperatorsWithOptInAVSRequest{} }
-func (m *QueryAllOperatorsWithOptInAVSRequest) String() string { return proto.CompactTextString(m) }
-func (*QueryAllOperatorsWithOptInAVSRequest) ProtoMessage()    {}
-func (*QueryAllOperatorsWithOptInAVSRequest) Descriptor() ([]byte, []int) {
+func (m *QueryAllOperatorsByOptInAVSRequest) Reset()         { *m = QueryAllOperatorsByOptInAVSRequest{} }
+func (m *QueryAllOperatorsByOptInAVSRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryAllOperatorsByOptInAVSRequest) ProtoMessage()    {}
+func (*QueryAllOperatorsByOptInAVSRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_f91e795a3cecbdbf, []int{20}
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_Unmarshal(b []byte) error {
+func (m *QueryAllOperatorsByOptInAVSRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryAllOperatorsByOptInAVSRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_QueryAllOperatorsWithOptInAVSRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_QueryAllOperatorsByOptInAVSRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -1166,19 +1166,19 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_Marshal(b []byte, determinist
 		return b[:n], nil
 	}
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryAllOperatorsWithOptInAVSRequest.Merge(m, src)
+func (m *QueryAllOperatorsByOptInAVSRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAllOperatorsByOptInAVSRequest.Merge(m, src)
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_Size() int {
+func (m *QueryAllOperatorsByOptInAVSRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryAllOperatorsWithOptInAVSRequest.DiscardUnknown(m)
+func (m *QueryAllOperatorsByOptInAVSRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAllOperatorsByOptInAVSRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_QueryAllOperatorsWithOptInAVSRequest proto.InternalMessageInfo
+var xxx_messageInfo_QueryAllOperatorsByOptInAVSRequest proto.InternalMessageInfo
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) GetAvs() string {
+func (m *QueryAllOperatorsByOptInAVSRequest) GetAvs() string {
 	if m != nil {
 		return m.Avs
 	}
@@ -1188,23 +1188,23 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) GetAvs() string {
 // QueryAllOperatorsWithOptInAVSResponse is the response that includes a list of all avs
 //
 //	for a specified operator address.
-type QueryAllOperatorsWithOptInAVSResponse struct {
+type QueryAllOperatorsByOptInAVSResponse struct {
 	// operator_list is a list of operator addresses.
 	OperatorList []string `protobuf:"bytes,1,rep,name=operator_list,json=operatorList,proto3" json:"operator_list,omitempty"`
 }
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) Reset()         { *m = QueryAllOperatorsWithOptInAVSResponse{} }
-func (m *QueryAllOperatorsWithOptInAVSResponse) String() string { return proto.CompactTextString(m) }
-func (*QueryAllOperatorsWithOptInAVSResponse) ProtoMessage()    {}
-func (*QueryAllOperatorsWithOptInAVSResponse) Descriptor() ([]byte, []int) {
+func (m *QueryAllOperatorsByOptInAVSResponse) Reset()         { *m = QueryAllOperatorsByOptInAVSResponse{} }
+func (m *QueryAllOperatorsByOptInAVSResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryAllOperatorsByOptInAVSResponse) ProtoMessage()    {}
+func (*QueryAllOperatorsByOptInAVSResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_f91e795a3cecbdbf, []int{21}
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_Unmarshal(b []byte) error {
+func (m *QueryAllOperatorsByOptInAVSResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryAllOperatorsByOptInAVSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_QueryAllOperatorsWithOptInAVSResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_QueryAllOperatorsByOptInAVSResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -1214,19 +1214,19 @@ func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_Marshal(b []byte, determinis
 		return b[:n], nil
 	}
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryAllOperatorsWithOptInAVSResponse.Merge(m, src)
+func (m *QueryAllOperatorsByOptInAVSResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryAllOperatorsByOptInAVSResponse.Merge(m, src)
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_Size() int {
+func (m *QueryAllOperatorsByOptInAVSResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryAllOperatorsWithOptInAVSResponse.DiscardUnknown(m)
+func (m *QueryAllOperatorsByOptInAVSResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryAllOperatorsByOptInAVSResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_QueryAllOperatorsWithOptInAVSResponse proto.InternalMessageInfo
+var xxx_messageInfo_QueryAllOperatorsByOptInAVSResponse proto.InternalMessageInfo
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) GetOperatorList() []string {
+func (m *QueryAllOperatorsByOptInAVSResponse) GetOperatorList() []string {
 	if m != nil {
 		return m.OperatorList
 	}
@@ -1348,8 +1348,8 @@ func init() {
 	proto.RegisterType((*QueryAllOperatorConsAddrsByChainIDRequest)(nil), "exocore.operator.v1.QueryAllOperatorConsAddrsByChainIDRequest")
 	proto.RegisterType((*QueryAllOperatorConsAddrsByChainIDResponse)(nil), "exocore.operator.v1.QueryAllOperatorConsAddrsByChainIDResponse")
 	proto.RegisterType((*OperatorConsAddrPair)(nil), "exocore.operator.v1.OperatorConsAddrPair")
-	proto.RegisterType((*QueryAllOperatorsWithOptInAVSRequest)(nil), "exocore.operator.v1.QueryAllOperatorsWithOptInAVSRequest")
-	proto.RegisterType((*QueryAllOperatorsWithOptInAVSResponse)(nil), "exocore.operator.v1.QueryAllOperatorsWithOptInAVSResponse")
+	proto.RegisterType((*QueryAllOperatorsByOptInAVSRequest)(nil), "exocore.operator.v1.QueryAllOperatorsByOptInAVSRequest")
+	proto.RegisterType((*QueryAllOperatorsByOptInAVSResponse)(nil), "exocore.operator.v1.QueryAllOperatorsByOptInAVSResponse")
 	proto.RegisterType((*QueryAllAVSsByOperatorRequest)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorRequest")
 	proto.RegisterType((*QueryAllAVSsByOperatorResponse)(nil), "exocore.operator.v1.QueryAllAVSsByOperatorResponse")
 }
@@ -1357,96 +1357,96 @@ func init() {
 func init() { proto.RegisterFile("exocore/operator/v1/query.proto", fileDescriptor_f91e795a3cecbdbf) }
 
 var fileDescriptor_f91e795a3cecbdbf = []byte{
-	// 1417 bytes of a gzipped FileDescriptorProto
+	// 1422 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x73, 0xdb, 0x44,
-	0x14, 0x8f, 0xd2, 0x96, 0xc4, 0x2f, 0x6d, 0x49, 0xb7, 0x29, 0x24, 0x6e, 0xeb, 0xb4, 0xa2, 0x7f,
-	0xd2, 0x90, 0x48, 0xc4, 0x49, 0x19, 0x68, 0x28, 0x8c, 0x5d, 0xb7, 0x25, 0x6d, 0x87, 0x04, 0x79,
+	0x14, 0x8f, 0xd2, 0x96, 0xc4, 0x2f, 0x6d, 0x49, 0xb7, 0x29, 0x24, 0x6e, 0xeb, 0xb4, 0x2a, 0xb4,
+	0x69, 0x48, 0x24, 0xe2, 0xa4, 0x85, 0x69, 0x28, 0x8c, 0x5d, 0xb7, 0x25, 0x6d, 0x87, 0x04, 0x79,
 	0x08, 0x7f, 0x0e, 0x78, 0x14, 0x79, 0xeb, 0x68, 0xaa, 0x6a, 0x5d, 0xed, 0xda, 0xd4, 0x93, 0x09,
 	0xc3, 0x70, 0x82, 0xe1, 0xc2, 0xd0, 0x23, 0x03, 0xdf, 0x01, 0x86, 0x81, 0x03, 0x5f, 0xa0, 0x87,
-	0x1e, 0x02, 0x5c, 0x38, 0x05, 0x26, 0xe1, 0x83, 0x30, 0x5a, 0xed, 0xca, 0xb6, 0x2c, 0xd9, 0x4e,
-	0xc8, 0x70, 0xb3, 0xa4, 0x7d, 0xfb, 0x7e, 0xbf, 0xdf, 0x7b, 0x6f, 0xdf, 0x5b, 0xc3, 0x24, 0x7e,
-	0x4c, 0x2c, 0xe2, 0x61, 0x9d, 0x54, 0xb1, 0x67, 0x32, 0xe2, 0xe9, 0xf5, 0x39, 0xfd, 0x51, 0x0d,
-	0x7b, 0x0d, 0xad, 0xea, 0x11, 0x46, 0xd0, 0x49, 0xb1, 0x40, 0x93, 0x0b, 0xb4, 0xfa, 0x5c, 0x7a,
-	0xda, 0x22, 0xf4, 0x21, 0xa1, 0xfa, 0x9a, 0x49, 0x71, 0xb0, 0x5a, 0xaf, 0xcf, 0xad, 0x61, 0x66,
-	0xce, 0xe9, 0x55, 0xb3, 0x62, 0xbb, 0x26, 0xb3, 0x89, 0x1b, 0x6c, 0x90, 0x9e, 0x08, 0xd6, 0x96,
-	0xf8, 0x93, 0x1e, 0x3c, 0x88, 0x4f, 0x67, 0xe2, 0x9c, 0xb3, 0xc7, 0xe2, 0xeb, 0x58, 0x85, 0x54,
+	0x1e, 0x0a, 0x5c, 0x38, 0x05, 0x26, 0xe1, 0x83, 0x30, 0x5a, 0xed, 0xca, 0xb6, 0x2c, 0xf9, 0x4f,
+	0xc9, 0x70, 0xb3, 0xa4, 0x7d, 0xfb, 0x7e, 0xbf, 0xdf, 0x7b, 0x6f, 0xdf, 0x5b, 0xc3, 0x34, 0x7e,
+	0x48, 0x2c, 0xe2, 0x61, 0x9d, 0x54, 0xb1, 0x67, 0x32, 0xe2, 0xe9, 0xf5, 0x05, 0xfd, 0x41, 0x0d,
+	0x7b, 0x0d, 0xad, 0xea, 0x11, 0x46, 0xd0, 0x71, 0xb1, 0x40, 0x93, 0x0b, 0xb4, 0xfa, 0x42, 0x7a,
+	0xd6, 0x22, 0xf4, 0x3e, 0xa1, 0xfa, 0x86, 0x49, 0x71, 0xb0, 0x5a, 0xaf, 0x2f, 0x6c, 0x60, 0x66,
+	0x2e, 0xe8, 0x55, 0xb3, 0x62, 0xbb, 0x26, 0xb3, 0x89, 0x1b, 0x6c, 0x90, 0x9e, 0x0a, 0xd6, 0x96,
+	0xf8, 0x93, 0x1e, 0x3c, 0x88, 0x4f, 0xa7, 0xe2, 0x9c, 0xb3, 0x87, 0xe2, 0xeb, 0x44, 0x85, 0x54,
 	0x48, 0x60, 0xe5, 0xff, 0x92, 0x36, 0x15, 0x42, 0x2a, 0x0e, 0xd6, 0xcd, 0xaa, 0xad, 0x9b, 0xae,
-	0x4b, 0x18, 0xf7, 0x15, 0xee, 0xc8, 0xb0, 0x5b, 0xc6, 0xde, 0x43, 0xdb, 0x65, 0xba, 0xe5, 0x35,
-	0xaa, 0x8c, 0xe8, 0x0f, 0x70, 0x43, 0x7c, 0x55, 0x8b, 0x80, 0x6e, 0x63, 0xb6, 0x2c, 0x9c, 0x2d,
-	0xb9, 0xf7, 0x89, 0x81, 0x1f, 0xa1, 0xeb, 0x70, 0x4c, 0xfa, 0x2f, 0x99, 0xe5, 0xb2, 0x37, 0xae,
-	0x9c, 0x53, 0xa6, 0x52, 0xf9, 0xf1, 0xdf, 0x7f, 0x9a, 0x1d, 0x13, 0x70, 0x73, 0xe5, 0xb2, 0x87,
-	0x29, 0x2d, 0x32, 0xcf, 0x76, 0x2b, 0xc6, 0x51, 0xb9, 0xdc, 0x7f, 0xad, 0xae, 0xc1, 0xf8, 0xbb,
-	0xbe, 0x02, 0x39, 0xc7, 0x91, 0x3b, 0x53, 0x03, 0x3f, 0xaa, 0x61, 0xca, 0xd0, 0x2d, 0x80, 0xa6,
-	0x1e, 0x7c, 0xdf, 0x91, 0xec, 0x25, 0x4d, 0x6c, 0xea, 0x8b, 0xa7, 0x05, 0x52, 0x0b, 0xf1, 0xb4,
-	0x15, 0xb3, 0x82, 0x85, 0xad, 0xd1, 0x62, 0xa9, 0x7e, 0xa3, 0xc0, 0x44, 0x8c, 0x13, 0x5a, 0x25,
-	0x2e, 0xc5, 0x68, 0x06, 0x50, 0x93, 0x80, 0x65, 0x71, 0x12, 0x74, 0x5c, 0x39, 0x77, 0x68, 0x2a,
-	0x65, 0x8c, 0x86, 0x58, 0x2d, 0xcb, 0x87, 0x4b, 0xd1, 0xed, 0x36, 0x4c, 0x83, 0x1c, 0xd3, 0xe5,
-	0x9e, 0x98, 0x02, 0x57, 0x6d, 0xa0, 0xbe, 0x52, 0x60, 0x42, 0x82, 0xc9, 0xad, 0x16, 0x85, 0x46,
-	0x05, 0xcc, 0x4c, 0xdb, 0xa1, 0xff, 0x51, 0x55, 0xa4, 0xc3, 0x88, 0x59, 0xa7, 0xdc, 0x12, 0x53,
-	0xca, 0x61, 0xa6, 0xf2, 0xc7, 0x77, 0xb6, 0x27, 0xa1, 0xe9, 0xca, 0x00, 0xb3, 0x4e, 0xc5, 0x6f,
-	0x75, 0x1d, 0xce, 0x70, 0x85, 0x24, 0xa2, 0xf7, 0x8a, 0x85, 0x55, 0xd3, 0xa9, 0x49, 0x39, 0xd1,
-	0xdb, 0x30, 0x54, 0x0e, 0xa0, 0x89, 0x38, 0x68, 0x5a, 0x4c, 0x66, 0x6b, 0x89, 0x84, 0x0c, 0x69,
-	0xae, 0x36, 0xe0, 0x6c, 0x82, 0x27, 0x11, 0x8f, 0x0f, 0x00, 0x6a, 0xb4, 0x5c, 0xaa, 0xfb, 0x2f,
-	0xa5, 0xb7, 0xe9, 0xae, 0xde, 0x96, 0xab, 0x0c, 0x97, 0xe5, 0x3e, 0xf9, 0x63, 0x3b, 0xdb, 0x93,
-	0x29, 0xf9, 0x44, 0x8d, 0x54, 0x8d, 0x96, 0x83, 0x9f, 0xea, 0x1d, 0x78, 0x31, 0x48, 0x83, 0xd5,
-	0x62, 0x94, 0x5f, 0x44, 0x30, 0xa5, 0xa7, 0x60, 0x3f, 0x28, 0x11, 0x1e, 0x45, 0xc7, 0xa4, 0xeb,
-	0xa2, 0x28, 0x0e, 0x56, 0xb2, 0x48, 0x1d, 0x0c, 0xee, 0xbb, 0x0e, 0x36, 0xe0, 0x54, 0x07, 0xda,
-	0x7c, 0x63, 0xa9, 0x80, 0x2e, 0xc1, 0x30, 0xf5, 0x5f, 0x94, 0xec, 0xb2, 0xa0, 0x3e, 0xb2, 0xb3,
-	0x3d, 0x39, 0x14, 0x2c, 0x2a, 0x18, 0x43, 0xfc, 0xe3, 0x52, 0x19, 0x5d, 0x83, 0xc3, 0xb6, 0x7b,
-	0x9f, 0x84, 0x10, 0xba, 0xf1, 0x69, 0xea, 0xc1, 0x6d, 0xd4, 0x5f, 0x15, 0xc8, 0x24, 0x09, 0x26,
-	0x22, 0xbf, 0x02, 0xc7, 0x4d, 0xc7, 0x29, 0x09, 0x28, 0xbe, 0x23, 0xbf, 0x0a, 0x7b, 0x45, 0xbf,
-	0x8d, 0x8a, 0x71, 0xd4, 0x74, 0x9c, 0xf0, 0xcd, 0xc1, 0x55, 0x6b, 0x09, 0x4e, 0xb7, 0x81, 0xbf,
-	0x41, 0x5c, 0x7a, 0x17, 0x37, 0x64, 0xac, 0xa7, 0xe1, 0x44, 0xc7, 0x19, 0x12, 0x28, 0x69, 0x3c,
-	0x1f, 0x39, 0x42, 0xd0, 0x18, 0x1c, 0xb1, 0xd6, 0x4d, 0x3b, 0x80, 0x93, 0x32, 0x82, 0x07, 0xf5,
-	0x33, 0x25, 0x52, 0x81, 0xa1, 0x07, 0x21, 0x4e, 0x0e, 0xa0, 0x5a, 0x5b, 0x73, 0x6c, 0xab, 0xf4,
-	0x00, 0x37, 0x44, 0x46, 0x9d, 0xd1, 0x9a, 0x07, 0xb6, 0x16, 0x1c, 0xd8, 0xda, 0x0a, 0x5f, 0x74,
-	0x17, 0x37, 0xf2, 0x87, 0x9f, 0x6e, 0x4f, 0x0e, 0x18, 0xa9, 0xaa, 0x7c, 0x81, 0xce, 0x02, 0x90,
-	0x2a, 0xb3, 0xdd, 0x4a, 0x89, 0xd4, 0x18, 0x77, 0x3f, 0x6c, 0xa4, 0x82, 0x37, 0xcb, 0x35, 0xa6,
-	0x5a, 0x30, 0xd9, 0x81, 0x40, 0xa6, 0xfe, 0x81, 0xf1, 0xfc, 0x18, 0xce, 0x25, 0x3b, 0x11, 0x54,
-	0x4f, 0x43, 0xca, 0x22, 0x2e, 0x6d, 0xdd, 0x7d, 0xd8, 0x12, 0xeb, 0x7a, 0x91, 0xf8, 0x42, 0x81,
-	0xa9, 0xe8, 0x59, 0x2f, 0xa4, 0xa4, 0xf9, 0xc6, 0x0d, 0x1f, 0xc3, 0x52, 0x41, 0xd2, 0x09, 0x21,
-	0x2a, 0x2d, 0x10, 0x0f, 0xac, 0xdc, 0x9e, 0x29, 0x70, 0xa5, 0x0f, 0x28, 0x82, 0xf4, 0x6a, 0x4b,
-	0x1b, 0xe2, 0xec, 0xfd, 0xce, 0x2b, 0x0a, 0x60, 0xaa, 0x6b, 0x01, 0x88, 0x3d, 0x57, 0x4c, 0xdb,
-	0x6b, 0x36, 0x2c, 0xe9, 0xe8, 0xe0, 0x4a, 0xe0, 0x3b, 0x05, 0x4e, 0xc6, 0xb8, 0xdc, 0x53, 0x4e,
-	0x2c, 0xb6, 0x25, 0xf1, 0x60, 0xef, 0x24, 0x4e, 0x4e, 0xdf, 0x43, 0xd1, 0xc8, 0x7f, 0x99, 0x20,
-	0x37, 0xef, 0xdb, 0xff, 0x73, 0xe8, 0xb7, 0x14, 0x98, 0xee, 0x07, 0x8b, 0x88, 0xfd, 0x87, 0x70,
-	0xb2, 0x3d, 0xf6, 0xcd, 0x19, 0x64, 0x24, 0x7b, 0xa5, 0x67, 0xf0, 0xfd, 0x5d, 0x79, 0xf4, 0x4f,
-	0x90, 0xa8, 0xaf, 0x83, 0x0b, 0xff, 0xa7, 0x30, 0x16, 0xe7, 0x73, 0x4f, 0xe1, 0x6f, 0x2b, 0xec,
-	0xc1, 0xae, 0x85, 0xdd, 0x11, 0xde, 0xd7, 0xe0, 0x42, 0xc7, 0x0c, 0xf7, 0xbe, 0xcd, 0xd6, 0x97,
-	0xab, 0x6c, 0xc9, 0xcd, 0xad, 0x16, 0x65, 0x60, 0x47, 0xe1, 0x90, 0x59, 0x17, 0x1d, 0xdc, 0xf0,
-	0x7f, 0xaa, 0xf7, 0xe0, 0x62, 0x0f, 0x4b, 0x11, 0x86, 0x97, 0x5a, 0x86, 0x2e, 0xc7, 0xa6, 0x4c,
-	0x0c, 0x81, 0xe1, 0x68, 0x75, 0xcf, 0xa6, 0x4c, 0x5d, 0x14, 0x7d, 0x3f, 0xe7, 0x38, 0xb9, 0xd5,
-	0x22, 0xcd, 0x87, 0x27, 0x99, 0x04, 0x90, 0x86, 0x61, 0x69, 0x20, 0x0f, 0x2f, 0xf9, 0xac, 0x2e,
-	0x8a, 0x1e, 0x18, 0x63, 0x2c, 0x30, 0x4c, 0xc0, 0xb0, 0x3f, 0x88, 0xb4, 0xb8, 0x1f, 0x32, 0xeb,
-	0xd4, 0xf7, 0x9c, 0xdd, 0x1a, 0x85, 0x23, 0xdc, 0x1a, 0x7d, 0xab, 0xc0, 0x89, 0xb6, 0x53, 0x94,
-	0x37, 0xbb, 0xcb, 0xb1, 0x89, 0xd2, 0x39, 0xb2, 0xa7, 0xcf, 0x77, 0xcd, 0x28, 0x7f, 0x95, 0x7a,
-	0xed, 0xf3, 0x3f, 0xfe, 0x79, 0x32, 0xb8, 0x80, 0xb2, 0x7a, 0xdc, 0x25, 0x23, 0x54, 0xc9, 0x6f,
-	0xd2, 0xfa, 0x46, 0xdb, 0xa4, 0xba, 0x89, 0xbe, 0x97, 0xe8, 0x5a, 0x05, 0x47, 0xb3, 0xb1, 0x4e,
-	0x93, 0x66, 0xff, 0xb4, 0xd6, 0xef, 0xf2, 0x40, 0x37, 0x75, 0x9a, 0x03, 0xbe, 0x80, 0xd4, 0x58,
-	0xc0, 0xfe, 0x58, 0x41, 0x42, 0x28, 0xbf, 0x45, 0x47, 0x11, 0x71, 0x9c, 0xdd, 0x22, 0x9e, 0xa8,
-	0x4c, 0xf4, 0x4a, 0xb2, 0xfb, 0xf8, 0x11, 0x20, 0x3d, 0xb7, 0x07, 0x0b, 0x81, 0xf9, 0x0e, 0xc7,
-	0x5c, 0x40, 0xf9, 0xee, 0x22, 0xcb, 0x6e, 0xd0, 0x2a, 0xb4, 0x28, 0xb4, 0x4d, 0x7d, 0x83, 0x1f,
-	0x5c, 0x9b, 0x68, 0x5b, 0x01, 0x35, 0xa9, 0xb1, 0xb6, 0xf0, 0x5a, 0xe8, 0x0f, 0x65, 0x7b, 0xdb,
-	0x4f, 0x5f, 0xdd, 0xa3, 0x95, 0xe0, 0x77, 0x97, 0xf3, 0xbb, 0x89, 0x6e, 0xf4, 0xc1, 0xcf, 0x67,
-	0xd3, 0x95, 0xe0, 0x5f, 0x0a, 0x9c, 0xef, 0xd9, 0x4d, 0xd1, 0xf5, 0xbe, 0xd2, 0x26, 0x69, 0x20,
-	0x48, 0xbf, 0xb9, 0x5f, 0x73, 0xc1, 0x78, 0x91, 0x33, 0xbe, 0x8a, 0xe6, 0x7b, 0x66, 0x61, 0xb3,
-	0xc7, 0x87, 0x0c, 0x7f, 0x54, 0xe0, 0x54, 0xec, 0xd5, 0x08, 0xf5, 0x91, 0x5b, 0x91, 0x0b, 0x4d,
-	0x3a, 0xbb, 0x17, 0x13, 0x81, 0x3e, 0xcb, 0xd1, 0xcf, 0xa0, 0xe9, 0x58, 0xf4, 0xf1, 0xd0, 0x9e,
-	0x28, 0x30, 0x1a, 0xbd, 0x54, 0xa1, 0x99, 0x2e, 0x32, 0x76, 0xdc, 0xbd, 0xd2, 0x6a, 0xec, 0xea,
-	0x02, 0xb6, 0xf8, 0xaa, 0x5b, 0x36, 0x76, 0xca, 0xea, 0x2c, 0x87, 0x76, 0x19, 0x5d, 0x4c, 0x86,
-	0xd6, 0x0a, 0xe0, 0x67, 0x05, 0x5e, 0x88, 0xbf, 0x6c, 0xa0, 0x3e, 0x84, 0x89, 0x5e, 0xe5, 0xd2,
-	0xf3, 0x7b, 0xb2, 0x11, 0x6a, 0xce, 0x73, 0xc8, 0xb3, 0xe8, 0xe5, 0xde, 0x6a, 0x36, 0xd1, 0xed,
-	0xca, 0x32, 0xee, 0x3a, 0x38, 0xa0, 0xfe, 0xf3, 0x34, 0x76, 0xfa, 0x49, 0xbf, 0xb5, 0x6f, 0x7b,
-	0x41, 0xee, 0x0d, 0x4e, 0xee, 0x55, 0xb4, 0xd0, 0x67, 0xa2, 0xf3, 0x81, 0x26, 0xcc, 0xf4, 0x67,
-	0x4a, 0xb3, 0x89, 0xc6, 0xb6, 0x64, 0xf4, 0x7a, 0x7f, 0xc7, 0x7f, 0xcc, 0x00, 0x90, 0xbe, 0xb6,
-	0x1f, 0x53, 0x41, 0x6b, 0x81, 0xd3, 0xd2, 0xd0, 0x4c, 0xc2, 0x89, 0xc5, 0xf4, 0xb6, 0x01, 0x41,
-	0xdf, 0x30, 0xeb, 0x74, 0x13, 0xfd, 0x22, 0xb3, 0xad, 0xa3, 0xad, 0x77, 0xcb, 0xb6, 0xa4, 0x01,
-	0xa2, 0x5b, 0xb6, 0x25, 0xce, 0x0d, 0x7d, 0x20, 0x97, 0x63, 0x45, 0xf3, 0x94, 0xdd, 0xcc, 0xdf,
-	0x7b, 0xba, 0x93, 0x51, 0xb6, 0x76, 0x32, 0xca, 0xdf, 0x3b, 0x19, 0xe5, 0xeb, 0xdd, 0xcc, 0xc0,
-	0xd6, 0x6e, 0x66, 0xe0, 0xcf, 0xdd, 0xcc, 0xc0, 0x47, 0xd9, 0x8a, 0xcd, 0xd6, 0x6b, 0x6b, 0x9a,
-	0x45, 0x1e, 0xea, 0x37, 0x83, 0x1d, 0xdf, 0xc1, 0xec, 0x13, 0xe2, 0x3d, 0x08, 0x1d, 0x3c, 0x6e,
-	0xba, 0x60, 0x8d, 0x2a, 0xa6, 0x6b, 0xcf, 0xf1, 0xff, 0x09, 0xe7, 0xff, 0x0d, 0x00, 0x00, 0xff,
-	0xff, 0xcc, 0x34, 0x72, 0xd4, 0x16, 0x15, 0x00, 0x00,
+	0x4b, 0x18, 0xf7, 0x15, 0xee, 0xc8, 0xb0, 0x5b, 0xc6, 0xde, 0x7d, 0xdb, 0x65, 0xba, 0xe5, 0x35,
+	0xaa, 0x8c, 0xe8, 0xf7, 0x70, 0x43, 0x7c, 0x55, 0x8b, 0x80, 0x6e, 0x62, 0xb6, 0x2a, 0x9c, 0xad,
+	0xb8, 0x77, 0x89, 0x81, 0x1f, 0xa0, 0xab, 0x70, 0x44, 0xfa, 0x2f, 0x99, 0xe5, 0xb2, 0x37, 0xa9,
+	0x9c, 0x51, 0x66, 0x52, 0xf9, 0xc9, 0xdf, 0x7f, 0x9a, 0x9f, 0x10, 0x70, 0x73, 0xe5, 0xb2, 0x87,
+	0x29, 0x2d, 0x32, 0xcf, 0x76, 0x2b, 0xc6, 0x61, 0xb9, 0xdc, 0x7f, 0xad, 0x6e, 0xc0, 0xe4, 0xbb,
+	0xbe, 0x02, 0x39, 0xc7, 0x91, 0x3b, 0x53, 0x03, 0x3f, 0xa8, 0x61, 0xca, 0xd0, 0x0d, 0x80, 0xa6,
+	0x1e, 0x7c, 0xdf, 0xb1, 0xec, 0x79, 0x4d, 0x6c, 0xea, 0x8b, 0xa7, 0x05, 0x52, 0x0b, 0xf1, 0xb4,
+	0x35, 0xb3, 0x82, 0x85, 0xad, 0xd1, 0x62, 0xa9, 0x7e, 0xa3, 0xc0, 0x54, 0x8c, 0x13, 0x5a, 0x25,
+	0x2e, 0xc5, 0x68, 0x0e, 0x50, 0x93, 0x80, 0x65, 0x71, 0x12, 0x74, 0x52, 0x39, 0x73, 0x60, 0x26,
+	0x65, 0x8c, 0x87, 0x58, 0x2d, 0xcb, 0x87, 0x4b, 0xd1, 0xcd, 0x36, 0x4c, 0xc3, 0x1c, 0xd3, 0x85,
+	0x9e, 0x98, 0x02, 0x57, 0x6d, 0xa0, 0xbe, 0x52, 0x60, 0x4a, 0x82, 0xc9, 0xad, 0x17, 0x85, 0x46,
+	0x05, 0xcc, 0x4c, 0xdb, 0xa1, 0xff, 0x51, 0x55, 0xa4, 0xc3, 0x98, 0x59, 0xa7, 0xdc, 0x12, 0x53,
+	0xca, 0x61, 0xa6, 0xf2, 0x47, 0x77, 0x77, 0xa6, 0xa1, 0xe9, 0xca, 0x00, 0xb3, 0x4e, 0xc5, 0x6f,
+	0x75, 0x13, 0x4e, 0x71, 0x85, 0x24, 0xa2, 0xf7, 0x8a, 0x85, 0x75, 0xd3, 0xa9, 0x49, 0x39, 0xd1,
+	0xdb, 0x30, 0x52, 0x0e, 0xa0, 0x89, 0x38, 0x68, 0x5a, 0x4c, 0x66, 0x6b, 0x89, 0x84, 0x0c, 0x69,
+	0xae, 0x36, 0xe0, 0x74, 0x82, 0x27, 0x11, 0x8f, 0x0f, 0x00, 0x6a, 0xb4, 0x5c, 0xaa, 0xfb, 0x2f,
+	0xa5, 0xb7, 0xd9, 0xae, 0xde, 0x56, 0xab, 0x0c, 0x97, 0xe5, 0x3e, 0xf9, 0x23, 0xbb, 0x3b, 0xd3,
+	0x29, 0xf9, 0x44, 0x8d, 0x54, 0x8d, 0x96, 0x83, 0x9f, 0xea, 0x2d, 0x78, 0x31, 0x48, 0x83, 0xf5,
+	0x62, 0x94, 0x5f, 0x44, 0x30, 0xa5, 0xa7, 0x60, 0x3f, 0x28, 0x11, 0x1e, 0x45, 0xc7, 0xa4, 0x9b,
+	0xa2, 0x28, 0xf6, 0x57, 0xb2, 0x48, 0x1d, 0x0c, 0x3f, 0x73, 0x1d, 0x6c, 0xc1, 0x89, 0x0e, 0xb4,
+	0xf9, 0xc6, 0x4a, 0x01, 0x9d, 0x87, 0x51, 0xea, 0xbf, 0x28, 0xd9, 0x65, 0x41, 0x7d, 0x6c, 0x77,
+	0x67, 0x7a, 0x24, 0x58, 0x54, 0x30, 0x46, 0xf8, 0xc7, 0x95, 0x32, 0xba, 0x02, 0x07, 0x6d, 0xf7,
+	0x2e, 0x09, 0x21, 0x74, 0xe3, 0xd3, 0xd4, 0x83, 0xdb, 0xa8, 0xbf, 0x2a, 0x90, 0x49, 0x12, 0x4c,
+	0x44, 0x7e, 0x0d, 0x8e, 0x9a, 0x8e, 0x53, 0x12, 0x50, 0x7c, 0x47, 0x7e, 0x15, 0xf6, 0x8a, 0x7e,
+	0x1b, 0x15, 0xe3, 0xb0, 0xe9, 0x38, 0xe1, 0x9b, 0xfd, 0xab, 0xd6, 0x12, 0x9c, 0x6c, 0x03, 0x7f,
+	0x8d, 0xb8, 0xf4, 0x36, 0x6e, 0xc8, 0x58, 0xcf, 0xc2, 0xb1, 0x8e, 0x33, 0x24, 0x50, 0xd2, 0x78,
+	0x3e, 0x72, 0x84, 0xa0, 0x09, 0x38, 0x64, 0x6d, 0x9a, 0x76, 0x00, 0x27, 0x65, 0x04, 0x0f, 0xea,
+	0x67, 0x4a, 0xa4, 0x02, 0x43, 0x0f, 0x42, 0x9c, 0x1c, 0x40, 0xb5, 0xb6, 0xe1, 0xd8, 0x56, 0xe9,
+	0x1e, 0x6e, 0x88, 0x8c, 0x3a, 0xa5, 0x35, 0x0f, 0x6c, 0x2d, 0x38, 0xb0, 0xb5, 0x35, 0xbe, 0xe8,
+	0x36, 0x6e, 0xe4, 0x0f, 0x3e, 0xde, 0x99, 0x1e, 0x32, 0x52, 0x55, 0xf9, 0x02, 0x9d, 0x06, 0x20,
+	0x55, 0x66, 0xbb, 0x95, 0x12, 0xa9, 0x31, 0xee, 0x7e, 0xd4, 0x48, 0x05, 0x6f, 0x56, 0x6b, 0x4c,
+	0xb5, 0x60, 0xba, 0x03, 0x81, 0x4c, 0xfd, 0x7d, 0xe3, 0xf9, 0x31, 0x9c, 0x49, 0x76, 0x22, 0xa8,
+	0x9e, 0x84, 0x94, 0x45, 0x5c, 0xda, 0xba, 0xfb, 0xa8, 0x25, 0xd6, 0xf5, 0x22, 0xf1, 0x85, 0x02,
+	0x33, 0xd1, 0xb3, 0x5e, 0x48, 0x49, 0xf3, 0x8d, 0x6b, 0x3e, 0x86, 0x95, 0x82, 0xa4, 0x13, 0x42,
+	0x54, 0x5a, 0x20, 0xee, 0x5b, 0xb9, 0x3d, 0x51, 0xe0, 0x62, 0x1f, 0x50, 0x04, 0xe9, 0xf5, 0x96,
+	0x36, 0xc4, 0xd9, 0xfb, 0x9d, 0x57, 0x14, 0xc0, 0x4c, 0xd7, 0x02, 0x10, 0x7b, 0xae, 0x99, 0xb6,
+	0xd7, 0x6c, 0x58, 0xd2, 0xd1, 0xfe, 0x95, 0xc0, 0x77, 0x0a, 0x1c, 0x8f, 0x71, 0x39, 0x50, 0x4e,
+	0x2c, 0xb7, 0x25, 0xf1, 0x70, 0xef, 0x24, 0x4e, 0x4e, 0xdf, 0x03, 0xd1, 0xc8, 0x7f, 0x99, 0x20,
+	0x37, 0xef, 0xdb, 0xff, 0x73, 0xe8, 0x9f, 0x2a, 0x30, 0xdb, 0x0f, 0x16, 0x11, 0xfb, 0x0f, 0xe1,
+	0x78, 0x7b, 0xec, 0x9b, 0x33, 0xc8, 0x58, 0xf6, 0x62, 0xcf, 0xe0, 0xfb, 0xbb, 0xf2, 0xe8, 0x1f,
+	0x23, 0x51, 0x5f, 0xfb, 0x17, 0xfe, 0x4f, 0x61, 0x22, 0xce, 0xe7, 0x40, 0xe1, 0x6f, 0x2b, 0xec,
+	0xe1, 0xae, 0x85, 0xdd, 0x11, 0xde, 0xcb, 0xa0, 0x76, 0xcc, 0x70, 0xf9, 0xc6, 0x6a, 0x95, 0xad,
+	0xb8, 0xb9, 0xf5, 0xa2, 0x0c, 0xeb, 0x38, 0x1c, 0x30, 0xeb, 0xa2, 0x7f, 0x1b, 0xfe, 0x4f, 0xf5,
+	0x16, 0x9c, 0xeb, 0x6a, 0x27, 0x42, 0x70, 0xae, 0x65, 0xe0, 0x72, 0x6c, 0xca, 0xc4, 0x00, 0x18,
+	0x8e, 0x55, 0x77, 0x6c, 0xca, 0xd4, 0x65, 0xd1, 0xf3, 0x73, 0x8e, 0x93, 0x5b, 0x2f, 0xf2, 0x6d,
+	0x82, 0xaf, 0xd2, 0x7d, 0x1a, 0x46, 0xa5, 0x81, 0x3c, 0xb8, 0xe4, 0xb3, 0xba, 0x2c, 0xfa, 0x5f,
+	0x8c, 0xb1, 0xc0, 0x30, 0x05, 0xa3, 0xfe, 0x10, 0xd2, 0xe2, 0x7e, 0xc4, 0xac, 0x53, 0xdf, 0x73,
+	0xf6, 0xc9, 0x38, 0x1c, 0xe2, 0xd6, 0xe8, 0x5b, 0x05, 0x8e, 0xb5, 0x9d, 0xa0, 0xbc, 0xd1, 0x5d,
+	0x88, 0x4d, 0x92, 0xce, 0x71, 0x3d, 0x7d, 0xb6, 0x6b, 0x36, 0xf9, 0xab, 0xd4, 0x2b, 0x9f, 0xff,
+	0xf1, 0xcf, 0xa3, 0xe1, 0x25, 0x94, 0xd5, 0xe3, 0x2e, 0x18, 0xa1, 0x4a, 0x7e, 0x83, 0xd6, 0xb7,
+	0xda, 0xa6, 0xd4, 0x6d, 0xf4, 0xbd, 0x44, 0xd7, 0x2a, 0x37, 0x9a, 0x8f, 0x75, 0x9a, 0x34, 0xf7,
+	0xa7, 0xb5, 0x7e, 0x97, 0x07, 0xba, 0xa9, 0xb3, 0x1c, 0xf0, 0x4b, 0x48, 0x8d, 0x05, 0xec, 0x8f,
+	0x14, 0x24, 0x84, 0xf2, 0x5b, 0x74, 0x0c, 0x11, 0x47, 0xd9, 0x0d, 0xe2, 0x89, 0xaa, 0x44, 0xaf,
+	0x26, 0xbb, 0x8f, 0x6f, 0xff, 0xe9, 0x85, 0x01, 0x2c, 0x04, 0xe6, 0x5b, 0x1c, 0x73, 0x01, 0xe5,
+	0xbb, 0x8b, 0x2c, 0x3b, 0x41, 0xab, 0xd0, 0xa2, 0xc8, 0xb6, 0xf5, 0x2d, 0x7e, 0x68, 0x6d, 0xa3,
+	0x1d, 0x45, 0xd4, 0x46, 0x4c, 0x53, 0x6d, 0xe1, 0xb5, 0xd4, 0x1f, 0xca, 0xf6, 0x96, 0x9f, 0xbe,
+	0x34, 0xa0, 0x95, 0xe0, 0x77, 0x9b, 0xf3, 0xbb, 0x8e, 0xae, 0xf5, 0xc1, 0xcf, 0x67, 0xd3, 0x95,
+	0xe0, 0x5f, 0x0a, 0x9c, 0xed, 0xd9, 0x49, 0xd1, 0xd5, 0xbe, 0xd2, 0x26, 0x69, 0x18, 0x48, 0xbf,
+	0xf9, 0xac, 0xe6, 0x82, 0xf1, 0x32, 0x67, 0x7c, 0x09, 0x2d, 0xf6, 0xcc, 0xc2, 0x66, 0x7f, 0x0f,
+	0x19, 0xfe, 0xa8, 0xc0, 0x89, 0xd8, 0x6b, 0x11, 0xea, 0x23, 0xb7, 0x22, 0x97, 0x99, 0x74, 0x76,
+	0x10, 0x13, 0x81, 0x3e, 0xcb, 0xd1, 0xcf, 0xa1, 0xd9, 0x58, 0xf4, 0xf1, 0xd0, 0x1e, 0x29, 0x30,
+	0x1e, 0xbd, 0x50, 0xa1, 0xb9, 0x2e, 0x32, 0x76, 0xdc, 0xbb, 0xd2, 0x6a, 0xec, 0xea, 0x02, 0xb6,
+	0xf8, 0xaa, 0x1b, 0x36, 0x76, 0xca, 0xea, 0x3c, 0x87, 0x76, 0x01, 0xbd, 0x9c, 0x0c, 0xad, 0x15,
+	0xc0, 0xcf, 0x0a, 0xbc, 0x10, 0x7f, 0xd1, 0x40, 0x7d, 0x08, 0x13, 0xbd, 0xc6, 0xa5, 0x17, 0x07,
+	0xb2, 0x11, 0x6a, 0x2e, 0x72, 0xc8, 0xf3, 0xe8, 0x95, 0xde, 0x6a, 0x36, 0xd1, 0xed, 0x29, 0x9d,
+	0x2d, 0xae, 0x73, 0x68, 0x40, 0xfd, 0xe7, 0x69, 0xec, 0xe4, 0x93, 0x7e, 0xeb, 0x99, 0xed, 0x05,
+	0xb9, 0x37, 0x38, 0xb9, 0xcb, 0x68, 0xa9, 0xcf, 0x44, 0xe7, 0xc3, 0x4c, 0x98, 0xe9, 0x8f, 0x95,
+	0x66, 0x13, 0x0d, 0x8f, 0xf2, 0xf7, 0x6d, 0xb6, 0x29, 0x5b, 0x32, 0x7a, 0xad, 0xbf, 0xe3, 0xbf,
+	0xa3, 0xf9, 0xa7, 0x5f, 0x1f, 0xdc, 0x50, 0x50, 0x5a, 0xe2, 0x94, 0x34, 0x34, 0x97, 0x70, 0x5a,
+	0x31, 0xbd, 0x6d, 0x38, 0xd0, 0xb7, 0xcc, 0x3a, 0xdd, 0x46, 0xbf, 0xc8, 0x4c, 0xeb, 0x68, 0xe9,
+	0xdd, 0x32, 0x2d, 0x69, 0x78, 0xe8, 0x96, 0x69, 0x89, 0x33, 0x43, 0x1f, 0xc8, 0xe5, 0x48, 0xd1,
+	0x3c, 0x61, 0xb7, 0xf3, 0x77, 0x1e, 0xef, 0x66, 0x94, 0xa7, 0xbb, 0x19, 0xe5, 0xef, 0xdd, 0x8c,
+	0xf2, 0xf5, 0x5e, 0x66, 0xe8, 0xe9, 0x5e, 0x66, 0xe8, 0xcf, 0xbd, 0xcc, 0xd0, 0x47, 0xd9, 0x8a,
+	0xcd, 0x36, 0x6b, 0x1b, 0x9a, 0x45, 0xee, 0xeb, 0xd7, 0x83, 0x1d, 0xdf, 0xc1, 0xec, 0x13, 0xe2,
+	0xdd, 0x0b, 0x1d, 0x3c, 0x6c, 0xba, 0x60, 0x8d, 0x2a, 0xa6, 0x1b, 0xcf, 0xf1, 0xff, 0x07, 0x17,
+	0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x74, 0x13, 0xe9, 0x0e, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1482,7 +1482,7 @@ type QueryClient interface {
 	// for a specific chain ID
 	QueryAllOperatorConsAddrsByChainID(ctx context.Context, in *QueryAllOperatorConsAddrsByChainIDRequest, opts ...grpc.CallOption) (*QueryAllOperatorConsAddrsByChainIDResponse, error)
 	// QueryAllOperatorsWithOptInAVS queries  operator list by avs.
-	QueryAllOperatorsWithOptInAVS(ctx context.Context, in *QueryAllOperatorsWithOptInAVSRequest, opts ...grpc.CallOption) (*QueryAllOperatorsWithOptInAVSResponse, error)
+	QueryAllOperatorsWithOptInAVS(ctx context.Context, in *QueryAllOperatorsByOptInAVSRequest, opts ...grpc.CallOption) (*QueryAllOperatorsByOptInAVSResponse, error)
 	// QueryAllAVSsByOperator queries avs list.
 	QueryAllAVSsByOperator(ctx context.Context, in *QueryAllAVSsByOperatorRequest, opts ...grpc.CallOption) (*QueryAllAVSsByOperatorResponse, error)
 }
@@ -1576,8 +1576,8 @@ func (c *queryClient) QueryAllOperatorConsAddrsByChainID(ctx context.Context, in
 	return out, nil
 }
 
-func (c *queryClient) QueryAllOperatorsWithOptInAVS(ctx context.Context, in *QueryAllOperatorsWithOptInAVSRequest, opts ...grpc.CallOption) (*QueryAllOperatorsWithOptInAVSResponse, error) {
-	out := new(QueryAllOperatorsWithOptInAVSResponse)
+func (c *queryClient) QueryAllOperatorsWithOptInAVS(ctx context.Context, in *QueryAllOperatorsByOptInAVSRequest, opts ...grpc.CallOption) (*QueryAllOperatorsByOptInAVSResponse, error) {
+	out := new(QueryAllOperatorsByOptInAVSResponse)
 	err := c.cc.Invoke(ctx, "/exocore.operator.v1.Query/QueryAllOperatorsWithOptInAVS", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1617,7 +1617,7 @@ type QueryServer interface {
 	// for a specific chain ID
 	QueryAllOperatorConsAddrsByChainID(context.Context, *QueryAllOperatorConsAddrsByChainIDRequest) (*QueryAllOperatorConsAddrsByChainIDResponse, error)
 	// QueryAllOperatorsWithOptInAVS queries  operator list by avs.
-	QueryAllOperatorsWithOptInAVS(context.Context, *QueryAllOperatorsWithOptInAVSRequest) (*QueryAllOperatorsWithOptInAVSResponse, error)
+	QueryAllOperatorsWithOptInAVS(context.Context, *QueryAllOperatorsByOptInAVSRequest) (*QueryAllOperatorsByOptInAVSResponse, error)
 	// QueryAllAVSsByOperator queries avs list.
 	QueryAllAVSsByOperator(context.Context, *QueryAllAVSsByOperatorRequest) (*QueryAllAVSsByOperatorResponse, error)
 }
@@ -1653,7 +1653,7 @@ func (*UnimplementedQueryServer) QueryOperatorSlashInfo(ctx context.Context, req
 func (*UnimplementedQueryServer) QueryAllOperatorConsAddrsByChainID(ctx context.Context, req *QueryAllOperatorConsAddrsByChainIDRequest) (*QueryAllOperatorConsAddrsByChainIDResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryAllOperatorConsAddrsByChainID not implemented")
 }
-func (*UnimplementedQueryServer) QueryAllOperatorsWithOptInAVS(ctx context.Context, req *QueryAllOperatorsWithOptInAVSRequest) (*QueryAllOperatorsWithOptInAVSResponse, error) {
+func (*UnimplementedQueryServer) QueryAllOperatorsWithOptInAVS(ctx context.Context, req *QueryAllOperatorsByOptInAVSRequest) (*QueryAllOperatorsByOptInAVSResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryAllOperatorsWithOptInAVS not implemented")
 }
 func (*UnimplementedQueryServer) QueryAllAVSsByOperator(ctx context.Context, req *QueryAllAVSsByOperatorRequest) (*QueryAllAVSsByOperatorResponse, error) {
@@ -1827,7 +1827,7 @@ func _Query_QueryAllOperatorConsAddrsByChainID_Handler(srv interface{}, ctx cont
 }
 
 func _Query_QueryAllOperatorsWithOptInAVS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(QueryAllOperatorsWithOptInAVSRequest)
+	in := new(QueryAllOperatorsByOptInAVSRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1839,7 +1839,7 @@ func _Query_QueryAllOperatorsWithOptInAVS_Handler(srv interface{}, ctx context.C
 		FullMethod: "/exocore.operator.v1.Query/QueryAllOperatorsWithOptInAVS",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(QueryServer).QueryAllOperatorsWithOptInAVS(ctx, req.(*QueryAllOperatorsWithOptInAVSRequest))
+		return srv.(QueryServer).QueryAllOperatorsWithOptInAVS(ctx, req.(*QueryAllOperatorsByOptInAVSRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -2737,7 +2737,7 @@ func (m *OperatorConsAddrPair) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) Marshal() (dAtA []byte, err error) {
+func (m *QueryAllOperatorsByOptInAVSRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2747,12 +2747,12 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) Marshal() (dAtA []byte, err error
 	return dAtA[:n], nil
 }
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryAllOperatorsByOptInAVSRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryAllOperatorsByOptInAVSRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -2767,7 +2767,7 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) MarshalToSizedBuffer(dAtA []byte)
 	return len(dAtA) - i, nil
 }
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) Marshal() (dAtA []byte, err error) {
+func (m *QueryAllOperatorsByOptInAVSResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2777,12 +2777,12 @@ func (m *QueryAllOperatorsWithOptInAVSResponse) Marshal() (dAtA []byte, err erro
 	return dAtA[:n], nil
 }
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryAllOperatorsByOptInAVSResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryAllOperatorsByOptInAVSResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -3202,7 +3202,7 @@ func (m *OperatorConsAddrPair) Size() (n int) {
 	return n
 }
 
-func (m *QueryAllOperatorsWithOptInAVSRequest) Size() (n int) {
+func (m *QueryAllOperatorsByOptInAVSRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -3215,7 +3215,7 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) Size() (n int) {
 	return n
 }
 
-func (m *QueryAllOperatorsWithOptInAVSResponse) Size() (n int) {
+func (m *QueryAllOperatorsByOptInAVSResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -5459,7 +5459,7 @@ func (m *OperatorConsAddrPair) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryAllOperatorsWithOptInAVSRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryAllOperatorsByOptInAVSRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -5482,10 +5482,10 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryAllOperatorsWithOptInAVSRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryAllOperatorsByOptInAVSRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryAllOperatorsWithOptInAVSRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryAllOperatorsByOptInAVSRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -5541,7 +5541,7 @@ func (m *QueryAllOperatorsWithOptInAVSRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *QueryAllOperatorsWithOptInAVSResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryAllOperatorsByOptInAVSResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -5564,10 +5564,10 @@ func (m *QueryAllOperatorsWithOptInAVSResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: QueryAllOperatorsWithOptInAVSResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: QueryAllOperatorsByOptInAVSResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QueryAllOperatorsWithOptInAVSResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: QueryAllOperatorsByOptInAVSResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
diff --git a/x/operator/types/query.pb.gw.go b/x/operator/types/query.pb.gw.go
index 8a7a6ca14..25774bec1 100644
--- a/x/operator/types/query.pb.gw.go
+++ b/x/operator/types/query.pb.gw.go
@@ -528,7 +528,7 @@ func local_request_Query_QueryAllOperatorConsAddrsByChainID_0(ctx context.Contex
 }
 
 func request_Query_QueryAllOperatorsWithOptInAVS_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryAllOperatorsWithOptInAVSRequest
+	var protoReq QueryAllOperatorsByOptInAVSRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -555,7 +555,7 @@ func request_Query_QueryAllOperatorsWithOptInAVS_0(ctx context.Context, marshale
 }
 
 func local_request_Query_QueryAllOperatorsWithOptInAVS_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryAllOperatorsWithOptInAVSRequest
+	var protoReq QueryAllOperatorsByOptInAVSRequest
 	var metadata runtime.ServerMetadata
 
 	var (