diff --git a/proto/invitations/invitations.proto b/proto/invitations/invitations.proto
index c7be5b0145ceb7dbae9982fcb17335403ba4c665..036626d161fd5dd2e66cce4afe2424f141c7598f 100644
--- a/proto/invitations/invitations.proto
+++ b/proto/invitations/invitations.proto
@@ -30,8 +30,10 @@ message Filter {
 
 message FindOptions {
   repeated string sort = 1;
-  int32 page_num = 2;
-  int32 page_size = 3;
+  int32 page_num = 2; // Deprecated
+  int32 page_size = 3; // Deprecated
+  int32 offset = 4;
+  int32 limit = 5;
 }
 
 message CreateRequest {
@@ -69,7 +71,7 @@ message AcceptInvitationResponse {}
 
 message FindRequest {
   Filter filter = 1;
-  FindOptions opts = 2;
+  FindOptions options = 2;
 }
 
 message FindResponse {
diff --git a/proto/organizations/organizations.proto b/proto/organizations/organizations.proto
index a8b039983db55915698248e141f402ba8dac53e3..ea36f213c3569637445f3597daba29ce34f27937 100644
--- a/proto/organizations/organizations.proto
+++ b/proto/organizations/organizations.proto
@@ -49,7 +49,7 @@ message Filter {
 
 message FindRequest {
   Filter filter = 1;
-  common.FindOptions opts = 2;
+  common.FindOptions options = 2;
 }
 
 message FindResponse {