diff --git a/api/public_api.swagger.json b/api/public_api.swagger.json
index 5d918f0..394e2d1 100644
--- a/api/public_api.swagger.json
+++ b/api/public_api.swagger.json
@@ -7,9 +7,6 @@
     "contact": {}
   },
   "tags": [
-    {
-      "name": "PublicApiService"
-    },
     {
       "name": "Organizations",
       "description": "An Organization is the highest level of hierarchy in Turnkey. It can contain many Users, Private Keys, and Policies managed by a Root Quorum. The Root Quorum consists of a set of Users with a consensus threshold. This consensus threshold must be reached by Quorum members in order for any actions to take place.\n\nSee [Root Quorum](../managing-users/root-quorum) for more information"
@@ -24,15 +21,15 @@
     },
     {
       "name": "Wallets",
-      "description": "Wallets contain collections of deterministically generated cryptographic public / private key pairs that share a common seed. Turnkey securely holds the common seed, but only you can access it. In most cases, Wallets should be preferred over Private Keys since they can be represented by a mnemonic phrase, used across a variety of cryptographic curves, and can derive many addresses."
+      "description": "Wallets contain collections of deterministically generated cryptographic public / private key pairs that share a common seed. Turnkey securely holds the common seed, but only you can access it. In most cases, Wallets should be preferred over Private Keys since they can be represented by a mnemonic phrase, used across a variety of cryptographic curves, and can derive many addresses.\n\nDerived addresses can be used to create digital signatures using the corresponding underlying private key. See [Signers](./api#tag/Signers) for more information"
     },
     {
-      "name": "Signatures",
-      "description": "Signatures are used to validate the authenticity and integrity of a digital message. Signatures are a fundamental building block in blockchains. Turnkey makes it easy to produce signatures by allowing you to sign with an address. If Turnkey doesn't yet support an address format you need, you can generate and sign with the public key instead by using the address format `ADDRESS_FORMAT_COMPRESSED`."
+      "name": "Signers",
+      "description": "Signers allow you to create digitial signatures. Signatures are used to validate the authenticity and integrity of a digital message. Turnkey makes it easy to produce signatures by allowing you to sign with an address. If Turnkey doesn't yet support an address format you need, you can generate and sign with the public key instead by using the address format `ADDRESS_FORMAT_COMPRESSED`."
     },
     {
       "name": "Private Keys",
-      "description": "Private Keys are cryptographic public / private key pairs that can be used for cryptocurrency needs or more generalized encryption. Turnkey securely holds all Private Key materials for you, but only you can access them."
+      "description": "Private Keys are cryptographic public / private key pairs that can be used for cryptocurrency needs or more generalized encryption. Turnkey securely holds all private key materials for you, but only you can access them.\n\nThe Private Key ID or any derived address can be used to create digital signatures. See [Signers](./api#tag/Signers) for more information"
     },
     {
       "name": "Private Key Tags",
@@ -72,18 +69,12 @@
       "post": {
         "summary": "Get Activity",
         "description": "Get details about an Activity",
-        "operationId": "PublicApiService_GetActivity",
+        "operationId": "GetActivity",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -93,7 +84,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetActivityRequest"
+              "$ref": "#/definitions/GetActivityRequest"
             }
           }
         ],
@@ -104,18 +95,12 @@
       "post": {
         "summary": "Get Authenticator",
         "description": "Get details about an authenticator",
-        "operationId": "PublicApiService_GetAuthenticator",
+        "operationId": "GetAuthenticator",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetAuthenticatorResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetAuthenticatorResponse"
             }
           }
         },
@@ -125,7 +110,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetAuthenticatorRequest"
+              "$ref": "#/definitions/GetAuthenticatorRequest"
             }
           }
         ],
@@ -136,18 +121,12 @@
       "post": {
         "summary": "Get Authenticators",
         "description": "Get details about authenticators for a user",
-        "operationId": "PublicApiService_GetAuthenticators",
+        "operationId": "GetAuthenticators",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetAuthenticatorsResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetAuthenticatorsResponse"
             }
           }
         },
@@ -157,7 +136,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetAuthenticatorsRequest"
+              "$ref": "#/definitions/GetAuthenticatorsRequest"
             }
           }
         ],
@@ -168,18 +147,12 @@
       "post": {
         "summary": "Get Policy",
         "description": "Get details about a Policy",
-        "operationId": "PublicApiService_GetPolicy",
+        "operationId": "GetPolicy",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetPolicyResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetPolicyResponse"
             }
           }
         },
@@ -189,7 +162,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetPolicyRequest"
+              "$ref": "#/definitions/GetPolicyRequest"
             }
           }
         ],
@@ -200,18 +173,12 @@
       "post": {
         "summary": "Get Private Key",
         "description": "Get details about a Private Key",
-        "operationId": "PublicApiService_GetPrivateKey",
+        "operationId": "GetPrivateKey",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetPrivateKeyResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetPrivateKeyResponse"
             }
           }
         },
@@ -221,7 +188,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetPrivateKeyRequest"
+              "$ref": "#/definitions/GetPrivateKeyRequest"
             }
           }
         ],
@@ -232,18 +199,12 @@
       "post": {
         "summary": "Get User",
         "description": "Get details about a User",
-        "operationId": "PublicApiService_GetUser",
+        "operationId": "GetUser",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetUserResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetUserResponse"
             }
           }
         },
@@ -253,7 +214,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetUserRequest"
+              "$ref": "#/definitions/GetUserRequest"
             }
           }
         ],
@@ -264,18 +225,12 @@
       "post": {
         "summary": "List Activities",
         "description": "List all Activities within an Organization",
-        "operationId": "PublicApiService_GetActivities",
+        "operationId": "GetActivities",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetActivitiesResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetActivitiesResponse"
             }
           }
         },
@@ -285,7 +240,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetActivitiesRequest"
+              "$ref": "#/definitions/GetActivitiesRequest"
             }
           }
         ],
@@ -296,18 +251,12 @@
       "post": {
         "summary": "List Policies",
         "description": "List all Policies within an Organization",
-        "operationId": "PublicApiService_GetPolicies",
+        "operationId": "GetPolicies",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetPoliciesResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetPoliciesResponse"
             }
           }
         },
@@ -317,7 +266,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetPoliciesRequest"
+              "$ref": "#/definitions/GetPoliciesRequest"
             }
           }
         ],
@@ -328,18 +277,12 @@
       "post": {
         "summary": "List Private Keys",
         "description": "List all Private Keys within an Organization",
-        "operationId": "PublicApiService_GetPrivateKeys",
+        "operationId": "GetPrivateKeys",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetPrivateKeysResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetPrivateKeysResponse"
             }
           }
         },
@@ -349,7 +292,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetPrivateKeysRequest"
+              "$ref": "#/definitions/GetPrivateKeysRequest"
             }
           }
         ],
@@ -360,18 +303,12 @@
       "post": {
         "summary": "List Users",
         "description": "List all Users within an Organization",
-        "operationId": "PublicApiService_GetUsers",
+        "operationId": "GetUsers",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetUsersResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetUsersResponse"
             }
           }
         },
@@ -381,7 +318,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetUsersRequest"
+              "$ref": "#/definitions/GetUsersRequest"
             }
           }
         ],
@@ -392,18 +329,12 @@
       "post": {
         "summary": "Who am I?",
         "description": "Get basic information about your current API or WebAuthN user and their organization. Affords Sub-Organization look ups via Parent Organization for WebAuthN users.",
-        "operationId": "PublicApiService_GetWhoami",
+        "operationId": "GetWhoami",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1GetWhoamiResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/GetWhoamiResponse"
             }
           }
         },
@@ -413,29 +344,23 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1GetWhoamiRequest"
+              "$ref": "#/definitions/GetWhoamiRequest"
             }
           }
         ],
-        "tags": ["Who am I?"]
+        "tags": ["Sessions"]
       }
     },
     "/public/v1/submit/approve_activity": {
       "post": {
         "summary": "Approve Activity",
         "description": "Approve an Activity",
-        "operationId": "PublicApiService_ApproveActivity",
+        "operationId": "ApproveActivity",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -445,7 +370,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1ApproveActivityRequest"
+              "$ref": "#/definitions/ApproveActivityRequest"
             }
           }
         ],
@@ -456,18 +381,12 @@
       "post": {
         "summary": "Create API Keys",
         "description": "Add api keys to an existing User",
-        "operationId": "PublicApiService_CreateApiKeys",
+        "operationId": "CreateApiKeys",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -477,7 +396,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateApiKeysRequest"
+              "$ref": "#/definitions/CreateApiKeysRequest"
             }
           }
         ],
@@ -488,18 +407,12 @@
       "post": {
         "summary": "Create Authenticators",
         "description": "Create Authenticators to authenticate requests to Turnkey",
-        "operationId": "PublicApiService_CreateAuthenticators",
+        "operationId": "CreateAuthenticators",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -509,7 +422,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateAuthenticatorsRequest"
+              "$ref": "#/definitions/CreateAuthenticatorsRequest"
             }
           }
         ],
@@ -520,18 +433,12 @@
       "post": {
         "summary": "Create Invitations",
         "description": "Create Invitations to join an existing Organization",
-        "operationId": "PublicApiService_CreateInvitations",
+        "operationId": "CreateInvitations",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -541,7 +448,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateInvitationsRequest"
+              "$ref": "#/definitions/CreateInvitationsRequest"
             }
           }
         ],
@@ -552,18 +459,12 @@
       "post": {
         "summary": "Create Policy",
         "description": "Create a new Policy",
-        "operationId": "PublicApiService_CreatePolicy",
+        "operationId": "CreatePolicy",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -573,7 +474,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreatePolicyRequest"
+              "$ref": "#/definitions/CreatePolicyRequest"
             }
           }
         ],
@@ -584,18 +485,12 @@
       "post": {
         "summary": "Create Private Key Tag",
         "description": "Create a private key tag and add it to private keys.",
-        "operationId": "PublicApiService_CreatePrivateKeyTag",
+        "operationId": "CreatePrivateKeyTag",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -605,7 +500,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreatePrivateKeyTagRequest"
+              "$ref": "#/definitions/CreatePrivateKeyTagRequest"
             }
           }
         ],
@@ -616,18 +511,12 @@
       "post": {
         "summary": "Create Private Keys",
         "description": "Create new Private Keys",
-        "operationId": "PublicApiService_CreatePrivateKeys",
+        "operationId": "CreatePrivateKeys",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -637,7 +526,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreatePrivateKeysRequest"
+              "$ref": "#/definitions/CreatePrivateKeysRequest"
             }
           }
         ],
@@ -648,18 +537,12 @@
       "post": {
         "summary": "Create Sub-Organization",
         "description": "Create a new Sub-Organization",
-        "operationId": "PublicApiService_CreateSubOrganization",
+        "operationId": "CreateSubOrganization",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -669,7 +552,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateSubOrganizationRequest"
+              "$ref": "#/definitions/CreateSubOrganizationRequest"
             }
           }
         ],
@@ -680,18 +563,12 @@
       "post": {
         "summary": "Create User Tag",
         "description": "Create a user tag and add it to users.",
-        "operationId": "PublicApiService_CreateUserTag",
+        "operationId": "CreateUserTag",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -701,7 +578,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateUserTagRequest"
+              "$ref": "#/definitions/CreateUserTagRequest"
             }
           }
         ],
@@ -712,18 +589,12 @@
       "post": {
         "summary": "Create Users",
         "description": "Create Users in an existing Organization",
-        "operationId": "PublicApiService_CreateUsers",
+        "operationId": "CreateUsers",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -733,7 +604,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateUsersRequest"
+              "$ref": "#/definitions/CreateUsersRequest"
             }
           }
         ],
@@ -744,18 +615,12 @@
       "post": {
         "summary": "Create Wallet",
         "description": "Create a Wallet and derive addresses",
-        "operationId": "PublicApiService_CreateWallet",
+        "operationId": "CreateWallet",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -765,7 +630,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateWalletRequest"
+              "$ref": "#/definitions/CreateWalletRequest"
             }
           }
         ],
@@ -776,18 +641,12 @@
       "post": {
         "summary": "Create Wallet Accounts",
         "description": "Derive additional addresses using an existing wallet",
-        "operationId": "PublicApiService_CreateWalletAccounts",
+        "operationId": "CreateWalletAccounts",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -797,7 +656,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1CreateWalletAccountsRequest"
+              "$ref": "#/definitions/CreateWalletAccountsRequest"
             }
           }
         ],
@@ -808,18 +667,12 @@
       "post": {
         "summary": "Delete API Keys",
         "description": "Remove api keys from a User",
-        "operationId": "PublicApiService_DeleteApiKeys",
+        "operationId": "DeleteApiKeys",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -829,7 +682,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1DeleteApiKeysRequest"
+              "$ref": "#/definitions/DeleteApiKeysRequest"
             }
           }
         ],
@@ -840,18 +693,12 @@
       "post": {
         "summary": "Delete Authenticators",
         "description": "Remove authenticators from a User",
-        "operationId": "PublicApiService_DeleteAuthenticators",
+        "operationId": "DeleteAuthenticators",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -861,7 +708,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1DeleteAuthenticatorsRequest"
+              "$ref": "#/definitions/DeleteAuthenticatorsRequest"
             }
           }
         ],
@@ -872,18 +719,12 @@
       "post": {
         "summary": "Delete Invitation",
         "description": "Delete an existing Invitation",
-        "operationId": "PublicApiService_DeleteInvitation",
+        "operationId": "DeleteInvitation",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -893,7 +734,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1DeleteInvitationRequest"
+              "$ref": "#/definitions/DeleteInvitationRequest"
             }
           }
         ],
@@ -904,18 +745,12 @@
       "post": {
         "summary": "Delete Policy",
         "description": "Delete an existing Policy",
-        "operationId": "PublicApiService_DeletePolicy",
+        "operationId": "DeletePolicy",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -925,7 +760,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1DeletePolicyRequest"
+              "$ref": "#/definitions/DeletePolicyRequest"
             }
           }
         ],
@@ -936,18 +771,12 @@
       "post": {
         "summary": "Export Private Key",
         "description": "Exports a Private Key",
-        "operationId": "PublicApiService_ExportPrivateKey",
+        "operationId": "ExportPrivateKey",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -957,7 +786,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1ExportPrivateKeyRequest"
+              "$ref": "#/definitions/ExportPrivateKeyRequest"
             }
           }
         ],
@@ -968,18 +797,12 @@
       "post": {
         "summary": "Export Wallet",
         "description": "Exports a Wallet",
-        "operationId": "PublicApiService_ExportWallet",
+        "operationId": "ExportWallet",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -989,7 +812,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1ExportWalletRequest"
+              "$ref": "#/definitions/ExportWalletRequest"
             }
           }
         ],
@@ -1000,18 +823,12 @@
       "post": {
         "summary": "Init Email Recovery",
         "description": "Initializes a new email recovery",
-        "operationId": "PublicApiService_InitUserEmailRecovery",
+        "operationId": "InitUserEmailRecovery",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1021,7 +838,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1InitUserEmailRecoveryRequest"
+              "$ref": "#/definitions/InitUserEmailRecoveryRequest"
             }
           }
         ],
@@ -1032,18 +849,12 @@
       "post": {
         "summary": "Recover a user",
         "description": "Completes the process of recovering a user by adding an authenticator",
-        "operationId": "PublicApiService_RecoverUser",
+        "operationId": "RecoverUser",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1053,7 +864,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1RecoverUserRequest"
+              "$ref": "#/definitions/RecoverUserRequest"
             }
           }
         ],
@@ -1064,18 +875,12 @@
       "post": {
         "summary": "Reject Activity",
         "description": "Reject an Activity",
-        "operationId": "PublicApiService_RejectActivity",
+        "operationId": "RejectActivity",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1085,7 +890,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1RejectActivityRequest"
+              "$ref": "#/definitions/RejectActivityRequest"
             }
           }
         ],
@@ -1096,18 +901,12 @@
       "post": {
         "summary": "Remove Organization Feature",
         "description": "Removes an organization feature",
-        "operationId": "PublicApiService_RemoveOrganizationFeature",
+        "operationId": "RemoveOrganizationFeature",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1117,7 +916,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1RemoveOrganizationFeatureRequest"
+              "$ref": "#/definitions/RemoveOrganizationFeatureRequest"
             }
           }
         ],
@@ -1128,18 +927,12 @@
       "post": {
         "summary": "Set Organization Feature",
         "description": "Sets an organization feature",
-        "operationId": "PublicApiService_SetOrganizationFeature",
+        "operationId": "SetOrganizationFeature",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1149,7 +942,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1SetOrganizationFeatureRequest"
+              "$ref": "#/definitions/SetOrganizationFeatureRequest"
             }
           }
         ],
@@ -1160,18 +953,12 @@
       "post": {
         "summary": "Sign Raw Payload",
         "description": "Sign a raw payload",
-        "operationId": "PublicApiService_SignRawPayload",
+        "operationId": "SignRawPayload",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1181,29 +968,23 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1SignRawPayloadRequest"
+              "$ref": "#/definitions/SignRawPayloadRequest"
             }
           }
         ],
-        "tags": ["Signatures"]
+        "tags": ["Signers"]
       }
     },
     "/public/v1/submit/sign_transaction": {
       "post": {
         "summary": "Sign Transaction",
         "description": "Sign a transaction",
-        "operationId": "PublicApiService_SignTransaction",
+        "operationId": "SignTransaction",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1213,29 +994,23 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1SignTransactionRequest"
+              "$ref": "#/definitions/SignTransactionRequest"
             }
           }
         ],
-        "tags": ["Signatures"]
+        "tags": ["Signers"]
       }
     },
     "/public/v1/submit/update_allowed_origins": {
       "post": {
         "summary": "Update Allowable Origins",
         "description": "Update the allowable origins for credentials and requests",
-        "operationId": "PublicApiService_UpdateAllowedOrigins",
+        "operationId": "UpdateAllowedOrigins",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1245,7 +1020,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdateAllowedOriginsRequest"
+              "$ref": "#/definitions/UpdateAllowedOriginsRequest"
             }
           }
         ],
@@ -1256,18 +1031,12 @@
       "post": {
         "summary": "Update Policy",
         "description": "Update an existing Policy",
-        "operationId": "PublicApiService_UpdatePolicy",
+        "operationId": "UpdatePolicy",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1277,7 +1046,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdatePolicyRequest"
+              "$ref": "#/definitions/UpdatePolicyRequest"
             }
           }
         ],
@@ -1288,18 +1057,12 @@
       "post": {
         "summary": "Update Private Key Tag",
         "description": "Update human-readable name or associated private keys. Note that this activity is atomic: all of the updates will succeed at once, or all of them will fail.",
-        "operationId": "PublicApiService_UpdatePrivateKeyTag",
+        "operationId": "UpdatePrivateKeyTag",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1309,7 +1072,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdatePrivateKeyTagRequest"
+              "$ref": "#/definitions/UpdatePrivateKeyTagRequest"
             }
           }
         ],
@@ -1320,18 +1083,12 @@
       "post": {
         "summary": "Update Root Quorum",
         "description": "Set the threshold and members of the root quorum. This must be approved by the current root quorum.",
-        "operationId": "PublicApiService_UpdateRootQuorum",
+        "operationId": "UpdateRootQuorum",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1341,7 +1098,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdateRootQuorumRequest"
+              "$ref": "#/definitions/UpdateRootQuorumRequest"
             }
           }
         ],
@@ -1352,18 +1109,12 @@
       "post": {
         "summary": "Update User",
         "description": "Update a User in an existing Organization",
-        "operationId": "PublicApiService_UpdateUser",
+        "operationId": "UpdateUser",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1373,7 +1124,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdateUserRequest"
+              "$ref": "#/definitions/UpdateUserRequest"
             }
           }
         ],
@@ -1384,18 +1135,12 @@
       "post": {
         "summary": "Update User Tag",
         "description": "Update human-readable name or associated users. Note that this activity is atomic: all of the updates will succeed at once, or all of them will fail.",
-        "operationId": "PublicApiService_UpdateUserTag",
+        "operationId": "UpdateUserTag",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/v1ActivityResponse"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
+              "$ref": "#/definitions/ActivityResponse"
             }
           }
         },
@@ -1405,7 +1150,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/v1UpdateUserTagRequest"
+              "$ref": "#/definitions/UpdateUserTagRequest"
             }
           }
         ],
@@ -1414,232 +1159,7 @@
     }
   },
   "definitions": {
-    "externaldatav1AccessType": {
-      "type": "string",
-      "enum": ["ACCESS_TYPE_WEB", "ACCESS_TYPE_API", "ACCESS_TYPE_ALL"]
-    },
-    "externaldatav1Address": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/externaldatav1AddressFormat"
-        },
-        "address": {
-          "type": "string"
-        }
-      }
-    },
-    "externaldatav1AddressFormat": {
-      "type": "string",
-      "enum": [
-        "ADDRESS_FORMAT_UNCOMPRESSED",
-        "ADDRESS_FORMAT_COMPRESSED",
-        "ADDRESS_FORMAT_ETHEREUM"
-      ]
-    },
-    "externaldatav1AuthenticatorTransport": {
-      "type": "string",
-      "enum": [
-        "AUTHENTICATOR_TRANSPORT_BLE",
-        "AUTHENTICATOR_TRANSPORT_INTERNAL",
-        "AUTHENTICATOR_TRANSPORT_NFC",
-        "AUTHENTICATOR_TRANSPORT_USB",
-        "AUTHENTICATOR_TRANSPORT_HYBRID"
-      ]
-    },
-    "externaldatav1Credential": {
-      "type": "object",
-      "properties": {
-        "publicKey": {
-          "type": "string",
-          "description": "The public component of a cryptographic key pair used to sign messages and transactions."
-        },
-        "type": {
-          "$ref": "#/definitions/externaldatav1CredentialType"
-        }
-      },
-      "required": ["publicKey", "type"]
-    },
-    "externaldatav1CredentialType": {
-      "type": "string",
-      "enum": [
-        "CREDENTIAL_TYPE_WEBAUTHN_AUTHENTICATOR",
-        "CREDENTIAL_TYPE_API_KEY_P256",
-        "CREDENTIAL_TYPE_RECOVER_USER_KEY_P256"
-      ]
-    },
-    "externaldatav1Curve": {
-      "type": "string",
-      "enum": ["CURVE_SECP256K1", "CURVE_ED25519"]
-    },
-    "externaldatav1Effect": {
-      "type": "string",
-      "enum": ["EFFECT_ALLOW", "EFFECT_DENY"]
-    },
-    "externaldatav1Operator": {
-      "type": "string",
-      "enum": [
-        "OPERATOR_EQUAL",
-        "OPERATOR_MORE_THAN",
-        "OPERATOR_MORE_THAN_OR_EQUAL",
-        "OPERATOR_LESS_THAN",
-        "OPERATOR_LESS_THAN_OR_EQUAL",
-        "OPERATOR_CONTAINS",
-        "OPERATOR_NOT_EQUAL",
-        "OPERATOR_IN",
-        "OPERATOR_NOT_IN",
-        "OPERATOR_CONTAINS_ONE",
-        "OPERATOR_CONTAINS_ALL"
-      ]
-    },
-    "externaldatav1Selector": {
-      "type": "object",
-      "properties": {
-        "subject": {
-          "type": "string",
-          "description": "The resource being referenced within a policy (e.g., user.tags or activities.type)."
-        },
-        "operator": {
-          "$ref": "#/definitions/externaldatav1Operator",
-          "description": "Logical operators like OPERATOR_CONTAINS or OPERATOR_EQUAL."
-        },
-        "targets": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "The specific parameter from the subject being referenced, like a specific user ID."
-        }
-      },
-      "required": ["subject", "operator", "targets"]
-    },
-    "externaldatav1Timestamp": {
-      "type": "object",
-      "properties": {
-        "seconds": {
-          "type": "string"
-        },
-        "nanos": {
-          "type": "string"
-        }
-      },
-      "required": ["seconds", "nanos"]
-    },
-    "immutableactivityv1AccessType": {
-      "type": "string",
-      "enum": ["ACCESS_TYPE_WEB", "ACCESS_TYPE_API", "ACCESS_TYPE_ALL"]
-    },
-    "immutableactivityv1Address": {
-      "type": "object",
-      "properties": {
-        "format": {
-          "$ref": "#/definitions/immutablecommonv1AddressFormat"
-        },
-        "address": {
-          "type": "string"
-        }
-      }
-    },
-    "immutableactivityv1Effect": {
-      "type": "string",
-      "enum": ["EFFECT_ALLOW", "EFFECT_DENY"]
-    },
-    "immutableactivityv1HashFunction": {
-      "type": "string",
-      "enum": [
-        "HASH_FUNCTION_NO_OP",
-        "HASH_FUNCTION_SHA256",
-        "HASH_FUNCTION_KECCAK256",
-        "HASH_FUNCTION_NOT_APPLICABLE"
-      ]
-    },
-    "immutableactivityv1Operator": {
-      "type": "string",
-      "enum": [
-        "OPERATOR_EQUAL",
-        "OPERATOR_MORE_THAN",
-        "OPERATOR_MORE_THAN_OR_EQUAL",
-        "OPERATOR_LESS_THAN",
-        "OPERATOR_LESS_THAN_OR_EQUAL",
-        "OPERATOR_CONTAINS",
-        "OPERATOR_NOT_EQUAL",
-        "OPERATOR_IN",
-        "OPERATOR_NOT_IN",
-        "OPERATOR_CONTAINS_ONE",
-        "OPERATOR_CONTAINS_ALL"
-      ]
-    },
-    "immutableactivityv1PayloadEncoding": {
-      "type": "string",
-      "enum": ["PAYLOAD_ENCODING_HEXADECIMAL", "PAYLOAD_ENCODING_TEXT_UTF8"]
-    },
-    "immutableactivityv1Selector": {
-      "type": "object",
-      "properties": {
-        "subject": {
-          "type": "string"
-        },
-        "operator": {
-          "$ref": "#/definitions/immutableactivityv1Operator"
-        },
-        "target": {
-          "type": "string"
-        }
-      }
-    },
-    "immutablecommonv1AddressFormat": {
-      "type": "string",
-      "enum": [
-        "ADDRESS_FORMAT_UNCOMPRESSED",
-        "ADDRESS_FORMAT_COMPRESSED",
-        "ADDRESS_FORMAT_ETHEREUM",
-        "ADDRESS_FORMAT_SOLANA",
-        "ADDRESS_FORMAT_COSMOS"
-      ]
-    },
-    "immutablecommonv1Curve": {
-      "type": "string",
-      "enum": ["CURVE_SECP256K1", "CURVE_ED25519"]
-    },
-    "immutablewebauthnv1AuthenticatorTransport": {
-      "type": "string",
-      "enum": [
-        "AUTHENTICATOR_TRANSPORT_BLE",
-        "AUTHENTICATOR_TRANSPORT_INTERNAL",
-        "AUTHENTICATOR_TRANSPORT_NFC",
-        "AUTHENTICATOR_TRANSPORT_USB",
-        "AUTHENTICATOR_TRANSPORT_HYBRID"
-      ]
-    },
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "@type": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {}
-    },
-    "rpcStatus": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
-    },
-    "v1AcceptInvitationIntent": {
+    "AcceptInvitationIntent": {
       "type": "object",
       "properties": {
         "invitationId": {
@@ -1651,13 +1171,13 @@
           "description": "Unique identifier for a given User."
         },
         "authenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParams",
+          "$ref": "#/definitions/AuthenticatorParams",
           "description": "WebAuthN hardware devices that can be used to log in to the Turnkey web app."
         }
       },
       "required": ["invitationId", "userId", "authenticator"]
     },
-    "v1AcceptInvitationIntentV2": {
+    "AcceptInvitationIntentV2": {
       "type": "object",
       "properties": {
         "invitationId": {
@@ -1669,13 +1189,13 @@
           "description": "Unique identifier for a given User."
         },
         "authenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParamsV2",
+          "$ref": "#/definitions/AuthenticatorParamsV2",
           "description": "WebAuthN hardware devices that can be used to log in to the Turnkey web app."
         }
       },
       "required": ["invitationId", "userId", "authenticator"]
     },
-    "v1AcceptInvitationResult": {
+    "AcceptInvitationResult": {
       "type": "object",
       "properties": {
         "invitationId": {
@@ -1689,7 +1209,7 @@
       },
       "required": ["invitationId", "userId"]
     },
-    "v1ActivateBillingTierIntent": {
+    "ActivateBillingTierIntent": {
       "type": "object",
       "properties": {
         "productId": {
@@ -1699,7 +1219,7 @@
       },
       "required": ["productId"]
     },
-    "v1ActivateBillingTierResult": {
+    "ActivateBillingTierResult": {
       "type": "object",
       "properties": {
         "productId": {
@@ -1709,7 +1229,7 @@
       },
       "required": ["productId"]
     },
-    "v1Activity": {
+    "Activity": {
       "type": "object",
       "properties": {
         "id": {
@@ -1721,26 +1241,26 @@
           "description": "Unique identifier for a given Organization."
         },
         "status": {
-          "$ref": "#/definitions/v1ActivityStatus",
+          "$ref": "#/definitions/ActivityStatus",
           "description": "The current processing status of a specified Activity."
         },
         "type": {
-          "$ref": "#/definitions/v1ActivityType",
+          "$ref": "#/definitions/ActivityType",
           "description": "Type of Activity, such as Add User, or Sign Transaction."
         },
         "intent": {
-          "$ref": "#/definitions/v1Intent",
+          "$ref": "#/definitions/Intent",
           "description": "Intent object crafted by Turnkey based on the user request, used to assess the permissibility of an action."
         },
         "result": {
-          "$ref": "#/definitions/v1Result",
+          "$ref": "#/definitions/Result",
           "description": "Result of the intended action."
         },
         "votes": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Vote"
+            "$ref": "#/definitions/Vote"
           },
           "description": "A list of objects representing a particular User's approval or rejection of a Consensus request, including all relevant metadata."
         },
@@ -1755,10 +1275,10 @@
           "type": "boolean"
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         }
       },
       "required": [
@@ -1776,17 +1296,17 @@
         "updatedAt"
       ]
     },
-    "v1ActivityResponse": {
+    "ActivityResponse": {
       "type": "object",
       "properties": {
         "activity": {
-          "$ref": "#/definitions/v1Activity",
+          "$ref": "#/definitions/Activity",
           "description": "An action that can that can be taken within the Turnkey infrastructure."
         }
       },
       "required": ["activity"]
     },
-    "v1ActivityStatus": {
+    "ActivityStatus": {
       "type": "string",
       "enum": [
         "ACTIVITY_STATUS_CREATED",
@@ -1797,7 +1317,7 @@
         "ACTIVITY_STATUS_REJECTED"
       ]
     },
-    "v1ActivityType": {
+    "ActivityType": {
       "type": "string",
       "enum": [
         "ACTIVITY_TYPE_CREATE_API_KEYS",
@@ -1857,11 +1377,11 @@
         "ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V4"
       ]
     },
-    "v1ApiKey": {
+    "ApiKey": {
       "type": "object",
       "properties": {
         "credential": {
-          "$ref": "#/definitions/externaldatav1Credential",
+          "$ref": "#/definitions/external.data.v1.Credential",
           "description": "A User credential that can be used to authenticate to Turnkey."
         },
         "apiKeyId": {
@@ -1873,10 +1393,10 @@
           "description": "Human-readable name for an API Key."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         }
       },
       "required": [
@@ -1887,7 +1407,7 @@
         "updatedAt"
       ]
     },
-    "v1ApiKeyParams": {
+    "ApiKeyParams": {
       "type": "object",
       "properties": {
         "apiKeyName": {
@@ -1901,7 +1421,7 @@
       },
       "required": ["apiKeyName", "publicKey"]
     },
-    "v1ApiOnlyUserParams": {
+    "ApiOnlyUserParams": {
       "type": "object",
       "properties": {
         "userName": {
@@ -1923,14 +1443,14 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKeyParams"
+            "$ref": "#/definitions/ApiKeyParams"
           },
           "description": "A list of API Key parameters."
         }
       },
       "required": ["userName", "userTags", "apiKeys"]
     },
-    "v1ApproveActivityIntent": {
+    "ApproveActivityIntent": {
       "type": "object",
       "properties": {
         "fingerprint": {
@@ -1940,7 +1460,7 @@
       },
       "required": ["fingerprint"]
     },
-    "v1ApproveActivityRequest": {
+    "ApproveActivityRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -1956,12 +1476,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1ApproveActivityIntent"
+          "$ref": "#/definitions/ApproveActivityIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1Attestation": {
+    "Attestation": {
       "type": "object",
       "properties": {
         "credentialId": {
@@ -1979,7 +1499,7 @@
         "transports": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/immutablewebauthnv1AuthenticatorTransport"
+            "$ref": "#/definitions/webauthn.v1.AuthenticatorTransport"
           },
           "description": "The type of authenticator transports."
         }
@@ -1991,13 +1511,13 @@
         "transports"
       ]
     },
-    "v1Authenticator": {
+    "Authenticator": {
       "type": "object",
       "properties": {
         "transports": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/externaldatav1AuthenticatorTransport"
+            "$ref": "#/definitions/data.v1.AuthenticatorTransport"
           },
           "description": "Types of transports that may be used by an Authenticator (e.g., USB, NFC, BLE)."
         },
@@ -2017,7 +1537,7 @@
           "description": "The type of Authenticator device."
         },
         "credential": {
-          "$ref": "#/definitions/externaldatav1Credential",
+          "$ref": "#/definitions/external.data.v1.Credential",
           "description": "A User credential that can be used to authenticate to Turnkey."
         },
         "authenticatorId": {
@@ -2029,10 +1549,10 @@
           "description": "Human-readable name for an Authenticator."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         }
       },
       "required": [
@@ -2048,7 +1568,7 @@
         "updatedAt"
       ]
     },
-    "v1AuthenticatorAttestationResponse": {
+    "AuthenticatorAttestationResponse": {
       "type": "object",
       "properties": {
         "clientDataJson": {
@@ -2060,7 +1580,7 @@
         "transports": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/immutablewebauthnv1AuthenticatorTransport"
+            "$ref": "#/definitions/webauthn.v1.AuthenticatorTransport"
           }
         },
         "authenticatorAttachment": {
@@ -2071,7 +1591,7 @@
       },
       "required": ["clientDataJson", "attestationObject"]
     },
-    "v1AuthenticatorParams": {
+    "AuthenticatorParams": {
       "type": "object",
       "properties": {
         "authenticatorName": {
@@ -2083,7 +1603,7 @@
           "description": "Unique identifier for a given User."
         },
         "attestation": {
-          "$ref": "#/definitions/v1PublicKeyCredentialWithAttestation"
+          "$ref": "#/definitions/PublicKeyCredentialWithAttestation"
         },
         "challenge": {
           "type": "string",
@@ -2092,7 +1612,7 @@
       },
       "required": ["authenticatorName", "userId", "attestation", "challenge"]
     },
-    "v1AuthenticatorParamsV2": {
+    "AuthenticatorParamsV2": {
       "type": "object",
       "properties": {
         "authenticatorName": {
@@ -2104,20 +1624,20 @@
           "description": "Challenge presented for authentication purposes."
         },
         "attestation": {
-          "$ref": "#/definitions/v1Attestation",
+          "$ref": "#/definitions/Attestation",
           "description": "The attestation that proves custody of the authenticator and provides metadata about it."
         }
       },
       "required": ["authenticatorName", "challenge", "attestation"]
     },
-    "v1CreateApiKeysIntent": {
+    "CreateApiKeysIntent": {
       "type": "object",
       "properties": {
         "apiKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKeyParams"
+            "$ref": "#/definitions/ApiKeyParams"
           },
           "description": "A list of API Keys."
         },
@@ -2128,7 +1648,7 @@
       },
       "required": ["apiKeys", "userId"]
     },
-    "v1CreateApiKeysRequest": {
+    "CreateApiKeysRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2144,12 +1664,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateApiKeysIntent"
+          "$ref": "#/definitions/CreateApiKeysIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateApiKeysResult": {
+    "CreateApiKeysResult": {
       "type": "object",
       "properties": {
         "apiKeyIds": {
@@ -2162,21 +1682,21 @@
       },
       "required": ["apiKeyIds"]
     },
-    "v1CreateApiOnlyUsersIntent": {
+    "CreateApiOnlyUsersIntent": {
       "type": "object",
       "properties": {
         "apiOnlyUsers": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiOnlyUserParams"
+            "$ref": "#/definitions/ApiOnlyUserParams"
           },
           "description": "A list of API-only Users to create."
         }
       },
       "required": ["apiOnlyUsers"]
     },
-    "v1CreateApiOnlyUsersResult": {
+    "CreateApiOnlyUsersResult": {
       "type": "object",
       "properties": {
         "userIds": {
@@ -2189,14 +1709,14 @@
       },
       "required": ["userIds"]
     },
-    "v1CreateAuthenticatorsIntent": {
+    "CreateAuthenticatorsIntent": {
       "type": "object",
       "properties": {
         "authenticators": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1AuthenticatorParams"
+            "$ref": "#/definitions/AuthenticatorParams"
           },
           "description": "A list of Authenticators."
         },
@@ -2207,14 +1727,14 @@
       },
       "required": ["authenticators", "userId"]
     },
-    "v1CreateAuthenticatorsIntentV2": {
+    "CreateAuthenticatorsIntentV2": {
       "type": "object",
       "properties": {
         "authenticators": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1AuthenticatorParamsV2"
+            "$ref": "#/definitions/AuthenticatorParamsV2"
           },
           "description": "A list of Authenticators."
         },
@@ -2225,7 +1745,7 @@
       },
       "required": ["authenticators", "userId"]
     },
-    "v1CreateAuthenticatorsRequest": {
+    "CreateAuthenticatorsRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2241,12 +1761,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateAuthenticatorsIntentV2"
+          "$ref": "#/definitions/CreateAuthenticatorsIntentV2"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateAuthenticatorsResult": {
+    "CreateAuthenticatorsResult": {
       "type": "object",
       "properties": {
         "authenticatorIds": {
@@ -2259,21 +1779,21 @@
       },
       "required": ["authenticatorIds"]
     },
-    "v1CreateInvitationsIntent": {
+    "CreateInvitationsIntent": {
       "type": "object",
       "properties": {
         "invitations": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1InvitationParams"
+            "$ref": "#/definitions/InvitationParams"
           },
           "description": "A list of Invitations."
         }
       },
       "required": ["invitations"]
     },
-    "v1CreateInvitationsRequest": {
+    "CreateInvitationsRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2289,12 +1809,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateInvitationsIntent"
+          "$ref": "#/definitions/CreateInvitationsIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateInvitationsResult": {
+    "CreateInvitationsResult": {
       "type": "object",
       "properties": {
         "invitationIds": {
@@ -2307,7 +1827,7 @@
       },
       "required": ["invitationIds"]
     },
-    "v1CreateOrganizationIntent": {
+    "CreateOrganizationIntent": {
       "type": "object",
       "properties": {
         "organizationName": {
@@ -2319,7 +1839,7 @@
           "description": "The root user's email address."
         },
         "rootAuthenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParams",
+          "$ref": "#/definitions/AuthenticatorParams",
           "description": "The root user's Authenticator."
         },
         "rootUserId": {
@@ -2329,7 +1849,7 @@
       },
       "required": ["organizationName", "rootEmail", "rootAuthenticator"]
     },
-    "v1CreateOrganizationIntentV2": {
+    "CreateOrganizationIntentV2": {
       "type": "object",
       "properties": {
         "organizationName": {
@@ -2341,7 +1861,7 @@
           "description": "The root user's email address."
         },
         "rootAuthenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParamsV2",
+          "$ref": "#/definitions/AuthenticatorParamsV2",
           "description": "The root user's Authenticator."
         },
         "rootUserId": {
@@ -2351,7 +1871,7 @@
       },
       "required": ["organizationName", "rootEmail", "rootAuthenticator"]
     },
-    "v1CreateOrganizationResult": {
+    "CreateOrganizationResult": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -2361,7 +1881,7 @@
       },
       "required": ["organizationId"]
     },
-    "v1CreatePolicyIntent": {
+    "CreatePolicyIntent": {
       "type": "object",
       "properties": {
         "policyName": {
@@ -2372,12 +1892,12 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/immutableactivityv1Selector"
+            "$ref": "#/definitions/activity.v1.Selector"
           },
           "description": "A list of simple functions each including a subject, target and boolean. See Policy Engine Language section for additional details."
         },
         "effect": {
-          "$ref": "#/definitions/immutableactivityv1Effect",
+          "$ref": "#/definitions/activity.v1.Effect",
           "description": "The instruction to DENY or ALLOW a particular activity following policy selector(s)."
         },
         "notes": {
@@ -2386,7 +1906,7 @@
       },
       "required": ["policyName", "selectors", "effect"]
     },
-    "v1CreatePolicyIntentV2": {
+    "CreatePolicyIntentV2": {
       "type": "object",
       "properties": {
         "policyName": {
@@ -2397,12 +1917,12 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1SelectorV2"
+            "$ref": "#/definitions/SelectorV2"
           },
           "description": "A list of simple functions each including a subject, target and boolean. See Policy Engine Language section for additional details."
         },
         "effect": {
-          "$ref": "#/definitions/immutableactivityv1Effect",
+          "$ref": "#/definitions/activity.v1.Effect",
           "description": "Whether to ALLOW or DENY requests that match the condition and consensus requirements."
         },
         "notes": {
@@ -2411,7 +1931,7 @@
       },
       "required": ["policyName", "selectors", "effect"]
     },
-    "v1CreatePolicyIntentV3": {
+    "CreatePolicyIntentV3": {
       "type": "object",
       "properties": {
         "policyName": {
@@ -2419,7 +1939,7 @@
           "description": "Human-readable name for a Policy."
         },
         "effect": {
-          "$ref": "#/definitions/immutableactivityv1Effect",
+          "$ref": "#/definitions/activity.v1.Effect",
           "description": "The instruction to DENY or ALLOW an activity."
         },
         "condition": {
@@ -2436,7 +1956,7 @@
       },
       "required": ["policyName", "effect"]
     },
-    "v1CreatePolicyRequest": {
+    "CreatePolicyRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2452,12 +1972,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreatePolicyIntentV3"
+          "$ref": "#/definitions/CreatePolicyIntentV3"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreatePolicyResult": {
+    "CreatePolicyResult": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -2467,7 +1987,7 @@
       },
       "required": ["policyId"]
     },
-    "v1CreatePrivateKeyTagIntent": {
+    "CreatePrivateKeyTagIntent": {
       "type": "object",
       "properties": {
         "privateKeyTagName": {
@@ -2484,7 +2004,7 @@
       },
       "required": ["privateKeyTagName", "privateKeyIds"]
     },
-    "v1CreatePrivateKeyTagRequest": {
+    "CreatePrivateKeyTagRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2500,12 +2020,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreatePrivateKeyTagIntent"
+          "$ref": "#/definitions/CreatePrivateKeyTagIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreatePrivateKeyTagResult": {
+    "CreatePrivateKeyTagResult": {
       "type": "object",
       "properties": {
         "privateKeyTagId": {
@@ -2522,35 +2042,35 @@
       },
       "required": ["privateKeyTagId", "privateKeyIds"]
     },
-    "v1CreatePrivateKeysIntent": {
+    "CreatePrivateKeysIntent": {
       "type": "object",
       "properties": {
         "privateKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKeyParams"
+            "$ref": "#/definitions/PrivateKeyParams"
           },
           "description": "A list of Private Keys."
         }
       },
       "required": ["privateKeys"]
     },
-    "v1CreatePrivateKeysIntentV2": {
+    "CreatePrivateKeysIntentV2": {
       "type": "object",
       "properties": {
         "privateKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKeyParams"
+            "$ref": "#/definitions/PrivateKeyParams"
           },
           "description": "A list of Private Keys."
         }
       },
       "required": ["privateKeys"]
     },
-    "v1CreatePrivateKeysRequest": {
+    "CreatePrivateKeysRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2566,12 +2086,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreatePrivateKeysIntentV2"
+          "$ref": "#/definitions/CreatePrivateKeysIntentV2"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreatePrivateKeysResult": {
+    "CreatePrivateKeysResult": {
       "type": "object",
       "properties": {
         "privateKeyIds": {
@@ -2584,21 +2104,21 @@
       },
       "required": ["privateKeyIds"]
     },
-    "v1CreatePrivateKeysResultV2": {
+    "CreatePrivateKeysResultV2": {
       "type": "object",
       "properties": {
         "privateKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKeyResult"
+            "$ref": "#/definitions/PrivateKeyResult"
           },
           "description": "A list of Private Key IDs and addresses."
         }
       },
       "required": ["privateKeys"]
     },
-    "v1CreateSubOrganizationIntent": {
+    "CreateSubOrganizationIntent": {
       "type": "object",
       "properties": {
         "name": {
@@ -2606,13 +2126,13 @@
           "description": "Name for this sub-organization"
         },
         "rootAuthenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParamsV2",
+          "$ref": "#/definitions/AuthenticatorParamsV2",
           "description": "Root User authenticator for this new sub-organization"
         }
       },
       "required": ["name", "rootAuthenticator"]
     },
-    "v1CreateSubOrganizationIntentV2": {
+    "CreateSubOrganizationIntentV2": {
       "type": "object",
       "properties": {
         "subOrganizationName": {
@@ -2623,7 +2143,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1RootUserParams"
+            "$ref": "#/definitions/RootUserParams"
           },
           "description": "Root users to create within this sub-organization"
         },
@@ -2635,7 +2155,7 @@
       },
       "required": ["subOrganizationName", "rootUsers", "rootQuorumThreshold"]
     },
-    "v1CreateSubOrganizationIntentV3": {
+    "CreateSubOrganizationIntentV3": {
       "type": "object",
       "properties": {
         "subOrganizationName": {
@@ -2646,7 +2166,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1RootUserParams"
+            "$ref": "#/definitions/RootUserParams"
           },
           "description": "Root users to create within this sub-organization"
         },
@@ -2659,7 +2179,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKeyParams"
+            "$ref": "#/definitions/PrivateKeyParams"
           },
           "description": "A list of Private Keys."
         }
@@ -2671,7 +2191,7 @@
         "privateKeys"
       ]
     },
-    "v1CreateSubOrganizationIntentV4": {
+    "CreateSubOrganizationIntentV4": {
       "type": "object",
       "properties": {
         "subOrganizationName": {
@@ -2682,7 +2202,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1RootUserParams"
+            "$ref": "#/definitions/RootUserParams"
           },
           "description": "Root users to create within this sub-organization"
         },
@@ -2692,7 +2212,7 @@
           "description": "The threshold of unique approvals to reach root quorum. This value must be less than or equal to the number of root users"
         },
         "wallet": {
-          "$ref": "#/definitions/v1WalletParams",
+          "$ref": "#/definitions/WalletParams",
           "description": "The wallet to create for the sub-organization"
         },
         "disableEmailRecovery": {
@@ -2702,7 +2222,7 @@
       },
       "required": ["subOrganizationName", "rootUsers", "rootQuorumThreshold"]
     },
-    "v1CreateSubOrganizationRequest": {
+    "CreateSubOrganizationRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2718,12 +2238,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateSubOrganizationIntentV4"
+          "$ref": "#/definitions/CreateSubOrganizationIntentV4"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateSubOrganizationResult": {
+    "CreateSubOrganizationResult": {
       "type": "object",
       "properties": {
         "subOrganizationId": {
@@ -2732,7 +2252,7 @@
       },
       "required": ["subOrganizationId"]
     },
-    "v1CreateSubOrganizationResultV3": {
+    "CreateSubOrganizationResultV3": {
       "type": "object",
       "properties": {
         "subOrganizationId": {
@@ -2742,26 +2262,26 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKeyResult"
+            "$ref": "#/definitions/PrivateKeyResult"
           },
           "description": "A list of Private Key IDs and addresses."
         }
       },
       "required": ["subOrganizationId", "privateKeys"]
     },
-    "v1CreateSubOrganizationResultV4": {
+    "CreateSubOrganizationResultV4": {
       "type": "object",
       "properties": {
         "subOrganizationId": {
           "type": "string"
         },
         "wallet": {
-          "$ref": "#/definitions/v1WalletResult"
+          "$ref": "#/definitions/WalletResult"
         }
       },
       "required": ["subOrganizationId"]
     },
-    "v1CreateUserTagIntent": {
+    "CreateUserTagIntent": {
       "type": "object",
       "properties": {
         "userTagName": {
@@ -2778,7 +2298,7 @@
       },
       "required": ["userTagName", "userIds"]
     },
-    "v1CreateUserTagRequest": {
+    "CreateUserTagRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2794,12 +2314,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateUserTagIntent"
+          "$ref": "#/definitions/CreateUserTagIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateUserTagResult": {
+    "CreateUserTagResult": {
       "type": "object",
       "properties": {
         "userTagId": {
@@ -2816,35 +2336,35 @@
       },
       "required": ["userTagId", "userIds"]
     },
-    "v1CreateUsersIntent": {
+    "CreateUsersIntent": {
       "type": "object",
       "properties": {
         "users": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1UserParams"
+            "$ref": "#/definitions/UserParams"
           },
           "description": "A list of Users."
         }
       },
       "required": ["users"]
     },
-    "v1CreateUsersIntentV2": {
+    "CreateUsersIntentV2": {
       "type": "object",
       "properties": {
         "users": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1UserParamsV2"
+            "$ref": "#/definitions/UserParamsV2"
           },
           "description": "A list of Users."
         }
       },
       "required": ["users"]
     },
-    "v1CreateUsersRequest": {
+    "CreateUsersRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2860,12 +2380,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateUsersIntentV2"
+          "$ref": "#/definitions/CreateUsersIntentV2"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateUsersResult": {
+    "CreateUsersResult": {
       "type": "object",
       "properties": {
         "userIds": {
@@ -2878,7 +2398,7 @@
       },
       "required": ["userIds"]
     },
-    "v1CreateWalletAccountsIntent": {
+    "CreateWalletAccountsIntent": {
       "type": "object",
       "properties": {
         "walletId": {
@@ -2889,14 +2409,14 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1WalletAccountParams"
+            "$ref": "#/definitions/WalletAccountParams"
           },
           "description": "A list of wallet Accounts."
         }
       },
       "required": ["walletId", "accounts"]
     },
-    "v1CreateWalletAccountsRequest": {
+    "CreateWalletAccountsRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2912,12 +2432,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateWalletAccountsIntent"
+          "$ref": "#/definitions/CreateWalletAccountsIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateWalletAccountsResult": {
+    "CreateWalletAccountsResult": {
       "type": "object",
       "properties": {
         "addresses": {
@@ -2930,7 +2450,7 @@
       },
       "required": ["addresses"]
     },
-    "v1CreateWalletIntent": {
+    "CreateWalletIntent": {
       "type": "object",
       "properties": {
         "walletName": {
@@ -2941,14 +2461,14 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1WalletAccountParams"
+            "$ref": "#/definitions/WalletAccountParams"
           },
           "description": "A list of wallet Accounts."
         }
       },
       "required": ["walletName", "accounts"]
     },
-    "v1CreateWalletRequest": {
+    "CreateWalletRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -2964,12 +2484,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1CreateWalletIntent"
+          "$ref": "#/definitions/CreateWalletIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1CreateWalletResult": {
+    "CreateWalletResult": {
       "type": "object",
       "properties": {
         "walletId": {
@@ -2986,7 +2506,7 @@
       },
       "required": ["walletId", "addresses"]
     },
-    "v1CredPropsAuthenticationExtensionsClientOutputs": {
+    "CredPropsAuthenticationExtensionsClientOutputs": {
       "type": "object",
       "properties": {
         "rk": {
@@ -2995,7 +2515,7 @@
       },
       "required": ["rk"]
     },
-    "v1DeleteApiKeysIntent": {
+    "DeleteApiKeysIntent": {
       "type": "object",
       "properties": {
         "userId": {
@@ -3012,7 +2532,7 @@
       },
       "required": ["userId", "apiKeyIds"]
     },
-    "v1DeleteApiKeysRequest": {
+    "DeleteApiKeysRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3028,12 +2548,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1DeleteApiKeysIntent"
+          "$ref": "#/definitions/DeleteApiKeysIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1DeleteApiKeysResult": {
+    "DeleteApiKeysResult": {
       "type": "object",
       "properties": {
         "apiKeyIds": {
@@ -3046,7 +2566,7 @@
       },
       "required": ["apiKeyIds"]
     },
-    "v1DeleteAuthenticatorsIntent": {
+    "DeleteAuthenticatorsIntent": {
       "type": "object",
       "properties": {
         "userId": {
@@ -3063,7 +2583,7 @@
       },
       "required": ["userId", "authenticatorIds"]
     },
-    "v1DeleteAuthenticatorsRequest": {
+    "DeleteAuthenticatorsRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3079,12 +2599,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1DeleteAuthenticatorsIntent"
+          "$ref": "#/definitions/DeleteAuthenticatorsIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1DeleteAuthenticatorsResult": {
+    "DeleteAuthenticatorsResult": {
       "type": "object",
       "properties": {
         "authenticatorIds": {
@@ -3097,7 +2617,7 @@
       },
       "required": ["authenticatorIds"]
     },
-    "v1DeleteInvitationIntent": {
+    "DeleteInvitationIntent": {
       "type": "object",
       "properties": {
         "invitationId": {
@@ -3107,7 +2627,7 @@
       },
       "required": ["invitationId"]
     },
-    "v1DeleteInvitationRequest": {
+    "DeleteInvitationRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3123,12 +2643,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1DeleteInvitationIntent"
+          "$ref": "#/definitions/DeleteInvitationIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1DeleteInvitationResult": {
+    "DeleteInvitationResult": {
       "type": "object",
       "properties": {
         "invitationId": {
@@ -3138,7 +2658,7 @@
       },
       "required": ["invitationId"]
     },
-    "v1DeleteOrganizationIntent": {
+    "DeleteOrganizationIntent": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3148,7 +2668,7 @@
       },
       "required": ["organizationId"]
     },
-    "v1DeleteOrganizationResult": {
+    "DeleteOrganizationResult": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3158,7 +2678,7 @@
       },
       "required": ["organizationId"]
     },
-    "v1DeletePaymentMethodIntent": {
+    "DeletePaymentMethodIntent": {
       "type": "object",
       "properties": {
         "paymentMethodId": {
@@ -3168,7 +2688,7 @@
       },
       "required": ["paymentMethodId"]
     },
-    "v1DeletePaymentMethodResult": {
+    "DeletePaymentMethodResult": {
       "type": "object",
       "properties": {
         "paymentMethodId": {
@@ -3178,7 +2698,7 @@
       },
       "required": ["paymentMethodId"]
     },
-    "v1DeletePolicyIntent": {
+    "DeletePolicyIntent": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -3188,7 +2708,7 @@
       },
       "required": ["policyId"]
     },
-    "v1DeletePolicyRequest": {
+    "DeletePolicyRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3204,12 +2724,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1DeletePolicyIntent"
+          "$ref": "#/definitions/DeletePolicyIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1DeletePolicyResult": {
+    "DeletePolicyResult": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -3219,7 +2739,7 @@
       },
       "required": ["policyId"]
     },
-    "v1DeletePrivateKeyTagsIntent": {
+    "DeletePrivateKeyTagsIntent": {
       "type": "object",
       "properties": {
         "privateKeyTagIds": {
@@ -3232,7 +2752,7 @@
       },
       "required": ["privateKeyTagIds"]
     },
-    "v1DeletePrivateKeyTagsResult": {
+    "DeletePrivateKeyTagsResult": {
       "type": "object",
       "properties": {
         "privateKeyTagIds": {
@@ -3252,7 +2772,7 @@
       },
       "required": ["privateKeyTagIds", "privateKeyIds"]
     },
-    "v1DeleteUserTagsIntent": {
+    "DeleteUserTagsIntent": {
       "type": "object",
       "properties": {
         "userTagIds": {
@@ -3265,7 +2785,7 @@
       },
       "required": ["userTagIds"]
     },
-    "v1DeleteUserTagsResult": {
+    "DeleteUserTagsResult": {
       "type": "object",
       "properties": {
         "userTagIds": {
@@ -3285,7 +2805,7 @@
       },
       "required": ["userTagIds", "userIds"]
     },
-    "v1DeleteUsersIntent": {
+    "DeleteUsersIntent": {
       "type": "object",
       "properties": {
         "userIds": {
@@ -3298,7 +2818,7 @@
       },
       "required": ["userIds"]
     },
-    "v1DeleteUsersResult": {
+    "DeleteUsersResult": {
       "type": "object",
       "properties": {
         "userIds": {
@@ -3311,7 +2831,7 @@
       },
       "required": ["userIds"]
     },
-    "v1DisablePrivateKeyIntent": {
+    "DisablePrivateKeyIntent": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -3321,7 +2841,7 @@
       },
       "required": ["privateKeyId"]
     },
-    "v1DisablePrivateKeyResult": {
+    "DisablePrivateKeyResult": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -3331,7 +2851,7 @@
       },
       "required": ["privateKeyId"]
     },
-    "v1ExportPrivateKeyIntent": {
+    "ExportPrivateKeyIntent": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -3345,7 +2865,7 @@
       },
       "required": ["privateKeyId", "targetPublicKey"]
     },
-    "v1ExportPrivateKeyRequest": {
+    "ExportPrivateKeyRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3361,12 +2881,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1ExportPrivateKeyIntent"
+          "$ref": "#/definitions/ExportPrivateKeyIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1ExportPrivateKeyResult": {
+    "ExportPrivateKeyResult": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -3380,7 +2900,7 @@
       },
       "required": ["privateKeyId", "exportBundle"]
     },
-    "v1ExportWalletIntent": {
+    "ExportWalletIntent": {
       "type": "object",
       "properties": {
         "walletId": {
@@ -3392,13 +2912,13 @@
           "description": "Client-side public key generated by the user, to which the export bundle will be encrypted."
         },
         "language": {
-          "$ref": "#/definitions/v1MnemonicLanguage",
+          "$ref": "#/definitions/MnemonicLanguage",
           "description": "The language of the mnemonic to export. Defaults to English."
         }
       },
       "required": ["walletId", "targetPublicKey"]
     },
-    "v1ExportWalletRequest": {
+    "ExportWalletRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3414,12 +2934,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1ExportWalletIntent"
+          "$ref": "#/definitions/ExportWalletIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1ExportWalletResult": {
+    "ExportWalletResult": {
       "type": "object",
       "properties": {
         "walletId": {
@@ -3433,22 +2953,22 @@
       },
       "required": ["walletId", "exportBundle"]
     },
-    "v1Feature": {
+    "Feature": {
       "type": "object",
       "properties": {
         "name": {
-          "$ref": "#/definitions/v1FeatureName"
+          "$ref": "#/definitions/FeatureName"
         },
         "value": {
           "type": "string"
         }
       }
     },
-    "v1FeatureName": {
+    "FeatureName": {
       "type": "string",
       "enum": ["FEATURE_NAME_ROOT_USER_EMAIL_RECOVERY"]
     },
-    "v1GetActivitiesRequest": {
+    "GetActivitiesRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3458,39 +2978,39 @@
         "filterByStatus": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/v1ActivityStatus"
+            "$ref": "#/definitions/ActivityStatus"
           },
           "description": "Array of Activity Statuses filtering which Activities will be listed in the response."
         },
         "paginationOptions": {
-          "$ref": "#/definitions/v1Pagination",
+          "$ref": "#/definitions/Pagination",
           "description": "Parameters used for cursor-based pagination."
         },
         "filterByType": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/v1ActivityType"
+            "$ref": "#/definitions/ActivityType"
           },
           "description": "Array of Activity Types filtering which Activities will be listed in the response."
         }
       },
       "required": ["organizationId"]
     },
-    "v1GetActivitiesResponse": {
+    "GetActivitiesResponse": {
       "type": "object",
       "properties": {
         "activities": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Activity"
+            "$ref": "#/definitions/Activity"
           },
           "description": "A list of Activities."
         }
       },
       "required": ["activities"]
     },
-    "v1GetActivityRequest": {
+    "GetActivityRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3504,7 +3024,7 @@
       },
       "required": ["organizationId", "activityId"]
     },
-    "v1GetAuthenticatorRequest": {
+    "GetAuthenticatorRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3518,17 +3038,17 @@
       },
       "required": ["organizationId", "authenticatorId"]
     },
-    "v1GetAuthenticatorResponse": {
+    "GetAuthenticatorResponse": {
       "type": "object",
       "properties": {
         "authenticator": {
-          "$ref": "#/definitions/v1Authenticator",
+          "$ref": "#/definitions/Authenticator",
           "description": "An authenticator."
         }
       },
       "required": ["authenticator"]
     },
-    "v1GetAuthenticatorsRequest": {
+    "GetAuthenticatorsRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3542,21 +3062,21 @@
       },
       "required": ["organizationId", "userId"]
     },
-    "v1GetAuthenticatorsResponse": {
+    "GetAuthenticatorsResponse": {
       "type": "object",
       "properties": {
         "authenticators": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Authenticator"
+            "$ref": "#/definitions/Authenticator"
           },
           "description": "A list of authenticators."
         }
       },
       "required": ["authenticators"]
     },
-    "v1GetPoliciesRequest": {
+    "GetPoliciesRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3566,21 +3086,21 @@
       },
       "required": ["organizationId"]
     },
-    "v1GetPoliciesResponse": {
+    "GetPoliciesResponse": {
       "type": "object",
       "properties": {
         "policies": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Policy"
+            "$ref": "#/definitions/Policy"
           },
           "description": "A list of Policies."
         }
       },
       "required": ["policies"]
     },
-    "v1GetPolicyRequest": {
+    "GetPolicyRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3594,17 +3114,17 @@
       },
       "required": ["organizationId", "policyId"]
     },
-    "v1GetPolicyResponse": {
+    "GetPolicyResponse": {
       "type": "object",
       "properties": {
         "policy": {
-          "$ref": "#/definitions/v1Policy",
+          "$ref": "#/definitions/Policy",
           "description": "Object that codifies rules defining the actions that are permissible within an Organization."
         }
       },
       "required": ["policy"]
     },
-    "v1GetPrivateKeyRequest": {
+    "GetPrivateKeyRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3618,17 +3138,17 @@
       },
       "required": ["organizationId", "privateKeyId"]
     },
-    "v1GetPrivateKeyResponse": {
+    "GetPrivateKeyResponse": {
       "type": "object",
       "properties": {
         "privateKey": {
-          "$ref": "#/definitions/v1PrivateKey",
+          "$ref": "#/definitions/PrivateKey",
           "description": "Cryptographic public/private key pair that can be used for cryptocurrency needs or more generalized encryption."
         }
       },
       "required": ["privateKey"]
     },
-    "v1GetPrivateKeysRequest": {
+    "GetPrivateKeysRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3638,21 +3158,21 @@
       },
       "required": ["organizationId"]
     },
-    "v1GetPrivateKeysResponse": {
+    "GetPrivateKeysResponse": {
       "type": "object",
       "properties": {
         "privateKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1PrivateKey"
+            "$ref": "#/definitions/PrivateKey"
           },
           "description": "A list of Private Keys."
         }
       },
       "required": ["privateKeys"]
     },
-    "v1GetUserRequest": {
+    "GetUserRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3666,17 +3186,17 @@
       },
       "required": ["organizationId", "userId"]
     },
-    "v1GetUserResponse": {
+    "GetUserResponse": {
       "type": "object",
       "properties": {
         "user": {
-          "$ref": "#/definitions/v1User",
+          "$ref": "#/definitions/User",
           "description": "Web and/or API user within your Organization."
         }
       },
       "required": ["user"]
     },
-    "v1GetUsersRequest": {
+    "GetUsersRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3686,21 +3206,21 @@
       },
       "required": ["organizationId"]
     },
-    "v1GetUsersResponse": {
+    "GetUsersResponse": {
       "type": "object",
       "properties": {
         "users": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1User"
+            "$ref": "#/definitions/User"
           },
           "description": "A list of Users."
         }
       },
       "required": ["users"]
     },
-    "v1GetWhoamiRequest": {
+    "GetWhoamiRequest": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3710,7 +3230,7 @@
       },
       "required": ["organizationId"]
     },
-    "v1GetWhoamiResponse": {
+    "GetWhoamiResponse": {
       "type": "object",
       "properties": {
         "organizationId": {
@@ -3732,7 +3252,7 @@
       },
       "required": ["organizationId", "organizationName", "userId", "username"]
     },
-    "v1InitUserEmailRecoveryIntent": {
+    "InitUserEmailRecoveryIntent": {
       "type": "object",
       "properties": {
         "email": {
@@ -3746,7 +3266,7 @@
       },
       "required": ["email", "targetPublicKey"]
     },
-    "v1InitUserEmailRecoveryRequest": {
+    "InitUserEmailRecoveryRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -3762,12 +3282,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1InitUserEmailRecoveryIntent"
+          "$ref": "#/definitions/InitUserEmailRecoveryIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1InitUserEmailRecoveryResult": {
+    "InitUserEmailRecoveryResult": {
       "type": "object",
       "properties": {
         "userId": {
@@ -3777,178 +3297,178 @@
       },
       "required": ["userId"]
     },
-    "v1Intent": {
+    "Intent": {
       "type": "object",
       "properties": {
         "createOrganizationIntent": {
-          "$ref": "#/definitions/v1CreateOrganizationIntent"
+          "$ref": "#/definitions/CreateOrganizationIntent"
         },
         "createAuthenticatorsIntent": {
-          "$ref": "#/definitions/v1CreateAuthenticatorsIntent"
+          "$ref": "#/definitions/CreateAuthenticatorsIntent"
         },
         "createUsersIntent": {
-          "$ref": "#/definitions/v1CreateUsersIntent"
+          "$ref": "#/definitions/CreateUsersIntent"
         },
         "createPrivateKeysIntent": {
-          "$ref": "#/definitions/v1CreatePrivateKeysIntent"
+          "$ref": "#/definitions/CreatePrivateKeysIntent"
         },
         "signRawPayloadIntent": {
-          "$ref": "#/definitions/v1SignRawPayloadIntent"
+          "$ref": "#/definitions/SignRawPayloadIntent"
         },
         "createInvitationsIntent": {
-          "$ref": "#/definitions/v1CreateInvitationsIntent"
+          "$ref": "#/definitions/CreateInvitationsIntent"
         },
         "acceptInvitationIntent": {
-          "$ref": "#/definitions/v1AcceptInvitationIntent"
+          "$ref": "#/definitions/AcceptInvitationIntent"
         },
         "createPolicyIntent": {
-          "$ref": "#/definitions/v1CreatePolicyIntent"
+          "$ref": "#/definitions/CreatePolicyIntent"
         },
         "disablePrivateKeyIntent": {
-          "$ref": "#/definitions/v1DisablePrivateKeyIntent"
+          "$ref": "#/definitions/DisablePrivateKeyIntent"
         },
         "deleteUsersIntent": {
-          "$ref": "#/definitions/v1DeleteUsersIntent"
+          "$ref": "#/definitions/DeleteUsersIntent"
         },
         "deleteAuthenticatorsIntent": {
-          "$ref": "#/definitions/v1DeleteAuthenticatorsIntent"
+          "$ref": "#/definitions/DeleteAuthenticatorsIntent"
         },
         "deleteInvitationIntent": {
-          "$ref": "#/definitions/v1DeleteInvitationIntent"
+          "$ref": "#/definitions/DeleteInvitationIntent"
         },
         "deleteOrganizationIntent": {
-          "$ref": "#/definitions/v1DeleteOrganizationIntent"
+          "$ref": "#/definitions/DeleteOrganizationIntent"
         },
         "deletePolicyIntent": {
-          "$ref": "#/definitions/v1DeletePolicyIntent"
+          "$ref": "#/definitions/DeletePolicyIntent"
         },
         "createUserTagIntent": {
-          "$ref": "#/definitions/v1CreateUserTagIntent"
+          "$ref": "#/definitions/CreateUserTagIntent"
         },
         "deleteUserTagsIntent": {
-          "$ref": "#/definitions/v1DeleteUserTagsIntent"
+          "$ref": "#/definitions/DeleteUserTagsIntent"
         },
         "signTransactionIntent": {
-          "$ref": "#/definitions/v1SignTransactionIntent"
+          "$ref": "#/definitions/SignTransactionIntent"
         },
         "createApiKeysIntent": {
-          "$ref": "#/definitions/v1CreateApiKeysIntent"
+          "$ref": "#/definitions/CreateApiKeysIntent"
         },
         "deleteApiKeysIntent": {
-          "$ref": "#/definitions/v1DeleteApiKeysIntent"
+          "$ref": "#/definitions/DeleteApiKeysIntent"
         },
         "approveActivityIntent": {
-          "$ref": "#/definitions/v1ApproveActivityIntent"
+          "$ref": "#/definitions/ApproveActivityIntent"
         },
         "rejectActivityIntent": {
-          "$ref": "#/definitions/v1RejectActivityIntent"
+          "$ref": "#/definitions/RejectActivityIntent"
         },
         "createPrivateKeyTagIntent": {
-          "$ref": "#/definitions/v1CreatePrivateKeyTagIntent"
+          "$ref": "#/definitions/CreatePrivateKeyTagIntent"
         },
         "deletePrivateKeyTagsIntent": {
-          "$ref": "#/definitions/v1DeletePrivateKeyTagsIntent"
+          "$ref": "#/definitions/DeletePrivateKeyTagsIntent"
         },
         "createPolicyIntentV2": {
-          "$ref": "#/definitions/v1CreatePolicyIntentV2"
+          "$ref": "#/definitions/CreatePolicyIntentV2"
         },
         "setPaymentMethodIntent": {
-          "$ref": "#/definitions/v1SetPaymentMethodIntent"
+          "$ref": "#/definitions/SetPaymentMethodIntent"
         },
         "activateBillingTierIntent": {
-          "$ref": "#/definitions/v1ActivateBillingTierIntent"
+          "$ref": "#/definitions/ActivateBillingTierIntent"
         },
         "deletePaymentMethodIntent": {
-          "$ref": "#/definitions/v1DeletePaymentMethodIntent"
+          "$ref": "#/definitions/DeletePaymentMethodIntent"
         },
         "createPolicyIntentV3": {
-          "$ref": "#/definitions/v1CreatePolicyIntentV3"
+          "$ref": "#/definitions/CreatePolicyIntentV3"
         },
         "createApiOnlyUsersIntent": {
-          "$ref": "#/definitions/v1CreateApiOnlyUsersIntent"
+          "$ref": "#/definitions/CreateApiOnlyUsersIntent"
         },
         "updateRootQuorumIntent": {
-          "$ref": "#/definitions/v1UpdateRootQuorumIntent"
+          "$ref": "#/definitions/UpdateRootQuorumIntent"
         },
         "updateUserTagIntent": {
-          "$ref": "#/definitions/v1UpdateUserTagIntent"
+          "$ref": "#/definitions/UpdateUserTagIntent"
         },
         "updatePrivateKeyTagIntent": {
-          "$ref": "#/definitions/v1UpdatePrivateKeyTagIntent"
+          "$ref": "#/definitions/UpdatePrivateKeyTagIntent"
         },
         "createAuthenticatorsIntentV2": {
-          "$ref": "#/definitions/v1CreateAuthenticatorsIntentV2"
+          "$ref": "#/definitions/CreateAuthenticatorsIntentV2"
         },
         "acceptInvitationIntentV2": {
-          "$ref": "#/definitions/v1AcceptInvitationIntentV2"
+          "$ref": "#/definitions/AcceptInvitationIntentV2"
         },
         "createOrganizationIntentV2": {
-          "$ref": "#/definitions/v1CreateOrganizationIntentV2"
+          "$ref": "#/definitions/CreateOrganizationIntentV2"
         },
         "createUsersIntentV2": {
-          "$ref": "#/definitions/v1CreateUsersIntentV2"
+          "$ref": "#/definitions/CreateUsersIntentV2"
         },
         "createSubOrganizationIntent": {
-          "$ref": "#/definitions/v1CreateSubOrganizationIntent"
+          "$ref": "#/definitions/CreateSubOrganizationIntent"
         },
         "createSubOrganizationIntentV2": {
-          "$ref": "#/definitions/v1CreateSubOrganizationIntentV2"
+          "$ref": "#/definitions/CreateSubOrganizationIntentV2"
         },
         "updateAllowedOriginsIntent": {
-          "$ref": "#/definitions/v1UpdateAllowedOriginsIntent"
+          "$ref": "#/definitions/UpdateAllowedOriginsIntent"
         },
         "createPrivateKeysIntentV2": {
-          "$ref": "#/definitions/v1CreatePrivateKeysIntentV2"
+          "$ref": "#/definitions/CreatePrivateKeysIntentV2"
         },
         "updateUserIntent": {
-          "$ref": "#/definitions/v1UpdateUserIntent"
+          "$ref": "#/definitions/UpdateUserIntent"
         },
         "updatePolicyIntent": {
-          "$ref": "#/definitions/v1UpdatePolicyIntent"
+          "$ref": "#/definitions/UpdatePolicyIntent"
         },
         "setPaymentMethodIntentV2": {
-          "$ref": "#/definitions/v1SetPaymentMethodIntentV2"
+          "$ref": "#/definitions/SetPaymentMethodIntentV2"
         },
         "createSubOrganizationIntentV3": {
-          "$ref": "#/definitions/v1CreateSubOrganizationIntentV3"
+          "$ref": "#/definitions/CreateSubOrganizationIntentV3"
         },
         "createWalletIntent": {
-          "$ref": "#/definitions/v1CreateWalletIntent"
+          "$ref": "#/definitions/CreateWalletIntent"
         },
         "createWalletAccountsIntent": {
-          "$ref": "#/definitions/v1CreateWalletAccountsIntent"
+          "$ref": "#/definitions/CreateWalletAccountsIntent"
         },
         "initUserEmailRecoveryIntent": {
-          "$ref": "#/definitions/v1InitUserEmailRecoveryIntent"
+          "$ref": "#/definitions/InitUserEmailRecoveryIntent"
         },
         "recoverUserIntent": {
-          "$ref": "#/definitions/v1RecoverUserIntent"
+          "$ref": "#/definitions/RecoverUserIntent"
         },
         "setOrganizationFeatureIntent": {
-          "$ref": "#/definitions/v1SetOrganizationFeatureIntent"
+          "$ref": "#/definitions/SetOrganizationFeatureIntent"
         },
         "removeOrganizationFeatureIntent": {
-          "$ref": "#/definitions/v1RemoveOrganizationFeatureIntent"
+          "$ref": "#/definitions/RemoveOrganizationFeatureIntent"
         },
         "signRawPayloadIntentV2": {
-          "$ref": "#/definitions/v1SignRawPayloadIntentV2"
+          "$ref": "#/definitions/SignRawPayloadIntentV2"
         },
         "signTransactionIntentV2": {
-          "$ref": "#/definitions/v1SignTransactionIntentV2"
+          "$ref": "#/definitions/SignTransactionIntentV2"
         },
         "exportPrivateKeyIntent": {
-          "$ref": "#/definitions/v1ExportPrivateKeyIntent"
+          "$ref": "#/definitions/ExportPrivateKeyIntent"
         },
         "exportWalletIntent": {
-          "$ref": "#/definitions/v1ExportWalletIntent"
+          "$ref": "#/definitions/ExportWalletIntent"
         },
         "createSubOrganizationIntentV4": {
-          "$ref": "#/definitions/v1CreateSubOrganizationIntentV4"
+          "$ref": "#/definitions/CreateSubOrganizationIntentV4"
         }
       },
       "required": ["createOrganizationIntent"]
     },
-    "v1InvitationParams": {
+    "InvitationParams": {
       "type": "object",
       "properties": {
         "receiverUserName": {
@@ -3967,7 +3487,7 @@
           "description": "A list of tags assigned to the Invitation recipient."
         },
         "accessType": {
-          "$ref": "#/definitions/immutableactivityv1AccessType",
+          "$ref": "#/definitions/activity.v1.AccessType",
           "description": "The User's permissible access method(s)."
         },
         "senderUserId": {
@@ -3983,7 +3503,7 @@
         "senderUserId"
       ]
     },
-    "v1MnemonicLanguage": {
+    "MnemonicLanguage": {
       "type": "string",
       "enum": [
         "MNEMONIC_LANGUAGE_ENGLISH",
@@ -3997,7 +3517,7 @@
         "MNEMONIC_LANGUAGE_SPANISH"
       ]
     },
-    "v1Pagination": {
+    "Pagination": {
       "type": "object",
       "properties": {
         "limit": {
@@ -4014,11 +3534,11 @@
         }
       }
     },
-    "v1PathFormat": {
+    "PathFormat": {
       "type": "string",
       "enum": ["PATH_FORMAT_BIP32"]
     },
-    "v1Policy": {
+    "Policy": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -4030,22 +3550,22 @@
           "description": "Human-readable name for a Policy."
         },
         "effect": {
-          "$ref": "#/definitions/externaldatav1Effect",
+          "$ref": "#/definitions/data.v1.Effect",
           "description": "The instruction to DENY or ALLOW a particular activity following policy selector(s)."
         },
         "selectors": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/externaldatav1Selector"
+            "$ref": "#/definitions/data.v1.Selector"
           },
           "description": "A list of simple functions each including a subject, target and boolean. See Policy Engine Language section for additional details."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "notes": {
           "type": "string",
@@ -4072,7 +3592,7 @@
         "condition"
       ]
     },
-    "v1PrivateKey": {
+    "PrivateKey": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -4088,14 +3608,14 @@
           "description": "Human-readable name for a Private Key."
         },
         "curve": {
-          "$ref": "#/definitions/externaldatav1Curve",
+          "$ref": "#/definitions/data.v1.Curve",
           "description": "Cryptographic Curve used to generate a given Private Key."
         },
         "addresses": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/externaldatav1Address"
+            "$ref": "#/definitions/data.v1.Address"
           },
           "description": "Derived cryptocurrency addresses for a given Private Key."
         },
@@ -4107,10 +3627,10 @@
           "description": "A list of Private Key Tag IDs."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "exported": {
           "type": "boolean",
@@ -4129,7 +3649,7 @@
         "exported"
       ]
     },
-    "v1PrivateKeyParams": {
+    "PrivateKeyParams": {
       "type": "object",
       "properties": {
         "privateKeyName": {
@@ -4137,7 +3657,7 @@
           "description": "Human-readable name for a Private Key."
         },
         "curve": {
-          "$ref": "#/definitions/immutablecommonv1Curve",
+          "$ref": "#/definitions/common.v1.Curve",
           "description": "Cryptographic Curve used to generate a given Private Key."
         },
         "privateKeyTags": {
@@ -4150,7 +3670,7 @@
         "addressFormats": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/immutablecommonv1AddressFormat"
+            "$ref": "#/definitions/common.v1.AddressFormat"
           },
           "description": "Cryptocurrency-specific formats for a derived address (e.g., Ethereum)."
         }
@@ -4162,7 +3682,7 @@
         "addressFormats"
       ]
     },
-    "v1PrivateKeyResult": {
+    "PrivateKeyResult": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -4172,12 +3692,12 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/immutableactivityv1Address"
+            "$ref": "#/definitions/activity.v1.Address"
           }
         }
       }
     },
-    "v1PublicKeyCredentialWithAttestation": {
+    "PublicKeyCredentialWithAttestation": {
       "type": "object",
       "properties": {
         "id": {
@@ -4196,19 +3716,19 @@
           "x-nullable": true
         },
         "response": {
-          "$ref": "#/definitions/v1AuthenticatorAttestationResponse"
+          "$ref": "#/definitions/AuthenticatorAttestationResponse"
         },
         "clientExtensionResults": {
-          "$ref": "#/definitions/v1SimpleClientExtensionResults"
+          "$ref": "#/definitions/SimpleClientExtensionResults"
         }
       },
       "required": ["id", "type", "rawId", "response", "clientExtensionResults"]
     },
-    "v1RecoverUserIntent": {
+    "RecoverUserIntent": {
       "type": "object",
       "properties": {
         "authenticator": {
-          "$ref": "#/definitions/v1AuthenticatorParamsV2",
+          "$ref": "#/definitions/AuthenticatorParamsV2",
           "description": "The new authenticator to register."
         },
         "userId": {
@@ -4218,7 +3738,7 @@
       },
       "required": ["authenticator", "userId"]
     },
-    "v1RecoverUserRequest": {
+    "RecoverUserRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4234,12 +3754,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1RecoverUserIntent"
+          "$ref": "#/definitions/RecoverUserIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1RecoverUserResult": {
+    "RecoverUserResult": {
       "type": "object",
       "properties": {
         "authenticatorId": {
@@ -4252,7 +3772,7 @@
       },
       "required": ["authenticatorId"]
     },
-    "v1RejectActivityIntent": {
+    "RejectActivityIntent": {
       "type": "object",
       "properties": {
         "fingerprint": {
@@ -4262,7 +3782,7 @@
       },
       "required": ["fingerprint"]
     },
-    "v1RejectActivityRequest": {
+    "RejectActivityRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4278,22 +3798,22 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1RejectActivityIntent"
+          "$ref": "#/definitions/RejectActivityIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1RemoveOrganizationFeatureIntent": {
+    "RemoveOrganizationFeatureIntent": {
       "type": "object",
       "properties": {
         "name": {
-          "$ref": "#/definitions/v1FeatureName",
+          "$ref": "#/definitions/FeatureName",
           "description": "Name of the feature to remove"
         }
       },
       "required": ["name"]
     },
-    "v1RemoveOrganizationFeatureRequest": {
+    "RemoveOrganizationFeatureRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4309,160 +3829,160 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1RemoveOrganizationFeatureIntent"
+          "$ref": "#/definitions/RemoveOrganizationFeatureIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1RemoveOrganizationFeatureResult": {
+    "RemoveOrganizationFeatureResult": {
       "type": "object",
       "properties": {
         "features": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Feature"
+            "$ref": "#/definitions/Feature"
           },
           "description": "Resulting list of organization features."
         }
       },
       "required": ["features"]
     },
-    "v1Result": {
+    "Result": {
       "type": "object",
       "properties": {
         "createOrganizationResult": {
-          "$ref": "#/definitions/v1CreateOrganizationResult"
+          "$ref": "#/definitions/CreateOrganizationResult"
         },
         "createAuthenticatorsResult": {
-          "$ref": "#/definitions/v1CreateAuthenticatorsResult"
+          "$ref": "#/definitions/CreateAuthenticatorsResult"
         },
         "createUsersResult": {
-          "$ref": "#/definitions/v1CreateUsersResult"
+          "$ref": "#/definitions/CreateUsersResult"
         },
         "createPrivateKeysResult": {
-          "$ref": "#/definitions/v1CreatePrivateKeysResult"
+          "$ref": "#/definitions/CreatePrivateKeysResult"
         },
         "createInvitationsResult": {
-          "$ref": "#/definitions/v1CreateInvitationsResult"
+          "$ref": "#/definitions/CreateInvitationsResult"
         },
         "acceptInvitationResult": {
-          "$ref": "#/definitions/v1AcceptInvitationResult"
+          "$ref": "#/definitions/AcceptInvitationResult"
         },
         "signRawPayloadResult": {
-          "$ref": "#/definitions/v1SignRawPayloadResult"
+          "$ref": "#/definitions/SignRawPayloadResult"
         },
         "createPolicyResult": {
-          "$ref": "#/definitions/v1CreatePolicyResult"
+          "$ref": "#/definitions/CreatePolicyResult"
         },
         "disablePrivateKeyResult": {
-          "$ref": "#/definitions/v1DisablePrivateKeyResult"
+          "$ref": "#/definitions/DisablePrivateKeyResult"
         },
         "deleteUsersResult": {
-          "$ref": "#/definitions/v1DeleteUsersResult"
+          "$ref": "#/definitions/DeleteUsersResult"
         },
         "deleteAuthenticatorsResult": {
-          "$ref": "#/definitions/v1DeleteAuthenticatorsResult"
+          "$ref": "#/definitions/DeleteAuthenticatorsResult"
         },
         "deleteInvitationResult": {
-          "$ref": "#/definitions/v1DeleteInvitationResult"
+          "$ref": "#/definitions/DeleteInvitationResult"
         },
         "deleteOrganizationResult": {
-          "$ref": "#/definitions/v1DeleteOrganizationResult"
+          "$ref": "#/definitions/DeleteOrganizationResult"
         },
         "deletePolicyResult": {
-          "$ref": "#/definitions/v1DeletePolicyResult"
+          "$ref": "#/definitions/DeletePolicyResult"
         },
         "createUserTagResult": {
-          "$ref": "#/definitions/v1CreateUserTagResult"
+          "$ref": "#/definitions/CreateUserTagResult"
         },
         "deleteUserTagsResult": {
-          "$ref": "#/definitions/v1DeleteUserTagsResult"
+          "$ref": "#/definitions/DeleteUserTagsResult"
         },
         "signTransactionResult": {
-          "$ref": "#/definitions/v1SignTransactionResult"
+          "$ref": "#/definitions/SignTransactionResult"
         },
         "deleteApiKeysResult": {
-          "$ref": "#/definitions/v1DeleteApiKeysResult"
+          "$ref": "#/definitions/DeleteApiKeysResult"
         },
         "createApiKeysResult": {
-          "$ref": "#/definitions/v1CreateApiKeysResult"
+          "$ref": "#/definitions/CreateApiKeysResult"
         },
         "createPrivateKeyTagResult": {
-          "$ref": "#/definitions/v1CreatePrivateKeyTagResult"
+          "$ref": "#/definitions/CreatePrivateKeyTagResult"
         },
         "deletePrivateKeyTagsResult": {
-          "$ref": "#/definitions/v1DeletePrivateKeyTagsResult"
+          "$ref": "#/definitions/DeletePrivateKeyTagsResult"
         },
         "setPaymentMethodResult": {
-          "$ref": "#/definitions/v1SetPaymentMethodResult"
+          "$ref": "#/definitions/SetPaymentMethodResult"
         },
         "activateBillingTierResult": {
-          "$ref": "#/definitions/v1ActivateBillingTierResult"
+          "$ref": "#/definitions/ActivateBillingTierResult"
         },
         "deletePaymentMethodResult": {
-          "$ref": "#/definitions/v1DeletePaymentMethodResult"
+          "$ref": "#/definitions/DeletePaymentMethodResult"
         },
         "createApiOnlyUsersResult": {
-          "$ref": "#/definitions/v1CreateApiOnlyUsersResult"
+          "$ref": "#/definitions/CreateApiOnlyUsersResult"
         },
         "updateRootQuorumResult": {
-          "$ref": "#/definitions/v1UpdateRootQuorumResult"
+          "$ref": "#/definitions/UpdateRootQuorumResult"
         },
         "updateUserTagResult": {
-          "$ref": "#/definitions/v1UpdateUserTagResult"
+          "$ref": "#/definitions/UpdateUserTagResult"
         },
         "updatePrivateKeyTagResult": {
-          "$ref": "#/definitions/v1UpdatePrivateKeyTagResult"
+          "$ref": "#/definitions/UpdatePrivateKeyTagResult"
         },
         "createSubOrganizationResult": {
-          "$ref": "#/definitions/v1CreateSubOrganizationResult"
+          "$ref": "#/definitions/CreateSubOrganizationResult"
         },
         "updateAllowedOriginsResult": {
-          "$ref": "#/definitions/v1UpdateAllowedOriginsResult"
+          "$ref": "#/definitions/UpdateAllowedOriginsResult"
         },
         "createPrivateKeysResultV2": {
-          "$ref": "#/definitions/v1CreatePrivateKeysResultV2"
+          "$ref": "#/definitions/CreatePrivateKeysResultV2"
         },
         "updateUserResult": {
-          "$ref": "#/definitions/v1UpdateUserResult"
+          "$ref": "#/definitions/UpdateUserResult"
         },
         "updatePolicyResult": {
-          "$ref": "#/definitions/v1UpdatePolicyResult"
+          "$ref": "#/definitions/UpdatePolicyResult"
         },
         "createSubOrganizationResultV3": {
-          "$ref": "#/definitions/v1CreateSubOrganizationResultV3"
+          "$ref": "#/definitions/CreateSubOrganizationResultV3"
         },
         "createWalletResult": {
-          "$ref": "#/definitions/v1CreateWalletResult"
+          "$ref": "#/definitions/CreateWalletResult"
         },
         "createWalletAccountsResult": {
-          "$ref": "#/definitions/v1CreateWalletAccountsResult"
+          "$ref": "#/definitions/CreateWalletAccountsResult"
         },
         "initUserEmailRecoveryResult": {
-          "$ref": "#/definitions/v1InitUserEmailRecoveryResult"
+          "$ref": "#/definitions/InitUserEmailRecoveryResult"
         },
         "recoverUserResult": {
-          "$ref": "#/definitions/v1RecoverUserResult"
+          "$ref": "#/definitions/RecoverUserResult"
         },
         "setOrganizationFeatureResult": {
-          "$ref": "#/definitions/v1SetOrganizationFeatureResult"
+          "$ref": "#/definitions/SetOrganizationFeatureResult"
         },
         "removeOrganizationFeatureResult": {
-          "$ref": "#/definitions/v1RemoveOrganizationFeatureResult"
+          "$ref": "#/definitions/RemoveOrganizationFeatureResult"
         },
         "exportPrivateKeyResult": {
-          "$ref": "#/definitions/v1ExportPrivateKeyResult"
+          "$ref": "#/definitions/ExportPrivateKeyResult"
         },
         "exportWalletResult": {
-          "$ref": "#/definitions/v1ExportWalletResult"
+          "$ref": "#/definitions/ExportWalletResult"
         },
         "createSubOrganizationResultV4": {
-          "$ref": "#/definitions/v1CreateSubOrganizationResultV4"
+          "$ref": "#/definitions/CreateSubOrganizationResultV4"
         }
       }
     },
-    "v1RootUserParams": {
+    "RootUserParams": {
       "type": "object",
       "properties": {
         "userName": {
@@ -4477,7 +3997,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKeyParams"
+            "$ref": "#/definitions/ApiKeyParams"
           },
           "description": "A list of API Key parameters."
         },
@@ -4485,21 +4005,21 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1AuthenticatorParamsV2"
+            "$ref": "#/definitions/AuthenticatorParamsV2"
           },
           "description": "A list of Authenticator parameters."
         }
       },
       "required": ["userName", "apiKeys", "authenticators"]
     },
-    "v1SelectorV2": {
+    "SelectorV2": {
       "type": "object",
       "properties": {
         "subject": {
           "type": "string"
         },
         "operator": {
-          "$ref": "#/definitions/immutableactivityv1Operator"
+          "$ref": "#/definitions/activity.v1.Operator"
         },
         "targets": {
           "type": "array",
@@ -4509,11 +4029,11 @@
         }
       }
     },
-    "v1SetOrganizationFeatureIntent": {
+    "SetOrganizationFeatureIntent": {
       "type": "object",
       "properties": {
         "name": {
-          "$ref": "#/definitions/v1FeatureName",
+          "$ref": "#/definitions/FeatureName",
           "description": "Name of the feature to set"
         },
         "value": {
@@ -4523,7 +4043,7 @@
       },
       "required": ["name", "value"]
     },
-    "v1SetOrganizationFeatureRequest": {
+    "SetOrganizationFeatureRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4539,26 +4059,26 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1SetOrganizationFeatureIntent"
+          "$ref": "#/definitions/SetOrganizationFeatureIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1SetOrganizationFeatureResult": {
+    "SetOrganizationFeatureResult": {
       "type": "object",
       "properties": {
         "features": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Feature"
+            "$ref": "#/definitions/Feature"
           },
           "description": "Resulting list of organization features."
         }
       },
       "required": ["features"]
     },
-    "v1SetPaymentMethodIntent": {
+    "SetPaymentMethodIntent": {
       "type": "object",
       "properties": {
         "number": {
@@ -4595,7 +4115,7 @@
         "cardHolderName"
       ]
     },
-    "v1SetPaymentMethodIntentV2": {
+    "SetPaymentMethodIntentV2": {
       "type": "object",
       "properties": {
         "paymentMethodId": {
@@ -4613,7 +4133,7 @@
       },
       "required": ["paymentMethodId", "cardHolderEmail", "cardHolderName"]
     },
-    "v1SetPaymentMethodResult": {
+    "SetPaymentMethodResult": {
       "type": "object",
       "properties": {
         "lastFour": {
@@ -4631,7 +4151,7 @@
       },
       "required": ["lastFour", "cardHolderName", "cardHolderEmail"]
     },
-    "v1SignRawPayloadIntent": {
+    "SignRawPayloadIntent": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -4643,17 +4163,17 @@
           "description": "Raw unsigned payload to be signed."
         },
         "encoding": {
-          "$ref": "#/definitions/immutableactivityv1PayloadEncoding",
+          "$ref": "#/definitions/activity.v1.PayloadEncoding",
           "description": "Encoding of the `payload` string. Turnkey uses this information to convert `payload` into bytes with the correct decoder (e.g. hex, utf8)."
         },
         "hashFunction": {
-          "$ref": "#/definitions/immutableactivityv1HashFunction",
+          "$ref": "#/definitions/activity.v1.HashFunction",
           "description": "Hash function to apply to payload bytes before signing. This field must be set to HASH_FUNCTION_NOT_APPLICABLE for EdDSA/ed25519 signature requests; configurable payload hashing is not supported by RFC 8032."
         }
       },
       "required": ["privateKeyId", "payload", "encoding", "hashFunction"]
     },
-    "v1SignRawPayloadIntentV2": {
+    "SignRawPayloadIntentV2": {
       "type": "object",
       "properties": {
         "signWith": {
@@ -4665,17 +4185,17 @@
           "description": "Raw unsigned payload to be signed."
         },
         "encoding": {
-          "$ref": "#/definitions/immutableactivityv1PayloadEncoding",
+          "$ref": "#/definitions/activity.v1.PayloadEncoding",
           "description": "Encoding of the `payload` string. Turnkey uses this information to convert `payload` into bytes with the correct decoder (e.g. hex, utf8)."
         },
         "hashFunction": {
-          "$ref": "#/definitions/immutableactivityv1HashFunction",
+          "$ref": "#/definitions/activity.v1.HashFunction",
           "description": "Hash function to apply to payload bytes before signing. This field must be set to HASH_FUNCTION_NOT_APPLICABLE for EdDSA/ed25519 signature requests; configurable payload hashing is not supported by RFC 8032."
         }
       },
       "required": ["signWith", "payload", "encoding", "hashFunction"]
     },
-    "v1SignRawPayloadRequest": {
+    "SignRawPayloadRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4691,12 +4211,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1SignRawPayloadIntentV2"
+          "$ref": "#/definitions/SignRawPayloadIntentV2"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1SignRawPayloadResult": {
+    "SignRawPayloadResult": {
       "type": "object",
       "properties": {
         "r": {
@@ -4714,7 +4234,7 @@
       },
       "required": ["r", "s", "v"]
     },
-    "v1SignTransactionIntent": {
+    "SignTransactionIntent": {
       "type": "object",
       "properties": {
         "privateKeyId": {
@@ -4726,12 +4246,12 @@
           "description": "Raw unsigned transaction to be signed by a particular Private Key."
         },
         "type": {
-          "$ref": "#/definitions/v1TransactionType"
+          "$ref": "#/definitions/TransactionType"
         }
       },
       "required": ["privateKeyId", "unsignedTransaction", "type"]
     },
-    "v1SignTransactionIntentV2": {
+    "SignTransactionIntentV2": {
       "type": "object",
       "properties": {
         "signWith": {
@@ -4743,12 +4263,12 @@
           "description": "Raw unsigned transaction to be signed"
         },
         "type": {
-          "$ref": "#/definitions/v1TransactionType"
+          "$ref": "#/definitions/TransactionType"
         }
       },
       "required": ["signWith", "unsignedTransaction", "type"]
     },
-    "v1SignTransactionRequest": {
+    "SignTransactionRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4764,12 +4284,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1SignTransactionIntentV2"
+          "$ref": "#/definitions/SignTransactionIntentV2"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1SignTransactionResult": {
+    "SignTransactionResult": {
       "type": "object",
       "properties": {
         "signedTransaction": {
@@ -4778,7 +4298,7 @@
       },
       "required": ["signedTransaction"]
     },
-    "v1SimpleClientExtensionResults": {
+    "SimpleClientExtensionResults": {
       "type": "object",
       "properties": {
         "appid": {
@@ -4788,15 +4308,15 @@
           "type": "boolean"
         },
         "credProps": {
-          "$ref": "#/definitions/v1CredPropsAuthenticationExtensionsClientOutputs"
+          "$ref": "#/definitions/CredPropsAuthenticationExtensionsClientOutputs"
         }
       }
     },
-    "v1TransactionType": {
+    "TransactionType": {
       "type": "string",
       "enum": ["TRANSACTION_TYPE_ETHEREUM"]
     },
-    "v1UpdateAllowedOriginsIntent": {
+    "UpdateAllowedOriginsIntent": {
       "type": "object",
       "properties": {
         "allowedOrigins": {
@@ -4809,7 +4329,7 @@
       },
       "required": ["allowedOrigins"]
     },
-    "v1UpdateAllowedOriginsRequest": {
+    "UpdateAllowedOriginsRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4825,15 +4345,15 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdateAllowedOriginsIntent"
+          "$ref": "#/definitions/UpdateAllowedOriginsIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdateAllowedOriginsResult": {
+    "UpdateAllowedOriginsResult": {
       "type": "object"
     },
-    "v1UpdatePolicyIntent": {
+    "UpdatePolicyIntent": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -4845,7 +4365,7 @@
           "description": "Human-readable name for a Policy."
         },
         "policyEffect": {
-          "$ref": "#/definitions/immutableactivityv1Effect",
+          "$ref": "#/definitions/activity.v1.Effect",
           "description": "The instruction to DENY or ALLOW an activity (optional)."
         },
         "policyCondition": {
@@ -4863,7 +4383,7 @@
       },
       "required": ["policyId"]
     },
-    "v1UpdatePolicyRequest": {
+    "UpdatePolicyRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4879,12 +4399,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdatePolicyIntent"
+          "$ref": "#/definitions/UpdatePolicyIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdatePolicyResult": {
+    "UpdatePolicyResult": {
       "type": "object",
       "properties": {
         "policyId": {
@@ -4894,7 +4414,7 @@
       },
       "required": ["policyId"]
     },
-    "v1UpdatePrivateKeyTagIntent": {
+    "UpdatePrivateKeyTagIntent": {
       "type": "object",
       "properties": {
         "privateKeyTagId": {
@@ -4922,7 +4442,7 @@
       },
       "required": ["privateKeyTagId", "addPrivateKeyIds", "removePrivateKeyIds"]
     },
-    "v1UpdatePrivateKeyTagRequest": {
+    "UpdatePrivateKeyTagRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4938,12 +4458,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdatePrivateKeyTagIntent"
+          "$ref": "#/definitions/UpdatePrivateKeyTagIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdatePrivateKeyTagResult": {
+    "UpdatePrivateKeyTagResult": {
       "type": "object",
       "properties": {
         "privateKeyTagId": {
@@ -4953,7 +4473,7 @@
       },
       "required": ["privateKeyTagId"]
     },
-    "v1UpdateRootQuorumIntent": {
+    "UpdateRootQuorumIntent": {
       "type": "object",
       "properties": {
         "threshold": {
@@ -4971,7 +4491,7 @@
       },
       "required": ["threshold", "userIds"]
     },
-    "v1UpdateRootQuorumRequest": {
+    "UpdateRootQuorumRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -4987,15 +4507,15 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdateRootQuorumIntent"
+          "$ref": "#/definitions/UpdateRootQuorumIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdateRootQuorumResult": {
+    "UpdateRootQuorumResult": {
       "type": "object"
     },
-    "v1UpdateUserIntent": {
+    "UpdateUserIntent": {
       "type": "object",
       "properties": {
         "userId": {
@@ -5020,7 +4540,7 @@
       },
       "required": ["userId"]
     },
-    "v1UpdateUserRequest": {
+    "UpdateUserRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -5036,12 +4556,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdateUserIntent"
+          "$ref": "#/definitions/UpdateUserIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdateUserResult": {
+    "UpdateUserResult": {
       "type": "object",
       "properties": {
         "userId": {
@@ -5051,7 +4571,7 @@
       },
       "required": ["userId"]
     },
-    "v1UpdateUserTagIntent": {
+    "UpdateUserTagIntent": {
       "type": "object",
       "properties": {
         "userTagId": {
@@ -5079,7 +4599,7 @@
       },
       "required": ["userTagId", "addUserIds", "removeUserIds"]
     },
-    "v1UpdateUserTagRequest": {
+    "UpdateUserTagRequest": {
       "type": "object",
       "properties": {
         "type": {
@@ -5095,12 +4615,12 @@
           "description": "Unique identifier for a given Organization."
         },
         "parameters": {
-          "$ref": "#/definitions/v1UpdateUserTagIntent"
+          "$ref": "#/definitions/UpdateUserTagIntent"
         }
       },
       "required": ["type", "timestampMs", "organizationId", "parameters"]
     },
-    "v1UpdateUserTagResult": {
+    "UpdateUserTagResult": {
       "type": "object",
       "properties": {
         "userTagId": {
@@ -5110,7 +4630,7 @@
       },
       "required": ["userTagId"]
     },
-    "v1User": {
+    "User": {
       "type": "object",
       "properties": {
         "userId": {
@@ -5126,14 +4646,14 @@
           "description": "The user's email address."
         },
         "accessType": {
-          "$ref": "#/definitions/externaldatav1AccessType",
+          "$ref": "#/definitions/external.data.v1.AccessType",
           "description": "The User's permissible access method(s)."
         },
         "authenticators": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1Authenticator"
+            "$ref": "#/definitions/Authenticator"
           },
           "description": "A list of Authenticator parameters."
         },
@@ -5141,7 +4661,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKey"
+            "$ref": "#/definitions/ApiKey"
           },
           "description": "A list of API Key parameters."
         },
@@ -5153,10 +4673,10 @@
           "description": "A list of User Tag IDs."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         },
         "updatedAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         }
       },
       "required": [
@@ -5170,7 +4690,7 @@
         "updatedAt"
       ]
     },
-    "v1UserParams": {
+    "UserParams": {
       "type": "object",
       "properties": {
         "userName": {
@@ -5182,14 +4702,14 @@
           "description": "The user's email address."
         },
         "accessType": {
-          "$ref": "#/definitions/immutableactivityv1AccessType",
+          "$ref": "#/definitions/activity.v1.AccessType",
           "description": "The User's permissible access method(s)."
         },
         "apiKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKeyParams"
+            "$ref": "#/definitions/ApiKeyParams"
           },
           "description": "A list of API Key parameters."
         },
@@ -5197,7 +4717,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1AuthenticatorParams"
+            "$ref": "#/definitions/AuthenticatorParams"
           },
           "description": "A list of Authenticator parameters."
         },
@@ -5217,7 +4737,7 @@
         "userTags"
       ]
     },
-    "v1UserParamsV2": {
+    "UserParamsV2": {
       "type": "object",
       "properties": {
         "userName": {
@@ -5229,14 +4749,14 @@
           "description": "The user's email address."
         },
         "accessType": {
-          "$ref": "#/definitions/immutableactivityv1AccessType",
+          "$ref": "#/definitions/activity.v1.AccessType",
           "description": "The User's permissible access method(s)."
         },
         "apiKeys": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1ApiKeyParams"
+            "$ref": "#/definitions/ApiKeyParams"
           },
           "description": "A list of API Key parameters."
         },
@@ -5244,7 +4764,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1AuthenticatorParamsV2"
+            "$ref": "#/definitions/AuthenticatorParamsV2"
           },
           "description": "A list of Authenticator parameters."
         },
@@ -5264,7 +4784,7 @@
         "userTags"
       ]
     },
-    "v1Vote": {
+    "Vote": {
       "type": "object",
       "properties": {
         "id": {
@@ -5276,7 +4796,7 @@
           "description": "Unique identifier for a given User."
         },
         "user": {
-          "$ref": "#/definitions/v1User",
+          "$ref": "#/definitions/User",
           "description": "Web and/or API user within your Organization."
         },
         "activityId": {
@@ -5304,7 +4824,7 @@
           "description": "Method used to produce a signature."
         },
         "createdAt": {
-          "$ref": "#/definitions/externaldatav1Timestamp"
+          "$ref": "#/definitions/external.data.v1.Timestamp"
         }
       },
       "required": [
@@ -5320,15 +4840,15 @@
         "createdAt"
       ]
     },
-    "v1WalletAccountParams": {
+    "WalletAccountParams": {
       "type": "object",
       "properties": {
         "curve": {
-          "$ref": "#/definitions/immutablecommonv1Curve",
+          "$ref": "#/definitions/common.v1.Curve",
           "description": "Cryptographic curve used to generate a wallet Account."
         },
         "pathFormat": {
-          "$ref": "#/definitions/v1PathFormat",
+          "$ref": "#/definitions/PathFormat",
           "description": "Path format used to generate a wallet Account."
         },
         "path": {
@@ -5336,13 +4856,13 @@
           "description": "Path used to generate a wallet Account."
         },
         "addressFormat": {
-          "$ref": "#/definitions/immutablecommonv1AddressFormat",
+          "$ref": "#/definitions/common.v1.AddressFormat",
           "description": "Address format used to generate a wallet Acccount."
         }
       },
       "required": ["curve", "pathFormat", "path", "addressFormat"]
     },
-    "v1WalletParams": {
+    "WalletParams": {
       "type": "object",
       "properties": {
         "walletName": {
@@ -5353,14 +4873,14 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1WalletAccountParams"
+            "$ref": "#/definitions/WalletAccountParams"
           },
           "description": "A list of wallet Accounts."
         }
       },
       "required": ["walletName", "accounts"]
     },
-    "v1WalletResult": {
+    "WalletResult": {
       "type": "object",
       "properties": {
         "walletId": {
@@ -5375,6 +4895,203 @@
         }
       },
       "required": ["walletId", "addresses"]
+    },
+    "activity.v1.AccessType": {
+      "type": "string",
+      "enum": ["ACCESS_TYPE_WEB", "ACCESS_TYPE_API", "ACCESS_TYPE_ALL"]
+    },
+    "activity.v1.Address": {
+      "type": "object",
+      "properties": {
+        "format": {
+          "$ref": "#/definitions/common.v1.AddressFormat"
+        },
+        "address": {
+          "type": "string"
+        }
+      }
+    },
+    "activity.v1.Effect": {
+      "type": "string",
+      "enum": ["EFFECT_ALLOW", "EFFECT_DENY"]
+    },
+    "activity.v1.HashFunction": {
+      "type": "string",
+      "enum": [
+        "HASH_FUNCTION_NO_OP",
+        "HASH_FUNCTION_SHA256",
+        "HASH_FUNCTION_KECCAK256",
+        "HASH_FUNCTION_NOT_APPLICABLE"
+      ]
+    },
+    "activity.v1.Operator": {
+      "type": "string",
+      "enum": [
+        "OPERATOR_EQUAL",
+        "OPERATOR_MORE_THAN",
+        "OPERATOR_MORE_THAN_OR_EQUAL",
+        "OPERATOR_LESS_THAN",
+        "OPERATOR_LESS_THAN_OR_EQUAL",
+        "OPERATOR_CONTAINS",
+        "OPERATOR_NOT_EQUAL",
+        "OPERATOR_IN",
+        "OPERATOR_NOT_IN",
+        "OPERATOR_CONTAINS_ONE",
+        "OPERATOR_CONTAINS_ALL"
+      ]
+    },
+    "activity.v1.PayloadEncoding": {
+      "type": "string",
+      "enum": ["PAYLOAD_ENCODING_HEXADECIMAL", "PAYLOAD_ENCODING_TEXT_UTF8"]
+    },
+    "activity.v1.Selector": {
+      "type": "object",
+      "properties": {
+        "subject": {
+          "type": "string"
+        },
+        "operator": {
+          "$ref": "#/definitions/activity.v1.Operator"
+        },
+        "target": {
+          "type": "string"
+        }
+      }
+    },
+    "common.v1.AddressFormat": {
+      "type": "string",
+      "enum": [
+        "ADDRESS_FORMAT_UNCOMPRESSED",
+        "ADDRESS_FORMAT_COMPRESSED",
+        "ADDRESS_FORMAT_ETHEREUM",
+        "ADDRESS_FORMAT_SOLANA",
+        "ADDRESS_FORMAT_COSMOS"
+      ]
+    },
+    "common.v1.Curve": {
+      "type": "string",
+      "enum": ["CURVE_SECP256K1", "CURVE_ED25519"]
+    },
+    "data.v1.Address": {
+      "type": "object",
+      "properties": {
+        "format": {
+          "$ref": "#/definitions/data.v1.AddressFormat"
+        },
+        "address": {
+          "type": "string"
+        }
+      }
+    },
+    "data.v1.AddressFormat": {
+      "type": "string",
+      "enum": [
+        "ADDRESS_FORMAT_UNCOMPRESSED",
+        "ADDRESS_FORMAT_COMPRESSED",
+        "ADDRESS_FORMAT_ETHEREUM"
+      ]
+    },
+    "data.v1.AuthenticatorTransport": {
+      "type": "string",
+      "enum": [
+        "AUTHENTICATOR_TRANSPORT_BLE",
+        "AUTHENTICATOR_TRANSPORT_INTERNAL",
+        "AUTHENTICATOR_TRANSPORT_NFC",
+        "AUTHENTICATOR_TRANSPORT_USB",
+        "AUTHENTICATOR_TRANSPORT_HYBRID"
+      ]
+    },
+    "data.v1.Curve": {
+      "type": "string",
+      "enum": ["CURVE_SECP256K1", "CURVE_ED25519"]
+    },
+    "data.v1.Effect": {
+      "type": "string",
+      "enum": ["EFFECT_ALLOW", "EFFECT_DENY"]
+    },
+    "data.v1.Operator": {
+      "type": "string",
+      "enum": [
+        "OPERATOR_EQUAL",
+        "OPERATOR_MORE_THAN",
+        "OPERATOR_MORE_THAN_OR_EQUAL",
+        "OPERATOR_LESS_THAN",
+        "OPERATOR_LESS_THAN_OR_EQUAL",
+        "OPERATOR_CONTAINS",
+        "OPERATOR_NOT_EQUAL",
+        "OPERATOR_IN",
+        "OPERATOR_NOT_IN",
+        "OPERATOR_CONTAINS_ONE",
+        "OPERATOR_CONTAINS_ALL"
+      ]
+    },
+    "data.v1.Selector": {
+      "type": "object",
+      "properties": {
+        "subject": {
+          "type": "string",
+          "description": "The resource being referenced within a policy (e.g., user.tags or activities.type)."
+        },
+        "operator": {
+          "$ref": "#/definitions/data.v1.Operator",
+          "description": "Logical operators like OPERATOR_CONTAINS or OPERATOR_EQUAL."
+        },
+        "targets": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "The specific parameter from the subject being referenced, like a specific user ID."
+        }
+      },
+      "required": ["subject", "operator", "targets"]
+    },
+    "external.data.v1.AccessType": {
+      "type": "string",
+      "enum": ["ACCESS_TYPE_WEB", "ACCESS_TYPE_API", "ACCESS_TYPE_ALL"]
+    },
+    "external.data.v1.Credential": {
+      "type": "object",
+      "properties": {
+        "publicKey": {
+          "type": "string",
+          "description": "The public component of a cryptographic key pair used to sign messages and transactions."
+        },
+        "type": {
+          "$ref": "#/definitions/external.data.v1.CredentialType"
+        }
+      },
+      "required": ["publicKey", "type"]
+    },
+    "external.data.v1.CredentialType": {
+      "type": "string",
+      "enum": [
+        "CREDENTIAL_TYPE_WEBAUTHN_AUTHENTICATOR",
+        "CREDENTIAL_TYPE_API_KEY_P256",
+        "CREDENTIAL_TYPE_RECOVER_USER_KEY_P256"
+      ]
+    },
+    "external.data.v1.Timestamp": {
+      "type": "object",
+      "properties": {
+        "seconds": {
+          "type": "string"
+        },
+        "nanos": {
+          "type": "string"
+        }
+      },
+      "required": ["seconds", "nanos"]
+    },
+    "webauthn.v1.AuthenticatorTransport": {
+      "type": "string",
+      "enum": [
+        "AUTHENTICATOR_TRANSPORT_BLE",
+        "AUTHENTICATOR_TRANSPORT_INTERNAL",
+        "AUTHENTICATOR_TRANSPORT_NFC",
+        "AUTHENTICATOR_TRANSPORT_USB",
+        "AUTHENTICATOR_TRANSPORT_HYBRID"
+      ]
     }
   },
   "securityDefinitions": {
@@ -5404,7 +5121,7 @@
     },
     {
       "name": "PRIVATE KEYS",
-      "tags": ["Wallets", "Signatures", "Private Keys", "Private Key Tags"]
+      "tags": ["Wallets", "Signers", "Private Keys", "Private Key Tags"]
     },
     {
       "name": "USERS",
@@ -5412,7 +5129,7 @@
     },
     {
       "name": "CREDENTIALS",
-      "tags": ["Authenticators", "API Keys", "Who am I?"]
+      "tags": ["Authenticators", "API Keys", "Sessions"]
     },
     {
       "name": "ACTIVITIES",