API harmonization codegen

9 files changed, 1136 insertions, 1053 deletions

diff --git a/rust/fatcat-api-spec/README.md b/rust/fatcat-api-spec/README.md
index ee09a73e..06d32720 100644
--- a/rust/fatcat-api-spec/README.md
+++ b/rust/fatcat-api-spec/README.md
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
 - API version: 0.1.0
-- Build date: 2018-12-24T21:43:06.957Z
+- Build date: 2018-12-24T23:35:32.113Z
 
 This autogenerated project defines an API crate `fatcat` which contains:
 * An `Api` trait defining the API in Rust.
diff --git a/rust/fatcat-api-spec/api.yaml b/rust/fatcat-api-spec/api.yaml
index 965cbfbc..b514da49 100644
--- a/rust/fatcat-api-spec/api.yaml
+++ b/rust/fatcat-api-spec/api.yaml
@@ -165,7 +165,7 @@ definitions:
       mimetype:
         type: string
         example: "application/pdf"
-      releases:
+      release_ids:
         type: array
         items:
           type: string
@@ -312,7 +312,7 @@ definitions:
     required:
       - username
     properties:
-      id:
+      editor_id:
         type: string
         example: "q3nouwy3nnbsvo3h5klxsx4a7y"
       username:
@@ -323,7 +323,7 @@ definitions:
     required:
       - editor_id
     properties:
-      id:
+      editgroup_id:
         <<: *FATCATIDENT
       editor_id:
         <<: *FATCATIDENT
@@ -449,7 +449,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/container_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -470,7 +470,7 @@ paths:
           type: boolean
           required: false
           description: "If true, and editor is authorized, batch is accepted all at once"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           type: string
           required: false
@@ -490,9 +490,9 @@ paths:
             items:
               $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /container/{id}:
+  /container/{ident}:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -527,7 +527,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/container_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -542,7 +542,7 @@ paths:
       tags: # TAGLINE
         - containers # TAGLINE
       parameters:
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -552,9 +552,9 @@ paths:
           schema:
             $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /container/rev/{id}:
+  /container/rev/{rev_id}:
     parameters:
-      - name: id
+      - name: rev_id
         in: path
         type: string
         #format: uuid
@@ -580,9 +580,9 @@ paths:
           schema:
             $ref: "#/definitions/container_entity"
         <<: *ENTITYRESPONSES
-  /container/{id}/history:
+  /container/{ident}/history:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -603,9 +603,9 @@ paths:
             items:
               $ref: "#/definitions/entity_history_entry"
         <<: *ENTITYRESPONSES
-  /container/{id}/redirects:
+  /container/{ident}/redirects:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -695,7 +695,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/creator_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -716,7 +716,7 @@ paths:
           type: boolean
           required: false
           description: "If true, and editor is authorized, batch is accepted all at once"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           type: string
           required: false
@@ -736,9 +736,9 @@ paths:
             items:
               $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /creator/{id}:
+  /creator/{ident}:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -773,7 +773,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/creator_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -788,7 +788,7 @@ paths:
       tags: # TAGLINE
         - creators # TAGLINE
       parameters:
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -798,9 +798,9 @@ paths:
           schema:
             $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /creator/rev/{id}:
+  /creator/rev/{rev_id}:
     parameters:
-      - name: id
+      - name: rev_id
         in: path
         type: string
         #format: uuid
@@ -826,9 +826,9 @@ paths:
           schema:
             $ref: "#/definitions/creator_entity"
         <<: *ENTITYRESPONSES
-  /creator/{id}/history:
+  /creator/{ident}/history:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -849,9 +849,9 @@ paths:
             items:
               $ref: "#/definitions/entity_history_entry"
         <<: *ENTITYRESPONSES
-  /creator/{id}/releases:
+  /creator/{ident}/releases:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -872,9 +872,9 @@ paths:
             items:
               $ref: "#/definitions/release_entity"
         <<: *ENTITYRESPONSES
-  /creator/{id}/redirects:
+  /creator/{ident}/redirects:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -964,7 +964,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/file_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -985,7 +985,7 @@ paths:
           type: boolean
           required: false
           description: "If true, and editor is authorized, batch is accepted all at once"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           type: string
           required: false
@@ -1005,9 +1005,9 @@ paths:
             items:
               $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /file/{id}:
+  /file/{ident}:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1042,7 +1042,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/file_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1057,7 +1057,7 @@ paths:
       tags: # TAGLINE
         - files # TAGLINE
       parameters:
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1067,9 +1067,9 @@ paths:
           schema:
             $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /file/rev/{id}:
+  /file/rev/{rev_id}:
     parameters:
-      - name: id
+      - name: rev_id
         in: path
         type: string
         #format: uuid
@@ -1095,9 +1095,9 @@ paths:
           schema:
             $ref: "#/definitions/file_entity"
         <<: *ENTITYRESPONSES
-  /file/{id}/history:
+  /file/{ident}/history:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1118,9 +1118,9 @@ paths:
             items:
               $ref: "#/definitions/entity_history_entry"
         <<: *ENTITYRESPONSES
-  /file/{id}/redirects:
+  /file/{ident}/redirects:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1215,7 +1215,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/release_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1236,7 +1236,7 @@ paths:
           type: boolean
           required: false
           description: "If true, and editor is authorized, batch is accepted all at once"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           type: string
           required: false
@@ -1256,9 +1256,9 @@ paths:
             items:
               $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /release/{id}:
+  /release/{ident}:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1293,7 +1293,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/release_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1308,7 +1308,7 @@ paths:
       tags: # TAGLINE
         - releases # TAGLINE
       parameters:
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1318,9 +1318,9 @@ paths:
           schema:
             $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /release/rev/{id}:
+  /release/rev/{rev_id}:
     parameters:
-      - name: id
+      - name: rev_id
         in: path
         type: string
         #format: uuid
@@ -1346,9 +1346,9 @@ paths:
           schema:
             $ref: "#/definitions/release_entity"
         <<: *ENTITYRESPONSES
-  /release/{id}/history:
+  /release/{ident}/history:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1369,9 +1369,9 @@ paths:
             items:
               $ref: "#/definitions/entity_history_entry"
         <<: *ENTITYRESPONSES
-  /release/{id}/files:
+  /release/{ident}/files:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1392,9 +1392,9 @@ paths:
             items:
               $ref: "#/definitions/file_entity"
         <<: *ENTITYRESPONSES
-  /release/{id}/redirects:
+  /release/{ident}/redirects:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1501,7 +1501,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/work_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1522,7 +1522,7 @@ paths:
           type: boolean
           required: false
           description: "If true, and editor is authorized, batch is accepted all at once"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           type: string
           required: false
@@ -1542,9 +1542,9 @@ paths:
             items:
               $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /work/{id}:
+  /work/{ident}:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1579,7 +1579,7 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/work_entity"
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1594,7 +1594,7 @@ paths:
       tags: # TAGLINE
         - works # TAGLINE
       parameters:
-        - name: editgroup
+        - name: editgroup_id
           in: query
           required: false
           type: string
@@ -1604,9 +1604,9 @@ paths:
           schema:
             $ref: "#/definitions/entity_edit"
         <<: *ENTITYRESPONSES
-  /work/rev/{id}:
+  /work/rev/{rev_id}:
     parameters:
-      - name: id
+      - name: rev_id
         in: path
         type: string
         #format: uuid
@@ -1632,9 +1632,9 @@ paths:
           schema:
             $ref: "#/definitions/work_entity"
         <<: *ENTITYRESPONSES
-  /work/{id}/history:
+  /work/{ident}/history:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1655,9 +1655,9 @@ paths:
             items:
               $ref: "#/definitions/entity_history_entry"
         <<: *ENTITYRESPONSES
-  /work/{id}/redirects:
+  /work/{ident}/redirects:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1674,9 +1674,9 @@ paths:
               type: string
               #format: ident
         <<: *ENTITYRESPONSES
-  /work/{id}/releases:
+  /work/{ident}/releases:
     parameters:
-      - name: id
+      - name: ident
         in: path
         type: string
         required: true
@@ -1730,9 +1730,9 @@ paths:
           schema:
             $ref: "#/definitions/success"
         <<: *ENTITYRESPONSES
-  /editor/{id}:
+  /editor/{editor_id}:
     parameters:
-      - name: id
+      - name: editor_id
         in: path
         type: string
         required: true
@@ -1755,9 +1755,9 @@ paths:
           description: Generic Error
           schema:
             $ref: "#/definitions/error_response"
-  /editor/{id}/changelog:
+  /editor/{editor_id}/changelog:
     parameters:
-      - name: id
+      - name: editor_id
         in: path
         type: string
         required: true
@@ -1806,9 +1806,9 @@ paths:
           description: Generic Error
           schema:
             $ref: "#/definitions/error_response"
-  /editgroup/{id}:
+  /editgroup/{editgroup_id}:
     parameters:
-      - name: id
+      - name: editgroup_id
         in: path
         required: true
         <<: *FATCATIDENT
@@ -1833,9 +1833,9 @@ paths:
           description: Generic Error
           schema:
             $ref: "#/definitions/error_response"
-  /editgroup/{id}/accept:
+  /editgroup/{editgroup_id}/accept:
     parameters:
-      - name: id
+      - name: editgroup_id
         in: path
         required: true
         <<: *FATCATIDENT
@@ -1886,9 +1886,9 @@ paths:
           description: Generic Error
           schema:
             $ref: "#/definitions/error_response"
-  /changelog/{id}:
+  /changelog/{index}:
     parameters:
-      - name: id
+      - name: index
         in: path
         type: integer
         format: int64
diff --git a/rust/fatcat-api-spec/api/swagger.yaml b/rust/fatcat-api-spec/api/swagger.yaml
index 0446dc8d..610c8193 100644
--- a/rust/fatcat-api-spec/api/swagger.yaml
+++ b/rust/fatcat-api-spec/api/swagger.yaml
@@ -39,12 +39,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "CREATE_CONTAINER"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         201:
           description: "Created Entity"
@@ -102,14 +102,14 @@ paths:
         type: "boolean"
         formatString: "{:?}"
         example: "Some(true)"
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         description: "Editgroup to auto-accept and apply to all entities (required\
           \ if 'autoaccept' is True)"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       - in: "body"
         name: "entity_list"
         required: true
@@ -166,18 +166,18 @@ paths:
       path: "/container/batch"
       HttpMethod: "Post"
       httpmethod: "post"
-  /container/{id}:
+  /container/{ident}:
     get:
       tags:
       - "containers"
       operationId: "get_container"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For containers,\
@@ -233,7 +233,7 @@ paths:
           producesJson: true
       operation_id: "get_container"
       uppercase_operation_id: "GET_CONTAINER"
-      path: "/container/:id"
+      path: "/container/:ident"
       HttpMethod: "Get"
       httpmethod: "get"
     put:
@@ -241,12 +241,12 @@ paths:
       - "containers"
       operationId: "update_container"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - in: "body"
         name: "entity"
         required: true
@@ -259,12 +259,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "UPDATE_CONTAINER"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Updated Entity"
@@ -304,7 +304,7 @@ paths:
           producesJson: true
       operation_id: "update_container"
       uppercase_operation_id: "UPDATE_CONTAINER"
-      path: "/container/:id"
+      path: "/container/:ident"
       HttpMethod: "Put"
       httpmethod: "put"
       noClientExample: true
@@ -313,18 +313,18 @@ paths:
       - "containers"
       operationId: "delete_container"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
-      - name: "editgroup"
+        example: "\"ident_example\".to_string()"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Deleted Entity"
@@ -364,21 +364,21 @@ paths:
           producesJson: true
       operation_id: "delete_container"
       uppercase_operation_id: "DELETE_CONTAINER"
-      path: "/container/:id"
+      path: "/container/:ident"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /container/rev/{id}:
+  /container/rev/{rev_id}:
     get:
       tags:
       - "containers"
       operationId: "get_container_revision"
       parameters:
-      - name: "id"
+      - name: "rev_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"rev_id_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For containers,\
@@ -434,21 +434,21 @@ paths:
           producesJson: true
       operation_id: "get_container_revision"
       uppercase_operation_id: "GET_CONTAINER_REVISION"
-      path: "/container/rev/:id"
+      path: "/container/rev/:rev_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /container/{id}/history:
+  /container/{ident}/history:
     get:
       tags:
       - "containers"
       operationId: "get_container_history"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "limit"
         in: "query"
         required: false
@@ -497,21 +497,21 @@ paths:
           producesJson: true
       operation_id: "get_container_history"
       uppercase_operation_id: "GET_CONTAINER_HISTORY"
-      path: "/container/:id/history"
+      path: "/container/:ident/history"
       HttpMethod: "Get"
       httpmethod: "get"
-  /container/{id}/redirects:
+  /container/{ident}/redirects:
     get:
       tags:
       - "containers"
       operationId: "get_container_redirects"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       responses:
         200:
           description: "Found Entity Redirects"
@@ -553,7 +553,7 @@ paths:
           producesJson: true
       operation_id: "get_container_redirects"
       uppercase_operation_id: "GET_CONTAINER_REDIRECTS"
-      path: "/container/:id/redirects"
+      path: "/container/:ident/redirects"
       HttpMethod: "Get"
       httpmethod: "get"
   /container/lookup:
@@ -760,12 +760,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "CREATE_CREATOR"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         201:
           description: "Created Entity"
@@ -823,14 +823,14 @@ paths:
         type: "boolean"
         formatString: "{:?}"
         example: "Some(true)"
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         description: "Editgroup to auto-accept and apply to all entities (required\
           \ if 'autoaccept' is True)"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       - in: "body"
         name: "entity_list"
         required: true
@@ -887,18 +887,18 @@ paths:
       path: "/creator/batch"
       HttpMethod: "Post"
       httpmethod: "post"
-  /creator/{id}:
+  /creator/{ident}:
     get:
       tags:
       - "creators"
       operationId: "get_creator"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For creators, none\
@@ -954,7 +954,7 @@ paths:
           producesJson: true
       operation_id: "get_creator"
       uppercase_operation_id: "GET_CREATOR"
-      path: "/creator/:id"
+      path: "/creator/:ident"
       HttpMethod: "Get"
       httpmethod: "get"
     put:
@@ -962,12 +962,12 @@ paths:
       - "creators"
       operationId: "update_creator"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - in: "body"
         name: "entity"
         required: true
@@ -980,12 +980,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "UPDATE_CREATOR"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Updated Entity"
@@ -1025,7 +1025,7 @@ paths:
           producesJson: true
       operation_id: "update_creator"
       uppercase_operation_id: "UPDATE_CREATOR"
-      path: "/creator/:id"
+      path: "/creator/:ident"
       HttpMethod: "Put"
       httpmethod: "put"
       noClientExample: true
@@ -1034,18 +1034,18 @@ paths:
       - "creators"
       operationId: "delete_creator"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
-      - name: "editgroup"
+        example: "\"ident_example\".to_string()"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Deleted Entity"
@@ -1085,21 +1085,21 @@ paths:
           producesJson: true
       operation_id: "delete_creator"
       uppercase_operation_id: "DELETE_CREATOR"
-      path: "/creator/:id"
+      path: "/creator/:ident"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /creator/rev/{id}:
+  /creator/rev/{rev_id}:
     get:
       tags:
       - "creators"
       operationId: "get_creator_revision"
       parameters:
-      - name: "id"
+      - name: "rev_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"rev_id_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For creators, none\
@@ -1155,21 +1155,21 @@ paths:
           producesJson: true
       operation_id: "get_creator_revision"
       uppercase_operation_id: "GET_CREATOR_REVISION"
-      path: "/creator/rev/:id"
+      path: "/creator/rev/:rev_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /creator/{id}/history:
+  /creator/{ident}/history:
     get:
       tags:
       - "creators"
       operationId: "get_creator_history"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "limit"
         in: "query"
         required: false
@@ -1218,21 +1218,21 @@ paths:
           producesJson: true
       operation_id: "get_creator_history"
       uppercase_operation_id: "GET_CREATOR_HISTORY"
-      path: "/creator/:id/history"
+      path: "/creator/:ident/history"
       HttpMethod: "Get"
       httpmethod: "get"
-  /creator/{id}/releases:
+  /creator/{ident}/releases:
     get:
       tags:
       - "creators"
       operationId: "get_creator_releases"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "hide"
         in: "query"
         description: "List of entity fields to elide in response. For releases, 'abstracts',\
@@ -1282,21 +1282,21 @@ paths:
           producesJson: true
       operation_id: "get_creator_releases"
       uppercase_operation_id: "GET_CREATOR_RELEASES"
-      path: "/creator/:id/releases"
+      path: "/creator/:ident/releases"
       HttpMethod: "Get"
       httpmethod: "get"
-  /creator/{id}/redirects:
+  /creator/{ident}/redirects:
     get:
       tags:
       - "creators"
       operationId: "get_creator_redirects"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       responses:
         200:
           description: "Found Entity Redirects"
@@ -1338,7 +1338,7 @@ paths:
           producesJson: true
       operation_id: "get_creator_redirects"
       uppercase_operation_id: "GET_CREATOR_REDIRECTS"
-      path: "/creator/:id/redirects"
+      path: "/creator/:ident/redirects"
       HttpMethod: "Get"
       httpmethod: "get"
   /creator/lookup:
@@ -1545,12 +1545,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "CREATE_FILE"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         201:
           description: "Created Entity"
@@ -1608,14 +1608,14 @@ paths:
         type: "boolean"
         formatString: "{:?}"
         example: "Some(true)"
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         description: "Editgroup to auto-accept and apply to all entities (required\
           \ if 'autoaccept' is True)"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       - in: "body"
         name: "entity_list"
         required: true
@@ -1672,18 +1672,18 @@ paths:
       path: "/file/batch"
       HttpMethod: "Post"
       httpmethod: "post"
-  /file/{id}:
+  /file/{ident}:
     get:
       tags:
       - "files"
       operationId: "get_file"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For files, none\
@@ -1739,7 +1739,7 @@ paths:
           producesJson: true
       operation_id: "get_file"
       uppercase_operation_id: "GET_FILE"
-      path: "/file/:id"
+      path: "/file/:ident"
       HttpMethod: "Get"
       httpmethod: "get"
     put:
@@ -1747,12 +1747,12 @@ paths:
       - "files"
       operationId: "update_file"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - in: "body"
         name: "entity"
         required: true
@@ -1765,12 +1765,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "UPDATE_FILE"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Updated Entity"
@@ -1810,7 +1810,7 @@ paths:
           producesJson: true
       operation_id: "update_file"
       uppercase_operation_id: "UPDATE_FILE"
-      path: "/file/:id"
+      path: "/file/:ident"
       HttpMethod: "Put"
       httpmethod: "put"
       noClientExample: true
@@ -1819,18 +1819,18 @@ paths:
       - "files"
       operationId: "delete_file"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
-      - name: "editgroup"
+        example: "\"ident_example\".to_string()"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Deleted Entity"
@@ -1870,21 +1870,21 @@ paths:
           producesJson: true
       operation_id: "delete_file"
       uppercase_operation_id: "DELETE_FILE"
-      path: "/file/:id"
+      path: "/file/:ident"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /file/rev/{id}:
+  /file/rev/{rev_id}:
     get:
       tags:
       - "files"
       operationId: "get_file_revision"
       parameters:
-      - name: "id"
+      - name: "rev_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"rev_id_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For files, none\
@@ -1940,21 +1940,21 @@ paths:
           producesJson: true
       operation_id: "get_file_revision"
       uppercase_operation_id: "GET_FILE_REVISION"
-      path: "/file/rev/:id"
+      path: "/file/rev/:rev_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /file/{id}/history:
+  /file/{ident}/history:
     get:
       tags:
       - "files"
       operationId: "get_file_history"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "limit"
         in: "query"
         required: false
@@ -2003,21 +2003,21 @@ paths:
           producesJson: true
       operation_id: "get_file_history"
       uppercase_operation_id: "GET_FILE_HISTORY"
-      path: "/file/:id/history"
+      path: "/file/:ident/history"
       HttpMethod: "Get"
       httpmethod: "get"
-  /file/{id}/redirects:
+  /file/{ident}/redirects:
     get:
       tags:
       - "files"
       operationId: "get_file_redirects"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       responses:
         200:
           description: "Found Entity Redirects"
@@ -2059,7 +2059,7 @@ paths:
           producesJson: true
       operation_id: "get_file_redirects"
       uppercase_operation_id: "GET_FILE_REDIRECTS"
-      path: "/file/:id/redirects"
+      path: "/file/:ident/redirects"
       HttpMethod: "Get"
       httpmethod: "get"
   /file/lookup:
@@ -2270,12 +2270,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "CREATE_RELEASE"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         201:
           description: "Created Entity"
@@ -2333,14 +2333,14 @@ paths:
         type: "boolean"
         formatString: "{:?}"
         example: "Some(true)"
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         description: "Editgroup to auto-accept and apply to all entities (required\
           \ if 'autoaccept' is True)"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       - in: "body"
         name: "entity_list"
         required: true
@@ -2397,18 +2397,18 @@ paths:
       path: "/release/batch"
       HttpMethod: "Post"
       httpmethod: "post"
-  /release/{id}:
+  /release/{ident}:
     get:
       tags:
       - "releases"
       operationId: "get_release"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For releases, 'files',\
@@ -2464,7 +2464,7 @@ paths:
           producesJson: true
       operation_id: "get_release"
       uppercase_operation_id: "GET_RELEASE"
-      path: "/release/:id"
+      path: "/release/:ident"
       HttpMethod: "Get"
       httpmethod: "get"
     put:
@@ -2472,12 +2472,12 @@ paths:
       - "releases"
       operationId: "update_release"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - in: "body"
         name: "entity"
         required: true
@@ -2490,12 +2490,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "UPDATE_RELEASE"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Updated Entity"
@@ -2535,7 +2535,7 @@ paths:
           producesJson: true
       operation_id: "update_release"
       uppercase_operation_id: "UPDATE_RELEASE"
-      path: "/release/:id"
+      path: "/release/:ident"
       HttpMethod: "Put"
       httpmethod: "put"
       noClientExample: true
@@ -2544,18 +2544,18 @@ paths:
       - "releases"
       operationId: "delete_release"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
-      - name: "editgroup"
+        example: "\"ident_example\".to_string()"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Deleted Entity"
@@ -2595,21 +2595,21 @@ paths:
           producesJson: true
       operation_id: "delete_release"
       uppercase_operation_id: "DELETE_RELEASE"
-      path: "/release/:id"
+      path: "/release/:ident"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /release/rev/{id}:
+  /release/rev/{rev_id}:
     get:
       tags:
       - "releases"
       operationId: "get_release_revision"
       parameters:
-      - name: "id"
+      - name: "rev_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"rev_id_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For releases, none\
@@ -2665,21 +2665,21 @@ paths:
           producesJson: true
       operation_id: "get_release_revision"
       uppercase_operation_id: "GET_RELEASE_REVISION"
-      path: "/release/rev/:id"
+      path: "/release/rev/:rev_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /release/{id}/history:
+  /release/{ident}/history:
     get:
       tags:
       - "releases"
       operationId: "get_release_history"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "limit"
         in: "query"
         required: false
@@ -2728,21 +2728,21 @@ paths:
           producesJson: true
       operation_id: "get_release_history"
       uppercase_operation_id: "GET_RELEASE_HISTORY"
-      path: "/release/:id/history"
+      path: "/release/:ident/history"
       HttpMethod: "Get"
       httpmethod: "get"
-  /release/{id}/files:
+  /release/{ident}/files:
     get:
       tags:
       - "releases"
       operationId: "get_release_files"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "hide"
         in: "query"
         description: "List of entity fields to elide in response. For files, none\
@@ -2792,21 +2792,21 @@ paths:
           producesJson: true
       operation_id: "get_release_files"
       uppercase_operation_id: "GET_RELEASE_FILES"
-      path: "/release/:id/files"
+      path: "/release/:ident/files"
       HttpMethod: "Get"
       httpmethod: "get"
-  /release/{id}/redirects:
+  /release/{ident}/redirects:
     get:
       tags:
       - "releases"
       operationId: "get_release_redirects"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       responses:
         200:
           description: "Found Entity Redirects"
@@ -2848,7 +2848,7 @@ paths:
           producesJson: true
       operation_id: "get_release_redirects"
       uppercase_operation_id: "GET_RELEASE_REDIRECTS"
-      path: "/release/:id/redirects"
+      path: "/release/:ident/redirects"
       HttpMethod: "Get"
       httpmethod: "get"
   /release/lookup:
@@ -3077,12 +3077,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "CREATE_WORK"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         201:
           description: "Created Entity"
@@ -3140,14 +3140,14 @@ paths:
         type: "boolean"
         formatString: "{:?}"
         example: "Some(true)"
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         description: "Editgroup to auto-accept and apply to all entities (required\
           \ if 'autoaccept' is True)"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       - in: "body"
         name: "entity_list"
         required: true
@@ -3204,18 +3204,18 @@ paths:
       path: "/work/batch"
       HttpMethod: "Post"
       httpmethod: "post"
-  /work/{id}:
+  /work/{ident}:
     get:
       tags:
       - "works"
       operationId: "get_work"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For works, none\
@@ -3271,7 +3271,7 @@ paths:
           producesJson: true
       operation_id: "get_work"
       uppercase_operation_id: "GET_WORK"
-      path: "/work/:id"
+      path: "/work/:ident"
       HttpMethod: "Get"
       httpmethod: "get"
     put:
@@ -3279,12 +3279,12 @@ paths:
       - "works"
       operationId: "update_work"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - in: "body"
         name: "entity"
         required: true
@@ -3297,12 +3297,12 @@ paths:
         model_key: "editgroup_edits"
         uppercase_operation_id: "UPDATE_WORK"
         consumesJson: true
-      - name: "editgroup"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Updated Entity"
@@ -3342,7 +3342,7 @@ paths:
           producesJson: true
       operation_id: "update_work"
       uppercase_operation_id: "UPDATE_WORK"
-      path: "/work/:id"
+      path: "/work/:ident"
       HttpMethod: "Put"
       httpmethod: "put"
       noClientExample: true
@@ -3351,18 +3351,18 @@ paths:
       - "works"
       operationId: "delete_work"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
-      - name: "editgroup"
+        example: "\"ident_example\".to_string()"
+      - name: "editgroup_id"
         in: "query"
         required: false
         type: "string"
         formatString: "{:?}"
-        example: "Some(\"editgroup_example\".to_string())"
+        example: "Some(\"editgroup_id_example\".to_string())"
       responses:
         200:
           description: "Deleted Entity"
@@ -3402,21 +3402,21 @@ paths:
           producesJson: true
       operation_id: "delete_work"
       uppercase_operation_id: "DELETE_WORK"
-      path: "/work/:id"
+      path: "/work/:ident"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /work/rev/{id}:
+  /work/rev/{rev_id}:
     get:
       tags:
       - "works"
       operationId: "get_work_revision"
       parameters:
-      - name: "id"
+      - name: "rev_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"rev_id_example\".to_string()"
       - name: "expand"
         in: "query"
         description: "List of sub-entities to expand in response. For works, none\
@@ -3472,21 +3472,21 @@ paths:
           producesJson: true
       operation_id: "get_work_revision"
       uppercase_operation_id: "GET_WORK_REVISION"
-      path: "/work/rev/:id"
+      path: "/work/rev/:rev_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /work/{id}/history:
+  /work/{ident}/history:
     get:
       tags:
       - "works"
       operationId: "get_work_history"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "limit"
         in: "query"
         required: false
@@ -3535,21 +3535,21 @@ paths:
           producesJson: true
       operation_id: "get_work_history"
       uppercase_operation_id: "GET_WORK_HISTORY"
-      path: "/work/:id/history"
+      path: "/work/:ident/history"
       HttpMethod: "Get"
       httpmethod: "get"
-  /work/{id}/redirects:
+  /work/{ident}/redirects:
     get:
       tags:
       - "works"
       operationId: "get_work_redirects"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       responses:
         200:
           description: "Found Entity Redirects"
@@ -3591,21 +3591,21 @@ paths:
           producesJson: true
       operation_id: "get_work_redirects"
       uppercase_operation_id: "GET_WORK_REDIRECTS"
-      path: "/work/:id/redirects"
+      path: "/work/:ident/redirects"
       HttpMethod: "Get"
       httpmethod: "get"
-  /work/{id}/releases:
+  /work/{ident}/releases:
     get:
       tags:
       - "works"
       operationId: "get_work_releases"
       parameters:
-      - name: "id"
+      - name: "ident"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"ident_example\".to_string()"
       - name: "hide"
         in: "query"
         description: "List of entity fields to elide in response. For releases, 'abstracts',\
@@ -3655,7 +3655,7 @@ paths:
           producesJson: true
       operation_id: "get_work_releases"
       uppercase_operation_id: "GET_WORK_RELEASES"
-      path: "/work/:id/releases"
+      path: "/work/:ident/releases"
       HttpMethod: "Get"
       httpmethod: "get"
   /work/edit/{edit_id}:
@@ -3767,16 +3767,16 @@ paths:
       path: "/work/edit/:edit_id"
       HttpMethod: "Delete"
       httpmethod: "delete"
-  /editor/{id}:
+  /editor/{editor_id}:
     get:
       operationId: "get_editor"
       parameters:
-      - name: "id"
+      - name: "editor_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"editor_id_example\".to_string()"
       responses:
         200:
           description: "Found"
@@ -3816,19 +3816,19 @@ paths:
           producesJson: true
       operation_id: "get_editor"
       uppercase_operation_id: "GET_EDITOR"
-      path: "/editor/:id"
+      path: "/editor/:editor_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /editor/{id}/changelog:
+  /editor/{editor_id}/changelog:
     get:
       operationId: "get_editor_changelog"
       parameters:
-      - name: "id"
+      - name: "editor_id"
         in: "path"
         required: true
         type: "string"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"editor_id_example\".to_string()"
       responses:
         200:
           description: "Found"
@@ -3870,7 +3870,7 @@ paths:
           producesJson: true
       operation_id: "get_editor_changelog"
       uppercase_operation_id: "GET_EDITOR_CHANGELOG"
-      path: "/editor/:id/changelog"
+      path: "/editor/:editor_id/changelog"
       HttpMethod: "Get"
       httpmethod: "get"
   /editgroup:
@@ -3925,13 +3925,13 @@ paths:
       HttpMethod: "Post"
       httpmethod: "post"
       noClientExample: true
-  /editgroup/{id}:
+  /editgroup/{editgroup_id}:
     get:
       tags:
       - "edit-lifecycle"
       operationId: "get_editgroup"
       parameters:
-      - name: "id"
+      - name: "editgroup_id"
         in: "path"
         description: "base32-encoded unique identifier"
         required: true
@@ -3940,7 +3940,7 @@ paths:
         minLength: 26
         pattern: "[a-zA-Z2-7]{26}"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"editgroup_id_example\".to_string()"
       responses:
         200:
           description: "Found"
@@ -3980,16 +3980,16 @@ paths:
           producesJson: true
       operation_id: "get_editgroup"
       uppercase_operation_id: "GET_EDITGROUP"
-      path: "/editgroup/:id"
+      path: "/editgroup/:editgroup_id"
       HttpMethod: "Get"
       httpmethod: "get"
-  /editgroup/{id}/accept:
+  /editgroup/{editgroup_id}/accept:
     post:
       tags:
       - "edit-lifecycle"
       operationId: "accept_editgroup"
       parameters:
-      - name: "id"
+      - name: "editgroup_id"
         in: "path"
         description: "base32-encoded unique identifier"
         required: true
@@ -3998,7 +3998,7 @@ paths:
         minLength: 26
         pattern: "[a-zA-Z2-7]{26}"
         formatString: "\\\"{}\\\""
-        example: "\"id_example\".to_string()"
+        example: "\"editgroup_id_example\".to_string()"
       responses:
         200:
           description: "Merged Successfully"
@@ -4047,7 +4047,7 @@ paths:
           producesJson: true
       operation_id: "accept_editgroup"
       uppercase_operation_id: "ACCEPT_EDITGROUP"
-      path: "/editgroup/:id/accept"
+      path: "/editgroup/:editgroup_id/accept"
       HttpMethod: "Post"
       httpmethod: "post"
   /changelog:
@@ -4089,13 +4089,13 @@ paths:
       path: "/changelog"
       HttpMethod: "Get"
       httpmethod: "get"
-  /changelog/{id}:
+  /changelog/{index}:
     get:
       tags:
       - "edit-lifecycle"
       operationId: "get_changelog_entry"
       parameters:
-      - name: "id"
+      - name: "index"
         in: "path"
         required: true
         type: "integer"
@@ -4132,7 +4132,7 @@ paths:
           producesJson: true
       operation_id: "get_changelog_entry"
       uppercase_operation_id: "GET_CHANGELOG_ENTRY"
-      path: "/changelog/:id"
+      path: "/changelog/:index"
       HttpMethod: "Get"
       httpmethod: "get"
   /stats:
@@ -4325,7 +4325,7 @@ definitions:
   file_entity:
     type: "object"
     properties:
-      releases:
+      release_ids:
         type: "array"
         items:
           type: "string"
@@ -4385,9 +4385,6 @@ definitions:
       redirect: "q3nouwy3nnbsvo3h5klxsx4a7y"
       sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832"
       ident: "q3nouwy3nnbsvo3h5klxsx4a7y"
-      releases:
-      - "releases"
-      - "releases"
       revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
       sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8"
       urls:
@@ -4399,6 +4396,9 @@ definitions:
       extra: "{}"
       mimetype: "application/pdf"
       state: "wip"
+      release_ids:
+      - "release_ids"
+      - "release_ids"
       edit_extra: "{}"
       md5: "d41efcc592d1e40ac13905377399eb9b"
     upperCaseName: "FILE_ENTITY"
@@ -4604,9 +4604,6 @@ definitions:
       - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y"
         sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832"
         ident: "q3nouwy3nnbsvo3h5klxsx4a7y"
-        releases:
-        - "releases"
-        - "releases"
         revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
         sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8"
         urls:
@@ -4618,14 +4615,14 @@ definitions:
         extra: "{}"
         mimetype: "application/pdf"
         state: "wip"
+        release_ids:
+        - "release_ids"
+        - "release_ids"
         edit_extra: "{}"
         md5: "d41efcc592d1e40ac13905377399eb9b"
       - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y"
         sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832"
         ident: "q3nouwy3nnbsvo3h5klxsx4a7y"
-        releases:
-        - "releases"
-        - "releases"
         revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
         sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8"
         urls:
@@ -4637,6 +4634,9 @@ definitions:
         extra: "{}"
         mimetype: "application/pdf"
         state: "wip"
+        release_ids:
+        - "release_ids"
+        - "release_ids"
         edit_extra: "{}"
         md5: "d41efcc592d1e40ac13905377399eb9b"
       pmcid: "pmcid"
@@ -4778,9 +4778,9 @@ definitions:
             editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
             prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
             revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+        editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         description: "description"
         editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
-        id: "q3nouwy3nnbsvo3h5klxsx4a7y"
       edit:
         ident: "q3nouwy3nnbsvo3h5klxsx4a7y"
         edit_id: 847
@@ -4868,9 +4868,9 @@ definitions:
               editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
               prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
               revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+          editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           description: "description"
           editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
-          id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         index: 0
         editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         timestamp: "2000-01-23T04:56:07.000+00:00"
@@ -4917,14 +4917,14 @@ definitions:
     required:
     - "username"
     properties:
-      id:
+      editor_id:
         type: "string"
         example: "q3nouwy3nnbsvo3h5klxsx4a7y"
       username:
         type: "string"
         example: "zerocool93"
     example:
-      id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+      editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
       username: "zerocool93"
     upperCaseName: "EDITOR"
   editgroup:
@@ -4932,7 +4932,7 @@ definitions:
     required:
     - "editor_id"
     properties:
-      id:
+      editgroup_id:
         type: "string"
         example: "q3nouwy3nnbsvo3h5klxsx4a7y"
         description: "base32-encoded unique identifier"
@@ -5030,9 +5030,9 @@ definitions:
           editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
           revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+      editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
       description: "description"
       editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
-      id: "q3nouwy3nnbsvo3h5klxsx4a7y"
     upperCaseName: "EDITGROUP"
   changelog_entry:
     type: "object"
@@ -5131,9 +5131,9 @@ definitions:
             editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
             prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
             revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+        editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         description: "description"
         editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
-        id: "q3nouwy3nnbsvo3h5klxsx4a7y"
       index: 0
       editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
       timestamp: "2000-01-23T04:56:07.000+00:00"
diff --git a/rust/fatcat-api-spec/examples/client.rs b/rust/fatcat-api-spec/examples/client.rs
index 91ac7a4e..348666dc 100644
--- a/rust/fatcat-api-spec/examples/client.rs
+++ b/rust/fatcat-api-spec/examples/client.rs
@@ -115,16 +115,16 @@ fn main() {
     match matches.value_of("operation") {
         // Disabled because there's no example.
         // Some("CreateContainer") => {
-        //     let result = client.create_container(???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.create_container(???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("CreateContainerBatch") => {
-            let result = client.create_container_batch(&Vec::new(), Some(true), Some("editgroup_example".to_string())).wait();
+            let result = client.create_container_batch(&Vec::new(), Some(true), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteContainer") => {
-            let result = client.delete_container("id_example".to_string(), Some("editgroup_example".to_string())).wait();
+            let result = client.delete_container("ident_example".to_string(), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -135,7 +135,7 @@ fn main() {
 
         Some("GetContainer") => {
             let result = client
-                .get_container("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_container("ident_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -146,18 +146,18 @@ fn main() {
         }
 
         Some("GetContainerHistory") => {
-            let result = client.get_container_history("id_example".to_string(), Some(789)).wait();
+            let result = client.get_container_history("ident_example".to_string(), Some(789)).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetContainerRedirects") => {
-            let result = client.get_container_redirects("id_example".to_string()).wait();
+            let result = client.get_container_redirects("ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetContainerRevision") => {
             let result = client
-                .get_container_revision("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_container_revision("rev_id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -176,22 +176,22 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateContainer") => {
-        //     let result = client.update_container("id_example".to_string(), ???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.update_container("ident_example".to_string(), ???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateCreator") => {
-        //     let result = client.create_creator(???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.create_creator(???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("CreateCreatorBatch") => {
-            let result = client.create_creator_batch(&Vec::new(), Some(true), Some("editgroup_example".to_string())).wait();
+            let result = client.create_creator_batch(&Vec::new(), Some(true), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteCreator") => {
-            let result = client.delete_creator("id_example".to_string(), Some("editgroup_example".to_string())).wait();
+            let result = client.delete_creator("ident_example".to_string(), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -202,7 +202,7 @@ fn main() {
 
         Some("GetCreator") => {
             let result = client
-                .get_creator("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_creator("ident_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -213,23 +213,23 @@ fn main() {
         }
 
         Some("GetCreatorHistory") => {
-            let result = client.get_creator_history("id_example".to_string(), Some(789)).wait();
+            let result = client.get_creator_history("ident_example".to_string(), Some(789)).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetCreatorRedirects") => {
-            let result = client.get_creator_redirects("id_example".to_string()).wait();
+            let result = client.get_creator_redirects("ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetCreatorReleases") => {
-            let result = client.get_creator_releases("id_example".to_string(), Some("hide_example".to_string())).wait();
+            let result = client.get_creator_releases("ident_example".to_string(), Some("hide_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetCreatorRevision") => {
             let result = client
-                .get_creator_revision("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_creator_revision("rev_id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -248,16 +248,16 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateCreator") => {
-        //     let result = client.update_creator("id_example".to_string(), ???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.update_creator("ident_example".to_string(), ???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("GetEditor") => {
-            let result = client.get_editor("id_example".to_string()).wait();
+            let result = client.get_editor("editor_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetEditorChangelog") => {
-            let result = client.get_editor_changelog("id_example".to_string()).wait();
+            let result = client.get_editor_changelog("editor_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -267,7 +267,7 @@ fn main() {
         }
 
         Some("AcceptEditgroup") => {
-            let result = client.accept_editgroup("id_example".to_string()).wait();
+            let result = client.accept_editgroup("editgroup_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -287,22 +287,22 @@ fn main() {
         }
 
         Some("GetEditgroup") => {
-            let result = client.get_editgroup("id_example".to_string()).wait();
+            let result = client.get_editgroup("editgroup_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         // Disabled because there's no example.
         // Some("CreateFile") => {
-        //     let result = client.create_file(???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.create_file(???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("CreateFileBatch") => {
-            let result = client.create_file_batch(&Vec::new(), Some(true), Some("editgroup_example".to_string())).wait();
+            let result = client.create_file_batch(&Vec::new(), Some(true), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteFile") => {
-            let result = client.delete_file("id_example".to_string(), Some("editgroup_example".to_string())).wait();
+            let result = client.delete_file("ident_example".to_string(), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -312,7 +312,9 @@ fn main() {
         }
 
         Some("GetFile") => {
-            let result = client.get_file("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string())).wait();
+            let result = client
+                .get_file("ident_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -322,18 +324,18 @@ fn main() {
         }
 
         Some("GetFileHistory") => {
-            let result = client.get_file_history("id_example".to_string(), Some(789)).wait();
+            let result = client.get_file_history("ident_example".to_string(), Some(789)).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetFileRedirects") => {
-            let result = client.get_file_redirects("id_example".to_string()).wait();
+            let result = client.get_file_redirects("ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetFileRevision") => {
             let result = client
-                .get_file_revision("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_file_revision("rev_id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -353,27 +355,27 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateFile") => {
-        //     let result = client.update_file("id_example".to_string(), ???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.update_file("ident_example".to_string(), ???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateRelease") => {
-        //     let result = client.create_release(???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.create_release(???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("CreateReleaseBatch") => {
-            let result = client.create_release_batch(&Vec::new(), Some(true), Some("editgroup_example".to_string())).wait();
+            let result = client.create_release_batch(&Vec::new(), Some(true), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         // Disabled because there's no example.
         // Some("CreateWork") => {
-        //     let result = client.create_work(???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.create_work(???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("DeleteRelease") => {
-            let result = client.delete_release("id_example".to_string(), Some("editgroup_example".to_string())).wait();
+            let result = client.delete_release("ident_example".to_string(), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -384,7 +386,7 @@ fn main() {
 
         Some("GetRelease") => {
             let result = client
-                .get_release("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_release("ident_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -395,23 +397,23 @@ fn main() {
         }
 
         Some("GetReleaseFiles") => {
-            let result = client.get_release_files("id_example".to_string(), Some("hide_example".to_string())).wait();
+            let result = client.get_release_files("ident_example".to_string(), Some("hide_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetReleaseHistory") => {
-            let result = client.get_release_history("id_example".to_string(), Some(789)).wait();
+            let result = client.get_release_history("ident_example".to_string(), Some(789)).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetReleaseRedirects") => {
-            let result = client.get_release_redirects("id_example".to_string()).wait();
+            let result = client.get_release_redirects("ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetReleaseRevision") => {
             let result = client
-                .get_release_revision("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_release_revision("rev_id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
@@ -434,16 +436,16 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateRelease") => {
-        //     let result = client.update_release("id_example".to_string(), ???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.update_release("ident_example".to_string(), ???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("CreateWorkBatch") => {
-            let result = client.create_work_batch(&Vec::new(), Some(true), Some("editgroup_example".to_string())).wait();
+            let result = client.create_work_batch(&Vec::new(), Some(true), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteWork") => {
-            let result = client.delete_work("id_example".to_string(), Some("editgroup_example".to_string())).wait();
+            let result = client.delete_work("ident_example".to_string(), Some("editgroup_id_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -453,7 +455,9 @@ fn main() {
         }
 
         Some("GetWork") => {
-            let result = client.get_work("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string())).wait();
+            let result = client
+                .get_work("ident_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -463,30 +467,30 @@ fn main() {
         }
 
         Some("GetWorkHistory") => {
-            let result = client.get_work_history("id_example".to_string(), Some(789)).wait();
+            let result = client.get_work_history("ident_example".to_string(), Some(789)).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetWorkRedirects") => {
-            let result = client.get_work_redirects("id_example".to_string()).wait();
+            let result = client.get_work_redirects("ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetWorkReleases") => {
-            let result = client.get_work_releases("id_example".to_string(), Some("hide_example".to_string())).wait();
+            let result = client.get_work_releases("ident_example".to_string(), Some("hide_example".to_string())).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("GetWorkRevision") => {
             let result = client
-                .get_work_revision("id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
+                .get_work_revision("rev_id_example".to_string(), Some("expand_example".to_string()), Some("hide_example".to_string()))
                 .wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         // Disabled because there's no example.
         // Some("UpdateWork") => {
-        //     let result = client.update_work("id_example".to_string(), ???, Some("editgroup_example".to_string())).wait();
+        //     let result = client.update_work("ident_example".to_string(), ???, Some("editgroup_id_example".to_string())).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         _ => panic!("Invalid operation provided"),
diff --git a/rust/fatcat-api-spec/examples/server_lib/server.rs b/rust/fatcat-api-spec/examples/server_lib/server.rs
index 98358657..62ec88b8 100644
--- a/rust/fatcat-api-spec/examples/server_lib/server.rs
+++ b/rust/fatcat-api-spec/examples/server_lib/server.rs
@@ -26,12 +26,12 @@ use fatcat::{
 pub struct Server;
 
 impl Api for Server {
-    fn create_container(&self, entity: models::ContainerEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
+    fn create_container(&self, entity: models::ContainerEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "create_container({:?}, {:?}) - X-Span-ID: {:?}",
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -41,7 +41,7 @@ impl Api for Server {
         &self,
         entity_list: &Vec<models::ContainerEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
@@ -49,18 +49,18 @@ impl Api for Server {
             "create_container_batch({:?}, {:?}, {:?}) - X-Span-ID: {:?}",
             entity_list,
             autoaccept,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_container(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
+    fn delete_container(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_container(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
-            editgroup,
+            ident,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -72,11 +72,11 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_container(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
+    fn get_container(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_container(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -90,28 +90,28 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_container_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
+    fn get_container_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_container_history(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             limit,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_container_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
+    fn get_container_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_container_redirects(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_container_redirects(\"{}\") - X-Span-ID: {:?}", ident, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_container_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send> {
+    fn get_container_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_container_revision(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            rev_id,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -139,24 +139,30 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_container(&self, id: String, entity: models::ContainerEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
+    fn update_container(
+        &self,
+        ident: String,
+        entity: models::ContainerEntity,
+        editgroup_id: Option<String>,
+        context: &Context,
+    ) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "update_container(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_creator(&self, entity: models::CreatorEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
+    fn create_creator(&self, entity: models::CreatorEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "create_creator({:?}, {:?}) - X-Span-ID: {:?}",
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -166,7 +172,7 @@ impl Api for Server {
         &self,
         entity_list: &Vec<models::CreatorEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
@@ -174,18 +180,18 @@ impl Api for Server {
             "create_creator_batch({:?}, {:?}, {:?}) - X-Span-ID: {:?}",
             entity_list,
             autoaccept,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_creator(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
+    fn delete_creator(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_creator(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
-            editgroup,
+            ident,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -197,11 +203,11 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_creator(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
+    fn get_creator(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_creator(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -215,39 +221,39 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_creator_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
+    fn get_creator_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_creator_history(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             limit,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_creator_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
+    fn get_creator_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_creator_redirects(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_creator_redirects(\"{}\") - X-Span-ID: {:?}", ident, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_creator_releases(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
+    fn get_creator_releases(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_creator_releases(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_creator_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send> {
+    fn get_creator_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_creator_revision(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            rev_id,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -275,27 +281,27 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_creator(&self, id: String, entity: models::CreatorEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
+    fn update_creator(&self, ident: String, entity: models::CreatorEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "update_creator(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_editor(&self, id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
+    fn get_editor(&self, editor_id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_editor(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_editor(\"{}\") - X-Span-ID: {:?}", editor_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_editor_changelog(&self, id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
+    fn get_editor_changelog(&self, editor_id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_editor_changelog(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_editor_changelog(\"{}\") - X-Span-ID: {:?}", editor_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -305,9 +311,9 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn accept_editgroup(&self, id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
+    fn accept_editgroup(&self, editgroup_id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("accept_editgroup(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("accept_editgroup(\"{}\") - X-Span-ID: {:?}", editgroup_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -323,24 +329,24 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_changelog_entry(&self, id: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
+    fn get_changelog_entry(&self, index: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_changelog_entry({}) - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_changelog_entry({}) - X-Span-ID: {:?}", index, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_editgroup(&self, id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
+    fn get_editgroup(&self, editgroup_id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_editgroup(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_editgroup(\"{}\") - X-Span-ID: {:?}", editgroup_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_file(&self, entity: models::FileEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
+    fn create_file(&self, entity: models::FileEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "create_file({:?}, {:?}) - X-Span-ID: {:?}",
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -350,7 +356,7 @@ impl Api for Server {
         &self,
         entity_list: &Vec<models::FileEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
@@ -358,18 +364,18 @@ impl Api for Server {
             "create_file_batch({:?}, {:?}, {:?}) - X-Span-ID: {:?}",
             entity_list,
             autoaccept,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_file(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
+    fn delete_file(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_file(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
-            editgroup,
+            ident,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -381,11 +387,11 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_file(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
+    fn get_file(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_file(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -399,28 +405,28 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_file_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
+    fn get_file_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_file_history(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             limit,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_file_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
+    fn get_file_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_file_redirects(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_file_redirects(\"{}\") - X-Span-ID: {:?}", ident, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_file_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
+    fn get_file_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_file_revision(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            rev_id,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -450,24 +456,24 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_file(&self, id: String, entity: models::FileEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
+    fn update_file(&self, ident: String, entity: models::FileEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "update_file(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_release(&self, entity: models::ReleaseEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
+    fn create_release(&self, entity: models::ReleaseEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "create_release({:?}, {:?}) - X-Span-ID: {:?}",
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -477,7 +483,7 @@ impl Api for Server {
         &self,
         entity_list: &Vec<models::ReleaseEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
@@ -485,29 +491,29 @@ impl Api for Server {
             "create_release_batch({:?}, {:?}, {:?}) - X-Span-ID: {:?}",
             entity_list,
             autoaccept,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_work(&self, entity: models::WorkEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
+    fn create_work(&self, entity: models::WorkEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "create_work({:?}, {:?}) - X-Span-ID: {:?}",
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_release(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
+    fn delete_release(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_release(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
-            editgroup,
+            ident,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -519,11 +525,11 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_release(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
+    fn get_release(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_release(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -537,39 +543,39 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_release_files(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
+    fn get_release_files(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_release_files(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_release_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
+    fn get_release_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_release_history(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             limit,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_release_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
+    fn get_release_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_release_redirects(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_release_redirects(\"{}\") - X-Span-ID: {:?}", ident, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_release_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send> {
+    fn get_release_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_release_revision(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            rev_id,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -605,13 +611,13 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_release(&self, id: String, entity: models::ReleaseEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
+    fn update_release(&self, ident: String, entity: models::ReleaseEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "update_release(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -621,7 +627,7 @@ impl Api for Server {
         &self,
         entity_list: &Vec<models::WorkEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
@@ -629,18 +635,18 @@ impl Api for Server {
             "create_work_batch({:?}, {:?}, {:?}) - X-Span-ID: {:?}",
             entity_list,
             autoaccept,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_work(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
+    fn delete_work(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_work(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
-            editgroup,
+            ident,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -652,11 +658,11 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_work(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
+    fn get_work(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_work(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -670,39 +676,39 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_work_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
+    fn get_work_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_work_history(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             limit,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_work_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
+    fn get_work_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("get_work_redirects(\"{}\") - X-Span-ID: {:?}", id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!("get_work_redirects(\"{}\") - X-Span-ID: {:?}", ident, context.x_span_id.unwrap_or(String::from("<none>")).clone());
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_work_releases(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
+    fn get_work_releases(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_work_releases(\"{}\", {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn get_work_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
+    fn get_work_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "get_work_revision(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            rev_id,
             expand,
             hide,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
@@ -710,13 +716,13 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_work(&self, id: String, entity: models::WorkEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
+    fn update_work(&self, ident: String, entity: models::WorkEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "update_work(\"{}\", {:?}, {:?}) - X-Span-ID: {:?}",
-            id,
+            ident,
             entity,
-            editgroup,
+            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
diff --git a/rust/fatcat-api-spec/src/client.rs b/rust/fatcat-api-spec/src/client.rs
index b3b1a922..eddd99fa 100644
--- a/rust/fatcat-api-spec/src/client.rs
+++ b/rust/fatcat-api-spec/src/client.rs
@@ -169,11 +169,15 @@ impl Client {
 }
 
 impl Api for Client {
-    fn create_container(&self, param_entity: models::ContainerEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
+    fn create_container(&self, param_entity: models::ContainerEntity, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
-        let url = format!("{}/v0/container?{editgroup}", self.base_path, editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET));
+        let url = format!(
+            "{}/v0/container?{editgroup_id}",
+            self.base_path,
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
+        );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
 
@@ -241,18 +245,18 @@ impl Api for Client {
         &self,
         param_entity_list: &Vec<models::ContainerEntity>,
         param_autoaccept: Option<bool>,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_autoaccept = param_autoaccept.map_or_else(String::new, |query| format!("autoaccept={autoaccept}&", autoaccept = query.to_string()));
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/batch?{autoaccept}{editgroup}",
+            "{}/v0/container/batch?{autoaccept}{editgroup_id}",
             self.base_path,
             autoaccept = utf8_percent_encode(&query_autoaccept, QUERY_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity_list).expect("impossible to fail to serialize");
@@ -317,15 +321,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn delete_container(&self, param_id: String, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
+    fn delete_container(&self, param_ident: String, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/{id}?{editgroup}",
+            "{}/v0/container/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -449,15 +453,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_container(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
+    fn get_container(&self, param_ident: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/{id}?{expand}{hide}",
+            "{}/v0/container/{ident}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -583,14 +587,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_container_history(&self, param_id: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
+    fn get_container_history(&self, param_ident: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_limit = param_limit.map_or_else(String::new, |query| format!("limit={limit}&", limit = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/{id}/history?{limit}",
+            "{}/v0/container/{ident}/history?{limit}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             limit = utf8_percent_encode(&query_limit, QUERY_ENCODE_SET)
         );
 
@@ -651,11 +655,11 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_container_redirects(&self, param_id: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
+    fn get_container_redirects(&self, param_ident: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
         let url = format!(
-            "{}/v0/container/{id}/redirects",
+            "{}/v0/container/{ident}/redirects",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -717,7 +721,7 @@ impl Api for Client {
 
     fn get_container_revision(
         &self,
-        param_id: String,
+        param_rev_id: String,
         param_expand: Option<String>,
         param_hide: Option<String>,
         context: &Context,
@@ -727,9 +731,9 @@ impl Api for Client {
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/rev/{id}?{expand}{hide}",
+            "{}/v0/container/rev/{rev_id}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            rev_id = utf8_percent_encode(&param_rev_id.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -873,19 +877,19 @@ impl Api for Client {
 
     fn update_container(
         &self,
-        param_id: String,
+        param_ident: String,
         param_entity: models::ContainerEntity,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/container/{id}?{editgroup}",
+            "{}/v0/container/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
@@ -950,11 +954,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn create_creator(&self, param_entity: models::CreatorEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
+    fn create_creator(&self, param_entity: models::CreatorEntity, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
-        let url = format!("{}/v0/creator?{editgroup}", self.base_path, editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET));
+        let url = format!(
+            "{}/v0/creator?{editgroup_id}",
+            self.base_path,
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
+        );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
 
@@ -1022,18 +1030,18 @@ impl Api for Client {
         &self,
         param_entity_list: &Vec<models::CreatorEntity>,
         param_autoaccept: Option<bool>,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_autoaccept = param_autoaccept.map_or_else(String::new, |query| format!("autoaccept={autoaccept}&", autoaccept = query.to_string()));
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/batch?{autoaccept}{editgroup}",
+            "{}/v0/creator/batch?{autoaccept}{editgroup_id}",
             self.base_path,
             autoaccept = utf8_percent_encode(&query_autoaccept, QUERY_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity_list).expect("impossible to fail to serialize");
@@ -1098,15 +1106,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn delete_creator(&self, param_id: String, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
+    fn delete_creator(&self, param_ident: String, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/{id}?{editgroup}",
+            "{}/v0/creator/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -1230,15 +1238,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_creator(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
+    fn get_creator(&self, param_ident: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/{id}?{expand}{hide}",
+            "{}/v0/creator/{ident}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -1364,14 +1372,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_creator_history(&self, param_id: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
+    fn get_creator_history(&self, param_ident: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_limit = param_limit.map_or_else(String::new, |query| format!("limit={limit}&", limit = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/{id}/history?{limit}",
+            "{}/v0/creator/{ident}/history?{limit}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             limit = utf8_percent_encode(&query_limit, QUERY_ENCODE_SET)
         );
 
@@ -1432,8 +1440,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_creator_redirects(&self, param_id: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/creator/{id}/redirects", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_creator_redirects(&self, param_ident: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/creator/{ident}/redirects",
+            self.base_path,
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -1492,14 +1504,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_creator_releases(&self, param_id: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
+    fn get_creator_releases(&self, param_ident: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/{id}/releases?{hide}",
+            "{}/v0/creator/{ident}/releases?{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
 
@@ -1562,7 +1574,7 @@ impl Api for Client {
 
     fn get_creator_revision(
         &self,
-        param_id: String,
+        param_rev_id: String,
         param_expand: Option<String>,
         param_hide: Option<String>,
         context: &Context,
@@ -1572,9 +1584,9 @@ impl Api for Client {
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/rev/{id}?{expand}{hide}",
+            "{}/v0/creator/rev/{rev_id}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            rev_id = utf8_percent_encode(&param_rev_id.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -1718,19 +1730,19 @@ impl Api for Client {
 
     fn update_creator(
         &self,
-        param_id: String,
+        param_ident: String,
         param_entity: models::CreatorEntity,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/creator/{id}?{editgroup}",
+            "{}/v0/creator/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
@@ -1795,8 +1807,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_editor(&self, param_id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/editor/{id}", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_editor(&self, param_editor_id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/editor/{editor_id}",
+            self.base_path,
+            editor_id = utf8_percent_encode(&param_editor_id.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -1855,8 +1871,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_editor_changelog(&self, param_id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/editor/{id}/changelog", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_editor_changelog(&self, param_editor_id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/editor/{editor_id}/changelog",
+            self.base_path,
+            editor_id = utf8_percent_encode(&param_editor_id.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -1964,8 +1984,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn accept_editgroup(&self, param_id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/editgroup/{id}/accept", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn accept_editgroup(&self, param_editgroup_id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/editgroup/{editgroup_id}/accept",
+            self.base_path,
+            editgroup_id = utf8_percent_encode(&param_editgroup_id.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Post, &url);
@@ -2138,8 +2162,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_changelog_entry(&self, param_id: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/changelog/{id}", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_changelog_entry(&self, param_index: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/changelog/{index}",
+            self.base_path,
+            index = utf8_percent_encode(&param_index.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -2191,8 +2219,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_editgroup(&self, param_id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/editgroup/{id}", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_editgroup(&self, param_editgroup_id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/editgroup/{editgroup_id}",
+            self.base_path,
+            editgroup_id = utf8_percent_encode(&param_editgroup_id.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -2251,11 +2283,11 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn create_file(&self, param_entity: models::FileEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
+    fn create_file(&self, param_entity: models::FileEntity, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
-        let url = format!("{}/v0/file?{editgroup}", self.base_path, editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET));
+        let url = format!("{}/v0/file?{editgroup_id}", self.base_path, editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET));
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
 
@@ -2323,18 +2355,18 @@ impl Api for Client {
         &self,
         param_entity_list: &Vec<models::FileEntity>,
         param_autoaccept: Option<bool>,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_autoaccept = param_autoaccept.map_or_else(String::new, |query| format!("autoaccept={autoaccept}&", autoaccept = query.to_string()));
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/batch?{autoaccept}{editgroup}",
+            "{}/v0/file/batch?{autoaccept}{editgroup_id}",
             self.base_path,
             autoaccept = utf8_percent_encode(&query_autoaccept, QUERY_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity_list).expect("impossible to fail to serialize");
@@ -2399,15 +2431,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn delete_file(&self, param_id: String, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
+    fn delete_file(&self, param_ident: String, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/{id}?{editgroup}",
+            "{}/v0/file/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -2531,15 +2563,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_file(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
+    fn get_file(&self, param_ident: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/{id}?{expand}{hide}",
+            "{}/v0/file/{ident}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -2665,14 +2697,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_file_history(&self, param_id: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
+    fn get_file_history(&self, param_ident: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_limit = param_limit.map_or_else(String::new, |query| format!("limit={limit}&", limit = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/{id}/history?{limit}",
+            "{}/v0/file/{ident}/history?{limit}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             limit = utf8_percent_encode(&query_limit, QUERY_ENCODE_SET)
         );
 
@@ -2733,8 +2765,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_file_redirects(&self, param_id: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/file/{id}/redirects", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_file_redirects(&self, param_ident: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/file/{ident}/redirects",
+            self.base_path,
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -2793,15 +2829,21 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_file_revision(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
+    fn get_file_revision(
+        &self,
+        param_rev_id: String,
+        param_expand: Option<String>,
+        param_hide: Option<String>,
+        context: &Context,
+    ) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/rev/{id}?{expand}{hide}",
+            "{}/v0/file/rev/{rev_id}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            rev_id = utf8_percent_encode(&param_rev_id.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -2946,15 +2988,21 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn update_file(&self, param_id: String, param_entity: models::FileEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
+    fn update_file(
+        &self,
+        param_ident: String,
+        param_entity: models::FileEntity,
+        param_editgroup_id: Option<String>,
+        context: &Context,
+    ) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/file/{id}?{editgroup}",
+            "{}/v0/file/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
@@ -3019,11 +3067,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn create_release(&self, param_entity: models::ReleaseEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
+    fn create_release(&self, param_entity: models::ReleaseEntity, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
-        let url = format!("{}/v0/release?{editgroup}", self.base_path, editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET));
+        let url = format!(
+            "{}/v0/release?{editgroup_id}",
+            self.base_path,
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
+        );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
 
@@ -3091,18 +3143,18 @@ impl Api for Client {
         &self,
         param_entity_list: &Vec<models::ReleaseEntity>,
         param_autoaccept: Option<bool>,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_autoaccept = param_autoaccept.map_or_else(String::new, |query| format!("autoaccept={autoaccept}&", autoaccept = query.to_string()));
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/batch?{autoaccept}{editgroup}",
+            "{}/v0/release/batch?{autoaccept}{editgroup_id}",
             self.base_path,
             autoaccept = utf8_percent_encode(&query_autoaccept, QUERY_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity_list).expect("impossible to fail to serialize");
@@ -3167,11 +3219,11 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn create_work(&self, param_entity: models::WorkEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
+    fn create_work(&self, param_entity: models::WorkEntity, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
-        let url = format!("{}/v0/work?{editgroup}", self.base_path, editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET));
+        let url = format!("{}/v0/work?{editgroup_id}", self.base_path, editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET));
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
 
@@ -3235,15 +3287,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn delete_release(&self, param_id: String, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
+    fn delete_release(&self, param_ident: String, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/{id}?{editgroup}",
+            "{}/v0/release/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -3367,15 +3419,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_release(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
+    fn get_release(&self, param_ident: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/{id}?{expand}{hide}",
+            "{}/v0/release/{ident}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -3501,14 +3553,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_release_files(&self, param_id: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
+    fn get_release_files(&self, param_ident: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/{id}/files?{hide}",
+            "{}/v0/release/{ident}/files?{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
 
@@ -3569,14 +3621,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_release_history(&self, param_id: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
+    fn get_release_history(&self, param_ident: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_limit = param_limit.map_or_else(String::new, |query| format!("limit={limit}&", limit = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/{id}/history?{limit}",
+            "{}/v0/release/{ident}/history?{limit}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             limit = utf8_percent_encode(&query_limit, QUERY_ENCODE_SET)
         );
 
@@ -3637,8 +3689,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_release_redirects(&self, param_id: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/release/{id}/redirects", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_release_redirects(&self, param_ident: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/release/{ident}/redirects",
+            self.base_path,
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -3699,7 +3755,7 @@ impl Api for Client {
 
     fn get_release_revision(
         &self,
-        param_id: String,
+        param_rev_id: String,
         param_expand: Option<String>,
         param_hide: Option<String>,
         context: &Context,
@@ -3709,9 +3765,9 @@ impl Api for Client {
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/rev/{id}?{expand}{hide}",
+            "{}/v0/release/rev/{rev_id}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            rev_id = utf8_percent_encode(&param_rev_id.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -3867,19 +3923,19 @@ impl Api for Client {
 
     fn update_release(
         &self,
-        param_id: String,
+        param_ident: String,
         param_entity: models::ReleaseEntity,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/release/{id}?{editgroup}",
+            "{}/v0/release/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
@@ -3948,18 +4004,18 @@ impl Api for Client {
         &self,
         param_entity_list: &Vec<models::WorkEntity>,
         param_autoaccept: Option<bool>,
-        param_editgroup: Option<String>,
+        param_editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_autoaccept = param_autoaccept.map_or_else(String::new, |query| format!("autoaccept={autoaccept}&", autoaccept = query.to_string()));
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/batch?{autoaccept}{editgroup}",
+            "{}/v0/work/batch?{autoaccept}{editgroup_id}",
             self.base_path,
             autoaccept = utf8_percent_encode(&query_autoaccept, QUERY_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity_list).expect("impossible to fail to serialize");
@@ -4024,15 +4080,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn delete_work(&self, param_id: String, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
+    fn delete_work(&self, param_ident: String, param_editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/{id}?{editgroup}",
+            "{}/v0/work/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let hyper_client = (self.hyper_client)();
@@ -4156,15 +4212,15 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_work(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
+    fn get_work(&self, param_ident: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/{id}?{expand}{hide}",
+            "{}/v0/work/{ident}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -4290,14 +4346,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_work_history(&self, param_id: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
+    fn get_work_history(&self, param_ident: String, param_limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_limit = param_limit.map_or_else(String::new, |query| format!("limit={limit}&", limit = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/{id}/history?{limit}",
+            "{}/v0/work/{ident}/history?{limit}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             limit = utf8_percent_encode(&query_limit, QUERY_ENCODE_SET)
         );
 
@@ -4358,8 +4414,12 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_work_redirects(&self, param_id: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
-        let url = format!("{}/v0/work/{id}/redirects", self.base_path, id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET));
+    fn get_work_redirects(&self, param_ident: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
+        let url = format!(
+            "{}/v0/work/{ident}/redirects",
+            self.base_path,
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET)
+        );
 
         let hyper_client = (self.hyper_client)();
         let request = hyper_client.request(hyper::method::Method::Get, &url);
@@ -4418,14 +4478,14 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_work_releases(&self, param_id: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
+    fn get_work_releases(&self, param_ident: String, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/{id}/releases?{hide}",
+            "{}/v0/work/{ident}/releases?{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
 
@@ -4486,15 +4546,21 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn get_work_revision(&self, param_id: String, param_expand: Option<String>, param_hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
+    fn get_work_revision(
+        &self,
+        param_rev_id: String,
+        param_expand: Option<String>,
+        param_hide: Option<String>,
+        context: &Context,
+    ) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
         // Query parameters
         let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string()));
         let query_hide = param_hide.map_or_else(String::new, |query| format!("hide={hide}&", hide = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/rev/{id}?{expand}{hide}",
+            "{}/v0/work/rev/{rev_id}?{expand}{hide}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
+            rev_id = utf8_percent_encode(&param_rev_id.to_string(), PATH_SEGMENT_ENCODE_SET),
             expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET),
             hide = utf8_percent_encode(&query_hide, QUERY_ENCODE_SET)
         );
@@ -4556,15 +4622,21 @@ impl Api for Client {
         Box::new(futures::done(result))
     }
 
-    fn update_work(&self, param_id: String, param_entity: models::WorkEntity, param_editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
+    fn update_work(
+        &self,
+        param_ident: String,
+        param_entity: models::WorkEntity,
+        param_editgroup_id: Option<String>,
+        context: &Context,
+    ) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
         // Query parameters
-        let query_editgroup = param_editgroup.map_or_else(String::new, |query| format!("editgroup={editgroup}&", editgroup = query.to_string()));
+        let query_editgroup_id = param_editgroup_id.map_or_else(String::new, |query| format!("editgroup_id={editgroup_id}&", editgroup_id = query.to_string()));
 
         let url = format!(
-            "{}/v0/work/{id}?{editgroup}",
+            "{}/v0/work/{ident}?{editgroup_id}",
             self.base_path,
-            id = utf8_percent_encode(&param_id.to_string(), PATH_SEGMENT_ENCODE_SET),
-            editgroup = utf8_percent_encode(&query_editgroup, QUERY_ENCODE_SET)
+            ident = utf8_percent_encode(&param_ident.to_string(), PATH_SEGMENT_ENCODE_SET),
+            editgroup_id = utf8_percent_encode(&query_editgroup_id, QUERY_ENCODE_SET)
         );
 
         let body = serde_json::to_string(&param_entity).expect("impossible to fail to serialize");
diff --git a/rust/fatcat-api-spec/src/lib.rs b/rust/fatcat-api-spec/src/lib.rs
index 4e06616f..ba578224 100644
--- a/rust/fatcat-api-spec/src/lib.rs
+++ b/rust/fatcat-api-spec/src/lib.rs
@@ -804,29 +804,29 @@ pub enum UpdateWorkResponse {
 
 /// API
 pub trait Api {
-    fn create_container(&self, entity: models::ContainerEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send>;
+    fn create_container(&self, entity: models::ContainerEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send>;
 
     fn create_container_batch(
         &self,
         entity_list: &Vec<models::ContainerEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_container(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send>;
+    fn delete_container(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send>;
 
     fn delete_container_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = DeleteContainerEditResponse, Error = ApiError> + Send>;
 
-    fn get_container(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send>;
+    fn get_container(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send>;
 
     fn get_container_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = GetContainerEditResponse, Error = ApiError> + Send>;
 
-    fn get_container_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send>;
+    fn get_container_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_container_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send>;
+    fn get_container_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_container_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send>;
+    fn get_container_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_container(
         &self,
@@ -837,33 +837,34 @@ pub trait Api {
         context: &Context,
     ) -> Box<Future<Item = LookupContainerResponse, Error = ApiError> + Send>;
 
-    fn update_container(&self, id: String, entity: models::ContainerEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send>;
+    fn update_container(&self, ident: String, entity: models::ContainerEntity, editgroup_id: Option<String>, context: &Context)
+        -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send>;
 
-    fn create_creator(&self, entity: models::CreatorEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send>;
+    fn create_creator(&self, entity: models::CreatorEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send>;
 
     fn create_creator_batch(
         &self,
         entity_list: &Vec<models::CreatorEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_creator(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send>;
+    fn delete_creator(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send>;
 
     fn delete_creator_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = DeleteCreatorEditResponse, Error = ApiError> + Send>;
 
-    fn get_creator(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send>;
+    fn get_creator(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send>;
 
     fn get_creator_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = GetCreatorEditResponse, Error = ApiError> + Send>;
 
-    fn get_creator_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send>;
+    fn get_creator_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_creator_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send>;
+    fn get_creator_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_creator_releases(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send>;
+    fn get_creator_releases(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send>;
 
-    fn get_creator_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send>;
+    fn get_creator_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_creator(
         &self,
@@ -874,47 +875,47 @@ pub trait Api {
         context: &Context,
     ) -> Box<Future<Item = LookupCreatorResponse, Error = ApiError> + Send>;
 
-    fn update_creator(&self, id: String, entity: models::CreatorEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send>;
+    fn update_creator(&self, ident: String, entity: models::CreatorEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send>;
 
-    fn get_editor(&self, id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send>;
+    fn get_editor(&self, editor_id: String, context: &Context) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send>;
 
-    fn get_editor_changelog(&self, id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send>;
+    fn get_editor_changelog(&self, editor_id: String, context: &Context) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send>;
 
     fn get_stats(&self, more: Option<String>, context: &Context) -> Box<Future<Item = GetStatsResponse, Error = ApiError> + Send>;
 
-    fn accept_editgroup(&self, id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send>;
+    fn accept_editgroup(&self, editgroup_id: String, context: &Context) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send>;
 
     fn create_editgroup(&self, editgroup: models::Editgroup, context: &Context) -> Box<Future<Item = CreateEditgroupResponse, Error = ApiError> + Send>;
 
     fn get_changelog(&self, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetChangelogResponse, Error = ApiError> + Send>;
 
-    fn get_changelog_entry(&self, id: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send>;
+    fn get_changelog_entry(&self, index: i64, context: &Context) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send>;
 
-    fn get_editgroup(&self, id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send>;
+    fn get_editgroup(&self, editgroup_id: String, context: &Context) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send>;
 
-    fn create_file(&self, entity: models::FileEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send>;
+    fn create_file(&self, entity: models::FileEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send>;
 
     fn create_file_batch(
         &self,
         entity_list: &Vec<models::FileEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_file(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send>;
+    fn delete_file(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send>;
 
     fn delete_file_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = DeleteFileEditResponse, Error = ApiError> + Send>;
 
-    fn get_file(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send>;
+    fn get_file(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send>;
 
     fn get_file_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = GetFileEditResponse, Error = ApiError> + Send>;
 
-    fn get_file_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send>;
+    fn get_file_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_file_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send>;
+    fn get_file_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_file_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send>;
+    fn get_file_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_file(
         &self,
@@ -926,35 +927,35 @@ pub trait Api {
         context: &Context,
     ) -> Box<Future<Item = LookupFileResponse, Error = ApiError> + Send>;
 
-    fn update_file(&self, id: String, entity: models::FileEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send>;
+    fn update_file(&self, ident: String, entity: models::FileEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send>;
 
-    fn create_release(&self, entity: models::ReleaseEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send>;
+    fn create_release(&self, entity: models::ReleaseEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send>;
 
     fn create_release_batch(
         &self,
         entity_list: &Vec<models::ReleaseEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send>;
 
-    fn create_work(&self, entity: models::WorkEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send>;
+    fn create_work(&self, entity: models::WorkEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send>;
 
-    fn delete_release(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send>;
+    fn delete_release(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send>;
 
     fn delete_release_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = DeleteReleaseEditResponse, Error = ApiError> + Send>;
 
-    fn get_release(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send>;
+    fn get_release(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send>;
 
     fn get_release_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = GetReleaseEditResponse, Error = ApiError> + Send>;
 
-    fn get_release_files(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send>;
+    fn get_release_files(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send>;
 
-    fn get_release_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send>;
+    fn get_release_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_release_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send>;
+    fn get_release_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_release_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send>;
+    fn get_release_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_release(
         &self,
@@ -969,59 +970,59 @@ pub trait Api {
         context: &Context,
     ) -> Box<Future<Item = LookupReleaseResponse, Error = ApiError> + Send>;
 
-    fn update_release(&self, id: String, entity: models::ReleaseEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send>;
+    fn update_release(&self, ident: String, entity: models::ReleaseEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send>;
 
     fn create_work_batch(
         &self,
         entity_list: &Vec<models::WorkEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
         context: &Context,
     ) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_work(&self, id: String, editgroup: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send>;
+    fn delete_work(&self, ident: String, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send>;
 
     fn delete_work_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = DeleteWorkEditResponse, Error = ApiError> + Send>;
 
-    fn get_work(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send>;
+    fn get_work(&self, ident: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send>;
 
     fn get_work_edit(&self, edit_id: i64, context: &Context) -> Box<Future<Item = GetWorkEditResponse, Error = ApiError> + Send>;
 
-    fn get_work_history(&self, id: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send>;
+    fn get_work_history(&self, ident: String, limit: Option<i64>, context: &Context) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_work_redirects(&self, id: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send>;
+    fn get_work_redirects(&self, ident: String, context: &Context) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_work_releases(&self, id: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send>;
+    fn get_work_releases(&self, ident: String, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send>;
 
-    fn get_work_revision(&self, id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send>;
+    fn get_work_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>, context: &Context) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send>;
 
-    fn update_work(&self, id: String, entity: models::WorkEntity, editgroup: Option<String>, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send>;
+    fn update_work(&self, ident: String, entity: models::WorkEntity, editgroup_id: Option<String>, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send>;
 }
 
 /// API without a `Context`
 pub trait ApiNoContext {
-    fn create_container(&self, entity: models::ContainerEntity, editgroup: Option<String>) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send>;
+    fn create_container(&self, entity: models::ContainerEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send>;
 
     fn create_container_batch(
         &self,
         entity_list: &Vec<models::ContainerEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_container(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send>;
+    fn delete_container(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send>;
 
     fn delete_container_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteContainerEditResponse, Error = ApiError> + Send>;
 
-    fn get_container(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send>;
+    fn get_container(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send>;
 
     fn get_container_edit(&self, edit_id: i64) -> Box<Future<Item = GetContainerEditResponse, Error = ApiError> + Send>;
 
-    fn get_container_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send>;
+    fn get_container_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_container_redirects(&self, id: String) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send>;
+    fn get_container_redirects(&self, ident: String) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_container_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send>;
+    fn get_container_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_container(
         &self,
@@ -1031,70 +1032,70 @@ pub trait ApiNoContext {
         hide: Option<String>,
     ) -> Box<Future<Item = LookupContainerResponse, Error = ApiError> + Send>;
 
-    fn update_container(&self, id: String, entity: models::ContainerEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send>;
+    fn update_container(&self, ident: String, entity: models::ContainerEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send>;
 
-    fn create_creator(&self, entity: models::CreatorEntity, editgroup: Option<String>) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send>;
+    fn create_creator(&self, entity: models::CreatorEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send>;
 
     fn create_creator_batch(
         &self,
         entity_list: &Vec<models::CreatorEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_creator(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send>;
+    fn delete_creator(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send>;
 
     fn delete_creator_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteCreatorEditResponse, Error = ApiError> + Send>;
 
-    fn get_creator(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send>;
+    fn get_creator(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send>;
 
     fn get_creator_edit(&self, edit_id: i64) -> Box<Future<Item = GetCreatorEditResponse, Error = ApiError> + Send>;
 
-    fn get_creator_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send>;
+    fn get_creator_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_creator_redirects(&self, id: String) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send>;
+    fn get_creator_redirects(&self, ident: String) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_creator_releases(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send>;
+    fn get_creator_releases(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send>;
 
-    fn get_creator_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send>;
+    fn get_creator_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_creator(&self, orcid: Option<String>, wikidata_qid: Option<String>, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = LookupCreatorResponse, Error = ApiError> + Send>;
 
-    fn update_creator(&self, id: String, entity: models::CreatorEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send>;
+    fn update_creator(&self, ident: String, entity: models::CreatorEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send>;
 
-    fn get_editor(&self, id: String) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send>;
+    fn get_editor(&self, editor_id: String) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send>;
 
-    fn get_editor_changelog(&self, id: String) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send>;
+    fn get_editor_changelog(&self, editor_id: String) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send>;
 
     fn get_stats(&self, more: Option<String>) -> Box<Future<Item = GetStatsResponse, Error = ApiError> + Send>;
 
-    fn accept_editgroup(&self, id: String) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send>;
+    fn accept_editgroup(&self, editgroup_id: String) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send>;
 
     fn create_editgroup(&self, editgroup: models::Editgroup) -> Box<Future<Item = CreateEditgroupResponse, Error = ApiError> + Send>;
 
     fn get_changelog(&self, limit: Option<i64>) -> Box<Future<Item = GetChangelogResponse, Error = ApiError> + Send>;
 
-    fn get_changelog_entry(&self, id: i64) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send>;
+    fn get_changelog_entry(&self, index: i64) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send>;
 
-    fn get_editgroup(&self, id: String) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send>;
+    fn get_editgroup(&self, editgroup_id: String) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send>;
 
-    fn create_file(&self, entity: models::FileEntity, editgroup: Option<String>) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send>;
+    fn create_file(&self, entity: models::FileEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send>;
 
-    fn create_file_batch(&self, entity_list: &Vec<models::FileEntity>, autoaccept: Option<bool>, editgroup: Option<String>) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send>;
+    fn create_file_batch(&self, entity_list: &Vec<models::FileEntity>, autoaccept: Option<bool>, editgroup_id: Option<String>) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_file(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send>;
+    fn delete_file(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send>;
 
     fn delete_file_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteFileEditResponse, Error = ApiError> + Send>;
 
-    fn get_file(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send>;
+    fn get_file(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send>;
 
     fn get_file_edit(&self, edit_id: i64) -> Box<Future<Item = GetFileEditResponse, Error = ApiError> + Send>;
 
-    fn get_file_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send>;
+    fn get_file_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_file_redirects(&self, id: String) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send>;
+    fn get_file_redirects(&self, ident: String) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_file_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send>;
+    fn get_file_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_file(
         &self,
@@ -1105,34 +1106,34 @@ pub trait ApiNoContext {
         hide: Option<String>,
     ) -> Box<Future<Item = LookupFileResponse, Error = ApiError> + Send>;
 
-    fn update_file(&self, id: String, entity: models::FileEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send>;
+    fn update_file(&self, ident: String, entity: models::FileEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send>;
 
-    fn create_release(&self, entity: models::ReleaseEntity, editgroup: Option<String>) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send>;
+    fn create_release(&self, entity: models::ReleaseEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send>;
 
     fn create_release_batch(
         &self,
         entity_list: &Vec<models::ReleaseEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send>;
 
-    fn create_work(&self, entity: models::WorkEntity, editgroup: Option<String>) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send>;
+    fn create_work(&self, entity: models::WorkEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send>;
 
-    fn delete_release(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send>;
+    fn delete_release(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send>;
 
     fn delete_release_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteReleaseEditResponse, Error = ApiError> + Send>;
 
-    fn get_release(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send>;
+    fn get_release(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send>;
 
     fn get_release_edit(&self, edit_id: i64) -> Box<Future<Item = GetReleaseEditResponse, Error = ApiError> + Send>;
 
-    fn get_release_files(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send>;
+    fn get_release_files(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send>;
 
-    fn get_release_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send>;
+    fn get_release_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_release_redirects(&self, id: String) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send>;
+    fn get_release_redirects(&self, ident: String) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_release_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send>;
+    fn get_release_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send>;
 
     fn lookup_release(
         &self,
@@ -1146,27 +1147,27 @@ pub trait ApiNoContext {
         hide: Option<String>,
     ) -> Box<Future<Item = LookupReleaseResponse, Error = ApiError> + Send>;
 
-    fn update_release(&self, id: String, entity: models::ReleaseEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send>;
+    fn update_release(&self, ident: String, entity: models::ReleaseEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send>;
 
-    fn create_work_batch(&self, entity_list: &Vec<models::WorkEntity>, autoaccept: Option<bool>, editgroup: Option<String>) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send>;
+    fn create_work_batch(&self, entity_list: &Vec<models::WorkEntity>, autoaccept: Option<bool>, editgroup_id: Option<String>) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send>;
 
-    fn delete_work(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send>;
+    fn delete_work(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send>;
 
     fn delete_work_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteWorkEditResponse, Error = ApiError> + Send>;
 
-    fn get_work(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send>;
+    fn get_work(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send>;
 
     fn get_work_edit(&self, edit_id: i64) -> Box<Future<Item = GetWorkEditResponse, Error = ApiError> + Send>;
 
-    fn get_work_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send>;
+    fn get_work_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send>;
 
-    fn get_work_redirects(&self, id: String) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send>;
+    fn get_work_redirects(&self, ident: String) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send>;
 
-    fn get_work_releases(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send>;
+    fn get_work_releases(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send>;
 
-    fn get_work_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send>;
+    fn get_work_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send>;
 
-    fn update_work(&self, id: String, entity: models::WorkEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send>;
+    fn update_work(&self, ident: String, entity: models::WorkEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send>;
 }
 
 /// Trait to extend an API to make it easy to bind it to a context.
@@ -1185,45 +1186,45 @@ impl<'a, T: Api + Sized> ContextWrapperExt<'a> for T {
 }
 
 impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> {
-    fn create_container(&self, entity: models::ContainerEntity, editgroup: Option<String>) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
-        self.api().create_container(entity, editgroup, &self.context())
+    fn create_container(&self, entity: models::ContainerEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
+        self.api().create_container(entity, editgroup_id, &self.context())
     }
 
     fn create_container_batch(
         &self,
         entity_list: &Vec<models::ContainerEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send> {
-        self.api().create_container_batch(entity_list, autoaccept, editgroup, &self.context())
+        self.api().create_container_batch(entity_list, autoaccept, editgroup_id, &self.context())
     }
 
-    fn delete_container(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
-        self.api().delete_container(id, editgroup, &self.context())
+    fn delete_container(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
+        self.api().delete_container(ident, editgroup_id, &self.context())
     }
 
     fn delete_container_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteContainerEditResponse, Error = ApiError> + Send> {
         self.api().delete_container_edit(edit_id, &self.context())
     }
 
-    fn get_container(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
-        self.api().get_container(id, expand, hide, &self.context())
+    fn get_container(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerResponse, Error = ApiError> + Send> {
+        self.api().get_container(ident, expand, hide, &self.context())
     }
 
     fn get_container_edit(&self, edit_id: i64) -> Box<Future<Item = GetContainerEditResponse, Error = ApiError> + Send> {
         self.api().get_container_edit(edit_id, &self.context())
     }
 
-    fn get_container_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
-        self.api().get_container_history(id, limit, &self.context())
+    fn get_container_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetContainerHistoryResponse, Error = ApiError> + Send> {
+        self.api().get_container_history(ident, limit, &self.context())
     }
 
-    fn get_container_redirects(&self, id: String) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
-        self.api().get_container_redirects(id, &self.context())
+    fn get_container_redirects(&self, ident: String) -> Box<Future<Item = GetContainerRedirectsResponse, Error = ApiError> + Send> {
+        self.api().get_container_redirects(ident, &self.context())
     }
 
-    fn get_container_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send> {
-        self.api().get_container_revision(id, expand, hide, &self.context())
+    fn get_container_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetContainerRevisionResponse, Error = ApiError> + Send> {
+        self.api().get_container_revision(rev_id, expand, hide, &self.context())
     }
 
     fn lookup_container(
@@ -1236,77 +1237,77 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> {
         self.api().lookup_container(issnl, wikidata_qid, expand, hide, &self.context())
     }
 
-    fn update_container(&self, id: String, entity: models::ContainerEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
-        self.api().update_container(id, entity, editgroup, &self.context())
+    fn update_container(&self, ident: String, entity: models::ContainerEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
+        self.api().update_container(ident, entity, editgroup_id, &self.context())
     }
 
-    fn create_creator(&self, entity: models::CreatorEntity, editgroup: Option<String>) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
-        self.api().create_creator(entity, editgroup, &self.context())
+    fn create_creator(&self, entity: models::CreatorEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
+        self.api().create_creator(entity, editgroup_id, &self.context())
     }
 
     fn create_creator_batch(
         &self,
         entity_list: &Vec<models::CreatorEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send> {
-        self.api().create_creator_batch(entity_list, autoaccept, editgroup, &self.context())
+        self.api().create_creator_batch(entity_list, autoaccept, editgroup_id, &self.context())
     }
 
-    fn delete_creator(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
-        self.api().delete_creator(id, editgroup, &self.context())
+    fn delete_creator(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
+        self.api().delete_creator(ident, editgroup_id, &self.context())
     }
 
     fn delete_creator_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteCreatorEditResponse, Error = ApiError> + Send> {
         self.api().delete_creator_edit(edit_id, &self.context())
     }
 
-    fn get_creator(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
-        self.api().get_creator(id, expand, hide, &self.context())
+    fn get_creator(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorResponse, Error = ApiError> + Send> {
+        self.api().get_creator(ident, expand, hide, &self.context())
     }
 
     fn get_creator_edit(&self, edit_id: i64) -> Box<Future<Item = GetCreatorEditResponse, Error = ApiError> + Send> {
         self.api().get_creator_edit(edit_id, &self.context())
     }
 
-    fn get_creator_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
-        self.api().get_creator_history(id, limit, &self.context())
+    fn get_creator_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetCreatorHistoryResponse, Error = ApiError> + Send> {
+        self.api().get_creator_history(ident, limit, &self.context())
     }
 
-    fn get_creator_redirects(&self, id: String) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
-        self.api().get_creator_redirects(id, &self.context())
+    fn get_creator_redirects(&self, ident: String) -> Box<Future<Item = GetCreatorRedirectsResponse, Error = ApiError> + Send> {
+        self.api().get_creator_redirects(ident, &self.context())
     }
 
-    fn get_creator_releases(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
-        self.api().get_creator_releases(id, hide, &self.context())
+    fn get_creator_releases(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetCreatorReleasesResponse, Error = ApiError> + Send> {
+        self.api().get_creator_releases(ident, hide, &self.context())
     }
 
-    fn get_creator_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send> {
-        self.api().get_creator_revision(id, expand, hide, &self.context())
+    fn get_creator_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetCreatorRevisionResponse, Error = ApiError> + Send> {
+        self.api().get_creator_revision(rev_id, expand, hide, &self.context())
     }
 
     fn lookup_creator(&self, orcid: Option<String>, wikidata_qid: Option<String>, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = LookupCreatorResponse, Error = ApiError> + Send> {
         self.api().lookup_creator(orcid, wikidata_qid, expand, hide, &self.context())
     }
 
-    fn update_creator(&self, id: String, entity: models::CreatorEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
-        self.api().update_creator(id, entity, editgroup, &self.context())
+    fn update_creator(&self, ident: String, entity: models::CreatorEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
+        self.api().update_creator(ident, entity, editgroup_id, &self.context())
     }
 
-    fn get_editor(&self, id: String) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
-        self.api().get_editor(id, &self.context())
+    fn get_editor(&self, editor_id: String) -> Box<Future<Item = GetEditorResponse, Error = ApiError> + Send> {
+        self.api().get_editor(editor_id, &self.context())
     }
 
-    fn get_editor_changelog(&self, id: String) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
-        self.api().get_editor_changelog(id, &self.context())
+    fn get_editor_changelog(&self, editor_id: String) -> Box<Future<Item = GetEditorChangelogResponse, Error = ApiError> + Send> {
+        self.api().get_editor_changelog(editor_id, &self.context())
     }
 
     fn get_stats(&self, more: Option<String>) -> Box<Future<Item = GetStatsResponse, Error = ApiError> + Send> {
         self.api().get_stats(more, &self.context())
     }
 
-    fn accept_editgroup(&self, id: String) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
-        self.api().accept_editgroup(id, &self.context())
+    fn accept_editgroup(&self, editgroup_id: String) -> Box<Future<Item = AcceptEditgroupResponse, Error = ApiError> + Send> {
+        self.api().accept_editgroup(editgroup_id, &self.context())
     }
 
     fn create_editgroup(&self, editgroup: models::Editgroup) -> Box<Future<Item = CreateEditgroupResponse, Error = ApiError> + Send> {
@@ -1317,48 +1318,48 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> {
         self.api().get_changelog(limit, &self.context())
     }
 
-    fn get_changelog_entry(&self, id: i64) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
-        self.api().get_changelog_entry(id, &self.context())
+    fn get_changelog_entry(&self, index: i64) -> Box<Future<Item = GetChangelogEntryResponse, Error = ApiError> + Send> {
+        self.api().get_changelog_entry(index, &self.context())
     }
 
-    fn get_editgroup(&self, id: String) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
-        self.api().get_editgroup(id, &self.context())
+    fn get_editgroup(&self, editgroup_id: String) -> Box<Future<Item = GetEditgroupResponse, Error = ApiError> + Send> {
+        self.api().get_editgroup(editgroup_id, &self.context())
     }
 
-    fn create_file(&self, entity: models::FileEntity, editgroup: Option<String>) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
-        self.api().create_file(entity, editgroup, &self.context())
+    fn create_file(&self, entity: models::FileEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
+        self.api().create_file(entity, editgroup_id, &self.context())
     }
 
-    fn create_file_batch(&self, entity_list: &Vec<models::FileEntity>, autoaccept: Option<bool>, editgroup: Option<String>) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send> {
-        self.api().create_file_batch(entity_list, autoaccept, editgroup, &self.context())
+    fn create_file_batch(&self, entity_list: &Vec<models::FileEntity>, autoaccept: Option<bool>, editgroup_id: Option<String>) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send> {
+        self.api().create_file_batch(entity_list, autoaccept, editgroup_id, &self.context())
     }
 
-    fn delete_file(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
-        self.api().delete_file(id, editgroup, &self.context())
+    fn delete_file(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
+        self.api().delete_file(ident, editgroup_id, &self.context())
     }
 
     fn delete_file_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteFileEditResponse, Error = ApiError> + Send> {
         self.api().delete_file_edit(edit_id, &self.context())
     }
 
-    fn get_file(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
-        self.api().get_file(id, expand, hide, &self.context())
+    fn get_file(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileResponse, Error = ApiError> + Send> {
+        self.api().get_file(ident, expand, hide, &self.context())
     }
 
     fn get_file_edit(&self, edit_id: i64) -> Box<Future<Item = GetFileEditResponse, Error = ApiError> + Send> {
         self.api().get_file_edit(edit_id, &self.context())
     }
 
-    fn get_file_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
-        self.api().get_file_history(id, limit, &self.context())
+    fn get_file_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetFileHistoryResponse, Error = ApiError> + Send> {
+        self.api().get_file_history(ident, limit, &self.context())
     }
 
-    fn get_file_redirects(&self, id: String) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
-        self.api().get_file_redirects(id, &self.context())
+    fn get_file_redirects(&self, ident: String) -> Box<Future<Item = GetFileRedirectsResponse, Error = ApiError> + Send> {
+        self.api().get_file_redirects(ident, &self.context())
     }
 
-    fn get_file_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
-        self.api().get_file_revision(id, expand, hide, &self.context())
+    fn get_file_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetFileRevisionResponse, Error = ApiError> + Send> {
+        self.api().get_file_revision(rev_id, expand, hide, &self.context())
     }
 
     fn lookup_file(
@@ -1372,57 +1373,57 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> {
         self.api().lookup_file(md5, sha1, sha256, expand, hide, &self.context())
     }
 
-    fn update_file(&self, id: String, entity: models::FileEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
-        self.api().update_file(id, entity, editgroup, &self.context())
+    fn update_file(&self, ident: String, entity: models::FileEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
+        self.api().update_file(ident, entity, editgroup_id, &self.context())
     }
 
-    fn create_release(&self, entity: models::ReleaseEntity, editgroup: Option<String>) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
-        self.api().create_release(entity, editgroup, &self.context())
+    fn create_release(&self, entity: models::ReleaseEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
+        self.api().create_release(entity, editgroup_id, &self.context())
     }
 
     fn create_release_batch(
         &self,
         entity_list: &Vec<models::ReleaseEntity>,
         autoaccept: Option<bool>,
-        editgroup: Option<String>,
+        editgroup_id: Option<String>,
     ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send> {
-        self.api().create_release_batch(entity_list, autoaccept, editgroup, &self.context())
+        self.api().create_release_batch(entity_list, autoaccept, editgroup_id, &self.context())
     }
 
-    fn create_work(&self, entity: models::WorkEntity, editgroup: Option<String>) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
-        self.api().create_work(entity, editgroup, &self.context())
+    fn create_work(&self, entity: models::WorkEntity, editgroup_id: Option<String>) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
+        self.api().create_work(entity, editgroup_id, &self.context())
     }
 
-    fn delete_release(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
-        self.api().delete_release(id, editgroup, &self.context())
+    fn delete_release(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
+        self.api().delete_release(ident, editgroup_id, &self.context())
     }
 
     fn delete_release_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteReleaseEditResponse, Error = ApiError> + Send> {
         self.api().delete_release_edit(edit_id, &self.context())
     }
 
-    fn get_release(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
-        self.api().get_release(id, expand, hide, &self.context())
+    fn get_release(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseResponse, Error = ApiError> + Send> {
+        self.api().get_release(ident, expand, hide, &self.context())
     }
 
     fn get_release_edit(&self, edit_id: i64) -> Box<Future<Item = GetReleaseEditResponse, Error = ApiError> + Send> {
         self.api().get_release_edit(edit_id, &self.context())
     }
 
-    fn get_release_files(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
-        self.api().get_release_files(id, hide, &self.context())
+    fn get_release_files(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetReleaseFilesResponse, Error = ApiError> + Send> {
+        self.api().get_release_files(ident, hide, &self.context())
     }
 
-    fn get_release_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
-        self.api().get_release_history(id, limit, &self.context())
+    fn get_release_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetReleaseHistoryResponse, Error = ApiError> + Send> {
+        self.api().get_release_history(ident, limit, &self.context())
     }
 
-    fn get_release_redirects(&self, id: String) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
-        self.api().get_release_redirects(id, &self.context())
+    fn get_release_redirects(&self, ident: String) -> Box<Future<Item = GetReleaseRedirectsResponse, Error = ApiError> + Send> {
+        self.api().get_release_redirects(ident, &self.context())
     }
 
-    fn get_release_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send> {
-        self.api().get_release_revision(id, expand, hide, &self.context())
+    fn get_release_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetReleaseRevisionResponse, Error = ApiError> + Send> {
+        self.api().get_release_revision(rev_id, expand, hide, &self.context())
     }
 
     fn lookup_release(
@@ -1439,48 +1440,48 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> {
         self.api().lookup_release(doi, wikidata_qid, isbn13, pmid, pmcid, core_id, expand, hide, &self.context())
     }
 
-    fn update_release(&self, id: String, entity: models::ReleaseEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
-        self.api().update_release(id, entity, editgroup, &self.context())
+    fn update_release(&self, ident: String, entity: models::ReleaseEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
+        self.api().update_release(ident, entity, editgroup_id, &self.context())
     }
 
-    fn create_work_batch(&self, entity_list: &Vec<models::WorkEntity>, autoaccept: Option<bool>, editgroup: Option<String>) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send> {
-        self.api().create_work_batch(entity_list, autoaccept, editgroup, &self.context())
+    fn create_work_batch(&self, entity_list: &Vec<models::WorkEntity>, autoaccept: Option<bool>, editgroup_id: Option<String>) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send> {
+        self.api().create_work_batch(entity_list, autoaccept, editgroup_id, &self.context())
     }
 
-    fn delete_work(&self, id: String, editgroup: Option<String>) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
-        self.api().delete_work(id, editgroup, &self.context())
+    fn delete_work(&self, ident: String, editgroup_id: Option<String>) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
+        self.api().delete_work(ident, editgroup_id, &self.context())
     }
 
     fn delete_work_edit(&self, edit_id: i64) -> Box<Future<Item = DeleteWorkEditResponse, Error = ApiError> + Send> {
         self.api().delete_work_edit(edit_id, &self.context())
     }
 
-    fn get_work(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
-        self.api().get_work(id, expand, hide, &self.context())
+    fn get_work(&self, ident: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkResponse, Error = ApiError> + Send> {
+        self.api().get_work(ident, expand, hide, &self.context())
     }
 
     fn get_work_edit(&self, edit_id: i64) -> Box<Future<Item = GetWorkEditResponse, Error = ApiError> + Send> {
         self.api().get_work_edit(edit_id, &self.context())
     }
 
-    fn get_work_history(&self, id: String, limit: Option<i64>) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
-        self.api().get_work_history(id, limit, &self.context())
+    fn get_work_history(&self, ident: String, limit: Option<i64>) -> Box<Future<Item = GetWorkHistoryResponse, Error = ApiError> + Send> {
+        self.api().get_work_history(ident, limit, &self.context())
     }
 
-    fn get_work_redirects(&self, id: String) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
-        self.api().get_work_redirects(id, &self.context())
+    fn get_work_redirects(&self, ident: String) -> Box<Future<Item = GetWorkRedirectsResponse, Error = ApiError> + Send> {
+        self.api().get_work_redirects(ident, &self.context())
     }
 
-    fn get_work_releases(&self, id: String, hide: Option<String>) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
-        self.api().get_work_releases(id, hide, &self.context())
+    fn get_work_releases(&self, ident: String, hide: Option<String>) -> Box<Future<Item = GetWorkReleasesResponse, Error = ApiError> + Send> {
+        self.api().get_work_releases(ident, hide, &self.context())
     }
 
-    fn get_work_revision(&self, id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
-        self.api().get_work_revision(id, expand, hide, &self.context())
+    fn get_work_revision(&self, rev_id: String, expand: Option<String>, hide: Option<String>) -> Box<Future<Item = GetWorkRevisionResponse, Error = ApiError> + Send> {
+        self.api().get_work_revision(rev_id, expand, hide, &self.context())
     }
 
-    fn update_work(&self, id: String, entity: models::WorkEntity, editgroup: Option<String>) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
-        self.api().update_work(id, entity, editgroup, &self.context())
+    fn update_work(&self, ident: String, entity: models::WorkEntity, editgroup_id: Option<String>) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
+        self.api().update_work(ident, entity, editgroup_id, &self.context())
     }
 }
 
diff --git a/rust/fatcat-api-spec/src/models.rs b/rust/fatcat-api-spec/src/models.rs
index b8bd9a70..d640be42 100644
--- a/rust/fatcat-api-spec/src/models.rs
+++ b/rust/fatcat-api-spec/src/models.rs
@@ -184,9 +184,9 @@ impl CreatorEntity {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Editgroup {
     /// base32-encoded unique identifier
-    #[serde(rename = "id")]
+    #[serde(rename = "editgroup_id")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub editgroup_id: Option<String>,
 
     /// base32-encoded unique identifier
     #[serde(rename = "editor_id")]
@@ -208,7 +208,7 @@ pub struct Editgroup {
 impl Editgroup {
     pub fn new(editor_id: String) -> Editgroup {
         Editgroup {
-            id: None,
+            editgroup_id: None,
             editor_id: editor_id,
             description: None,
             extra: None,
@@ -254,9 +254,9 @@ impl EditgroupEdits {
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Editor {
-    #[serde(rename = "id")]
+    #[serde(rename = "editor_id")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub editor_id: Option<String>,
 
     #[serde(rename = "username")]
     pub username: String,
@@ -264,7 +264,7 @@ pub struct Editor {
 
 impl Editor {
     pub fn new(username: String) -> Editor {
-        Editor { id: None, username: username }
+        Editor { editor_id: None, username: username }
     }
 }
 
@@ -346,9 +346,9 @@ impl ErrorResponse {
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct FileEntity {
-    #[serde(rename = "releases")]
+    #[serde(rename = "release_ids")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub releases: Option<Vec<String>>,
+    pub release_ids: Option<Vec<String>>,
 
     #[serde(rename = "mimetype")]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -406,7 +406,7 @@ pub struct FileEntity {
 impl FileEntity {
     pub fn new() -> FileEntity {
         FileEntity {
-            releases: None,
+            release_ids: None,
             mimetype: None,
             urls: None,
             sha256: None,
diff --git a/rust/fatcat-api-spec/src/server.rs b/rust/fatcat-api-spec/src/server.rs
index 84c691ef..6dec84b9 100644
--- a/rust/fatcat-api-spec/src/server.rs
+++ b/rust/fatcat-api-spec/src/server.rs
@@ -110,7 +110,7 @@ where
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -137,7 +137,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.create_container(param_entity, param_editgroup, context).wait() {
+                match api.create_container(param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateContainerResponse::CreatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -222,7 +222,7 @@ where
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_autoaccept = query_params.get("autoaccept").and_then(|list| list.first()).and_then(|x| x.parse::<bool>().ok());
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -249,7 +249,7 @@ where
                 };
                 let param_entity_list = param_entity_list.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity_list".to_string())))?;
 
-                match api.create_container_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup, context).wait() {
+                match api.create_container_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateContainerBatchResponse::CreatedEntities(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -318,7 +318,7 @@ where
 
     let api_clone = api.clone();
     router.delete(
-        "/v0/container/:id",
+        "/v0/container/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -332,25 +332,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.delete_container(param_id, param_editgroup, context).wait() {
+                match api.delete_container(param_ident, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         DeleteContainerResponse::DeletedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -500,7 +500,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/container/:id",
+        "/v0/container/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -514,18 +514,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -533,7 +533,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_container(param_id, param_expand, param_hide, context).wait() {
+                match api.get_container(param_ident, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetContainerResponse::FoundEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -683,7 +683,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/container/:id/history",
+        "/v0/container/:ident/history",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -697,25 +697,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_limit = query_params.get("limit").and_then(|list| list.first()).and_then(|x| x.parse::<i64>().ok());
 
-                match api.get_container_history(param_id, param_limit, context).wait() {
+                match api.get_container_history(param_ident, param_limit, context).wait() {
                     Ok(rsp) => match rsp {
                         GetContainerHistoryResponse::FoundEntityHistory(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -776,7 +776,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/container/:id/redirects",
+        "/v0/container/:ident/redirects",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -790,21 +790,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
-                match api.get_container_redirects(param_id, context).wait() {
+                match api.get_container_redirects(param_ident, context).wait() {
                     Ok(rsp) => match rsp {
                         GetContainerRedirectsResponse::FoundEntityRedirects(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -865,7 +865,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/container/rev/:id",
+        "/v0/container/rev/:rev_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -879,18 +879,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_rev_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("rev_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter rev_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter rev_id: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -898,7 +898,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_container_revision(param_id, param_expand, param_hide, context).wait() {
+                match api.get_container_revision(param_rev_id, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetContainerRevisionResponse::FoundEntityRevision(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1040,7 +1040,7 @@ where
 
     let api_clone = api.clone();
     router.put(
-        "/v0/container/:id",
+        "/v0/container/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1054,23 +1054,23 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -1097,7 +1097,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.update_container(param_id, param_entity, param_editgroup, context).wait() {
+                match api.update_container(param_ident, param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         UpdateContainerResponse::UpdatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1181,7 +1181,7 @@ where
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -1208,7 +1208,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.create_creator(param_entity, param_editgroup, context).wait() {
+                match api.create_creator(param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateCreatorResponse::CreatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1293,7 +1293,7 @@ where
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_autoaccept = query_params.get("autoaccept").and_then(|list| list.first()).and_then(|x| x.parse::<bool>().ok());
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -1320,7 +1320,7 @@ where
                 };
                 let param_entity_list = param_entity_list.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity_list".to_string())))?;
 
-                match api.create_creator_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup, context).wait() {
+                match api.create_creator_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateCreatorBatchResponse::CreatedEntities(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1389,7 +1389,7 @@ where
 
     let api_clone = api.clone();
     router.delete(
-        "/v0/creator/:id",
+        "/v0/creator/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1403,25 +1403,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.delete_creator(param_id, param_editgroup, context).wait() {
+                match api.delete_creator(param_ident, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         DeleteCreatorResponse::DeletedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1571,7 +1571,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/creator/:id",
+        "/v0/creator/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1585,18 +1585,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -1604,7 +1604,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_creator(param_id, param_expand, param_hide, context).wait() {
+                match api.get_creator(param_ident, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetCreatorResponse::FoundEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1754,7 +1754,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/creator/:id/history",
+        "/v0/creator/:ident/history",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1768,25 +1768,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_limit = query_params.get("limit").and_then(|list| list.first()).and_then(|x| x.parse::<i64>().ok());
 
-                match api.get_creator_history(param_id, param_limit, context).wait() {
+                match api.get_creator_history(param_ident, param_limit, context).wait() {
                     Ok(rsp) => match rsp {
                         GetCreatorHistoryResponse::FoundEntityHistory(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1847,7 +1847,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/creator/:id/redirects",
+        "/v0/creator/:ident/redirects",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1861,21 +1861,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
-                match api.get_creator_redirects(param_id, context).wait() {
+                match api.get_creator_redirects(param_ident, context).wait() {
                     Ok(rsp) => match rsp {
                         GetCreatorRedirectsResponse::FoundEntityRedirects(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -1936,7 +1936,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/creator/:id/releases",
+        "/v0/creator/:ident/releases",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -1950,25 +1950,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_creator_releases(param_id, param_hide, context).wait() {
+                match api.get_creator_releases(param_ident, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetCreatorReleasesResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2029,7 +2029,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/creator/rev/:id",
+        "/v0/creator/rev/:rev_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2043,18 +2043,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_rev_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("rev_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter rev_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter rev_id: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -2062,7 +2062,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_creator_revision(param_id, param_expand, param_hide, context).wait() {
+                match api.get_creator_revision(param_rev_id, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetCreatorRevisionResponse::FoundEntityRevision(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2204,7 +2204,7 @@ where
 
     let api_clone = api.clone();
     router.put(
-        "/v0/creator/:id",
+        "/v0/creator/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2218,23 +2218,23 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -2261,7 +2261,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.update_creator(param_id, param_entity, param_editgroup, context).wait() {
+                match api.update_creator(param_ident, param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         UpdateCreatorResponse::UpdatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2330,7 +2330,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/editor/:id",
+        "/v0/editor/:editor_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2344,21 +2344,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_editor_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("editor_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter editor_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter editor_id: {}", e))))?
                 };
 
-                match api.get_editor(param_id, context).wait() {
+                match api.get_editor(param_editor_id, context).wait() {
                     Ok(rsp) => match rsp {
                         GetEditorResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2419,7 +2419,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/editor/:id/changelog",
+        "/v0/editor/:editor_id/changelog",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2433,21 +2433,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_editor_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("editor_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter editor_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter editor_id: {}", e))))?
                 };
 
-                match api.get_editor_changelog(param_id, context).wait() {
+                match api.get_editor_changelog(param_editor_id, context).wait() {
                     Ok(rsp) => match rsp {
                         GetEditorChangelogResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2566,7 +2566,7 @@ where
 
     let api_clone = api.clone();
     router.post(
-        "/v0/editgroup/:id/accept",
+        "/v0/editgroup/:editgroup_id/accept",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2580,21 +2580,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_editgroup_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("editgroup_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter editgroup_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter editgroup_id: {}", e))))?
                 };
 
-                match api.accept_editgroup(param_id, context).wait() {
+                match api.accept_editgroup(param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         AcceptEditgroupResponse::MergedSuccessfully(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2818,7 +2818,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/changelog/:id",
+        "/v0/changelog/:index",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2832,21 +2832,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_index = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("index")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter index".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter index: {}", e))))?
                 };
 
-                match api.get_changelog_entry(param_id, context).wait() {
+                match api.get_changelog_entry(param_index, context).wait() {
                     Ok(rsp) => match rsp {
                         GetChangelogEntryResponse::FoundChangelogEntry(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -2897,7 +2897,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/editgroup/:id",
+        "/v0/editgroup/:editgroup_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -2911,21 +2911,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_editgroup_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("editgroup_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter editgroup_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter editgroup_id: {}", e))))?
                 };
 
-                match api.get_editgroup(param_id, context).wait() {
+                match api.get_editgroup(param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         GetEditgroupResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3001,7 +3001,7 @@ where
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -3028,7 +3028,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.create_file(param_entity, param_editgroup, context).wait() {
+                match api.create_file(param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateFileResponse::CreatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3113,7 +3113,7 @@ where
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_autoaccept = query_params.get("autoaccept").and_then(|list| list.first()).and_then(|x| x.parse::<bool>().ok());
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -3140,7 +3140,7 @@ where
                 };
                 let param_entity_list = param_entity_list.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity_list".to_string())))?;
 
-                match api.create_file_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup, context).wait() {
+                match api.create_file_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateFileBatchResponse::CreatedEntities(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3209,7 +3209,7 @@ where
 
     let api_clone = api.clone();
     router.delete(
-        "/v0/file/:id",
+        "/v0/file/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3223,25 +3223,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.delete_file(param_id, param_editgroup, context).wait() {
+                match api.delete_file(param_ident, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         DeleteFileResponse::DeletedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3391,7 +3391,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/file/:id",
+        "/v0/file/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3405,18 +3405,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -3424,7 +3424,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_file(param_id, param_expand, param_hide, context).wait() {
+                match api.get_file(param_ident, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetFileResponse::FoundEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3574,7 +3574,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/file/:id/history",
+        "/v0/file/:ident/history",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3588,25 +3588,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_limit = query_params.get("limit").and_then(|list| list.first()).and_then(|x| x.parse::<i64>().ok());
 
-                match api.get_file_history(param_id, param_limit, context).wait() {
+                match api.get_file_history(param_ident, param_limit, context).wait() {
                     Ok(rsp) => match rsp {
                         GetFileHistoryResponse::FoundEntityHistory(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3667,7 +3667,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/file/:id/redirects",
+        "/v0/file/:ident/redirects",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3681,21 +3681,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
-                match api.get_file_redirects(param_id, context).wait() {
+                match api.get_file_redirects(param_ident, context).wait() {
                     Ok(rsp) => match rsp {
                         GetFileRedirectsResponse::FoundEntityRedirects(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3756,7 +3756,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/file/rev/:id",
+        "/v0/file/rev/:rev_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3770,18 +3770,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_rev_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("rev_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter rev_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter rev_id: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -3789,7 +3789,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_file_revision(param_id, param_expand, param_hide, context).wait() {
+                match api.get_file_revision(param_rev_id, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetFileRevisionResponse::FoundEntityRevision(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -3932,7 +3932,7 @@ where
 
     let api_clone = api.clone();
     router.put(
-        "/v0/file/:id",
+        "/v0/file/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -3946,23 +3946,23 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -3989,7 +3989,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.update_file(param_id, param_entity, param_editgroup, context).wait() {
+                match api.update_file(param_ident, param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         UpdateFileResponse::UpdatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4073,7 +4073,7 @@ where
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -4100,7 +4100,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.create_release(param_entity, param_editgroup, context).wait() {
+                match api.create_release(param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateReleaseResponse::CreatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4185,7 +4185,7 @@ where
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_autoaccept = query_params.get("autoaccept").and_then(|list| list.first()).and_then(|x| x.parse::<bool>().ok());
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -4212,7 +4212,7 @@ where
                 };
                 let param_entity_list = param_entity_list.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity_list".to_string())))?;
 
-                match api.create_release_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup, context).wait() {
+                match api.create_release_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateReleaseBatchResponse::CreatedEntities(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4296,7 +4296,7 @@ where
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -4323,7 +4323,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.create_work(param_entity, param_editgroup, context).wait() {
+                match api.create_work(param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateWorkResponse::CreatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4392,7 +4392,7 @@ where
 
     let api_clone = api.clone();
     router.delete(
-        "/v0/release/:id",
+        "/v0/release/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -4406,25 +4406,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.delete_release(param_id, param_editgroup, context).wait() {
+                match api.delete_release(param_ident, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         DeleteReleaseResponse::DeletedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4574,7 +4574,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/release/:id",
+        "/v0/release/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -4588,18 +4588,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -4607,7 +4607,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_release(param_id, param_expand, param_hide, context).wait() {
+                match api.get_release(param_ident, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetReleaseResponse::FoundEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4757,7 +4757,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/release/:id/files",
+        "/v0/release/:ident/files",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -4771,25 +4771,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_release_files(param_id, param_hide, context).wait() {
+                match api.get_release_files(param_ident, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetReleaseFilesResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4850,7 +4850,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/release/:id/history",
+        "/v0/release/:ident/history",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -4864,25 +4864,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_limit = query_params.get("limit").and_then(|list| list.first()).and_then(|x| x.parse::<i64>().ok());
 
-                match api.get_release_history(param_id, param_limit, context).wait() {
+                match api.get_release_history(param_ident, param_limit, context).wait() {
                     Ok(rsp) => match rsp {
                         GetReleaseHistoryResponse::FoundEntityHistory(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -4943,7 +4943,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/release/:id/redirects",
+        "/v0/release/:ident/redirects",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -4957,21 +4957,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
-                match api.get_release_redirects(param_id, context).wait() {
+                match api.get_release_redirects(param_ident, context).wait() {
                     Ok(rsp) => match rsp {
                         GetReleaseRedirectsResponse::FoundEntityRedirects(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5032,7 +5032,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/release/rev/:id",
+        "/v0/release/rev/:rev_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5046,18 +5046,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_rev_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("rev_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter rev_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter rev_id: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -5065,7 +5065,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_release_revision(param_id, param_expand, param_hide, context).wait() {
+                match api.get_release_revision(param_rev_id, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetReleaseRevisionResponse::FoundEntityRevision(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5214,7 +5214,7 @@ where
 
     let api_clone = api.clone();
     router.put(
-        "/v0/release/:id",
+        "/v0/release/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5228,23 +5228,23 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -5271,7 +5271,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.update_release(param_id, param_entity, param_editgroup, context).wait() {
+                match api.update_release(param_ident, param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         UpdateReleaseResponse::UpdatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5356,7 +5356,7 @@ where
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_autoaccept = query_params.get("autoaccept").and_then(|list| list.first()).and_then(|x| x.parse::<bool>().ok());
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -5383,7 +5383,7 @@ where
                 };
                 let param_entity_list = param_entity_list.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity_list".to_string())))?;
 
-                match api.create_work_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup, context).wait() {
+                match api.create_work_batch(param_entity_list.as_ref(), param_autoaccept, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         CreateWorkBatchResponse::CreatedEntities(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5452,7 +5452,7 @@ where
 
     let api_clone = api.clone();
     router.delete(
-        "/v0/work/:id",
+        "/v0/work/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5466,25 +5466,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.delete_work(param_id, param_editgroup, context).wait() {
+                match api.delete_work(param_ident, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         DeleteWorkResponse::DeletedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5634,7 +5634,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/work/:id",
+        "/v0/work/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5648,18 +5648,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -5667,7 +5667,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_work(param_id, param_expand, param_hide, context).wait() {
+                match api.get_work(param_ident, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetWorkResponse::FoundEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5817,7 +5817,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/work/:id/history",
+        "/v0/work/:ident/history",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5831,25 +5831,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_limit = query_params.get("limit").and_then(|list| list.first()).and_then(|x| x.parse::<i64>().ok());
 
-                match api.get_work_history(param_id, param_limit, context).wait() {
+                match api.get_work_history(param_ident, param_limit, context).wait() {
                     Ok(rsp) => match rsp {
                         GetWorkHistoryResponse::FoundEntityHistory(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5910,7 +5910,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/work/:id/redirects",
+        "/v0/work/:ident/redirects",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -5924,21 +5924,21 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
-                match api.get_work_redirects(param_id, context).wait() {
+                match api.get_work_redirects(param_ident, context).wait() {
                     Ok(rsp) => match rsp {
                         GetWorkRedirectsResponse::FoundEntityRedirects(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -5999,7 +5999,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/work/:id/releases",
+        "/v0/work/:ident/releases",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -6013,25 +6013,25 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_work_releases(param_id, param_hide, context).wait() {
+                match api.get_work_releases(param_ident, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetWorkReleasesResponse::Found(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -6092,7 +6092,7 @@ where
 
     let api_clone = api.clone();
     router.get(
-        "/v0/work/rev/:id",
+        "/v0/work/rev/:rev_id",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -6106,18 +6106,18 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_rev_id = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("rev_id")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter rev_id".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter rev_id: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
@@ -6125,7 +6125,7 @@ where
                 let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
                 let param_hide = query_params.get("hide").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
-                match api.get_work_revision(param_id, param_expand, param_hide, context).wait() {
+                match api.get_work_revision(param_rev_id, param_expand, param_hide, context).wait() {
                     Ok(rsp) => match rsp {
                         GetWorkRevisionResponse::FoundEntityRevision(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");
@@ -6186,7 +6186,7 @@ where
 
     let api_clone = api.clone();
     router.put(
-        "/v0/work/:id",
+        "/v0/work/:ident",
         move |req: &mut Request| {
             let mut context = Context::default();
 
@@ -6200,23 +6200,23 @@ where
                 context.authorization = req.extensions.remove::<Authorization>();
 
                 // Path parameters
-                let param_id = {
+                let param_ident = {
                     let param = req
                         .extensions
                         .get::<Router>()
                         .ok_or_else(|| Response::with((status::InternalServerError, "An internal error occurred".to_string())))?
-                        .find("id")
-                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter id".to_string())))?;
+                        .find("ident")
+                        .ok_or_else(|| Response::with((status::BadRequest, "Missing path parameter ident".to_string())))?;
                     percent_decode(param.as_bytes())
                         .decode_utf8()
                         .map_err(|_| Response::with((status::BadRequest, format!("Couldn't percent-decode path parameter as UTF-8: {}", param))))?
                         .parse()
-                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter id: {}", e))))?
+                        .map_err(|e| Response::with((status::BadRequest, format!("Couldn't parse path parameter ident: {}", e))))?
                 };
 
                 // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response)
                 let query_params = req.get::<UrlEncodedQuery>().unwrap_or_default();
-                let param_editgroup = query_params.get("editgroup").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
+                let param_editgroup_id = query_params.get("editgroup_id").and_then(|list| list.first()).and_then(|x| x.parse::<String>().ok());
 
                 // Body parameters (note that non-required body parameters will ignore garbage
                 // values, rather than causing a 400 response). Produce warning header and logs for
@@ -6243,7 +6243,7 @@ where
                 };
                 let param_entity = param_entity.ok_or_else(|| Response::with((status::BadRequest, "Missing required body parameter entity".to_string())))?;
 
-                match api.update_work(param_id, param_entity, param_editgroup, context).wait() {
+                match api.update_work(param_ident, param_entity, param_editgroup_id, context).wait() {
                     Ok(rsp) => match rsp {
                         UpdateWorkResponse::UpdatedEntity(body) => {
                             let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize");