@whooshbang/contracts 1.0.0-rc.21 → 1.0.0-rc.23

package/openapi/whooshbang-v1.yaml

@@ -1,18 +1,18 @@
 openapi: 3.1.1
 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
 # whooshbang:public-origin production api https://api.whooshbang.com
-x-contract-version: 1.0.0-rc.21
+x-contract-version: 1.0.0-rc.23
 info:
   title: WhooshBang API
-  version: 1.0.0-rc.21
+  version: 1.0.0-rc.23
   description: |
-    The V1 contract for human account/project administration, project-scoped
+    The V1 contract for human organization/project administration, project-scoped
     subscription links, and asynchronous text messages. A Clerk session selects
-    one account for administration. A project credential selects one account,
+    one organization for administration. A project credential selects one organization,
     project, and `test` or `live` environment for product operations; request
     bodies cannot override either authenticated scope.
 
-    A person's OAuth grant selects one account and carries scopes, but no
+    A person's OAuth grant selects one organization and carries scopes, but no
     project. It names the project and environment it acts in through the URL
     path, on the environment-scoped form of each operation; the service checks
     that path against the granting person's membership on every call. The flat
@@ -35,14 +35,14 @@ servers:
 security:
   - bearerCredential: []
 tags:
-  - name: Account
-    description: The current Clerk organization projected as a WhooshBang account.
+  - name: Organization
+    description: The current Clerk organization projected as a WhooshBang organization.
   - name: Projects
-    description: Account-scoped applications with transactionally bootstrapped test/live environments.
+    description: Organization-scoped applications with transactionally bootstrapped test/live environments.
   - name: API credentials
     description: Human-administered, environment-scoped bearer credentials with one-time secret reveal.
-  - name: Account credentials
-    description: Human-administered, account-scoped bearer credentials that name their project and environment per call.
+  - name: Organization credentials
+    description: Human-administered, organization-scoped bearer credentials that name their project and environment per call.
   - name: Subscription links
     description: Single-use, expiring Telegram authorization links.
   - name: Messages
@@ -66,69 +66,119 @@ tags:
   - name: Group broadcasts
     description: Durable group acceptance and aggregate projection over ordinary child messages.
 paths:
-  /v1/account:
+  /v1/organization:
     get:
-      operationId: getAccount
-      summary: Read the current account projection
+      operationId: getOrganization
+      summary: Read the current organization projection
       description: |
-        Returns the WhooshBang account selected by the verified Clerk
+        Returns the WhooshBang organization selected by the verified Clerk
         organization session and the caller's projected role. Clerk organization
         and user identifiers are never public response fields.
       tags:
-        - Account
+        - Organization
       security:
         - clerkSession: []
         - bearerGrant: []
-      x-account-membership: required
+      x-organization-membership: required
       responses:
         "200":
-          description: The current account projection.
+          description: The current organization projection.
           headers:
             WhooshBang-Diagnostic-Id:
               $ref: "#/components/headers/DiagnosticId"
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/AccountProjection"
+                $ref: "#/components/schemas/OrganizationProjection"
               examples:
-                projectedAccount:
-                  externalValue: ../fixtures/core-v1/success/account-projection.json
+                projectedOrganization:
+                  externalValue: ../fixtures/core-v1/success/organization-projection.json
         "401":
           $ref: "#/components/responses/Unauthorized"
         "403":
           $ref: "#/components/responses/Forbidden"
         "429":
           $ref: "#/components/responses/RateLimited"
-  /v1/account/credentials:
+  /v1/organization/close:
+    post:
+      operationId: closeOrganization
+      summary: Close the current customer organization
+      description: |
+        Terminally closes the organization selected by the verified Clerk
+        organization session. Only an administrator may close it. OAuth grants
+        and API credentials are deliberately excluded: delegated authority must
+        not be able to erase the organization that granted it.
+
+        The request requires the exact confirmation `close-organization`. Repeating a
+        completed closure is safe and returns the original `closed_at`. The
+        result names provider-owned resources the administrator must still retire
+        outside WhooshBang, such as revoking a customer-managed Telegram bot token
+        in BotFather; no provider credential is returned.
+      tags:
+        - Organization
+      security:
+        - clerkSession: []
+      x-organization-membership: required
+      x-required-membership-role: admin
+      x-repeat-semantics:
+        same_target: idempotent
+        secret_returned: false
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/CloseOrganizationRequest"
+      responses:
+        "200":
+          description: The organization is closed, with any manual provider retirement still required.
+          headers:
+            WhooshBang-Diagnostic-Id:
+              $ref: "#/components/headers/DiagnosticId"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/OrganizationClosureResult"
+        "400":
+          $ref: "#/components/responses/BadRequest"
+        "401":
+          $ref: "#/components/responses/Unauthorized"
+        "403":
+          $ref: "#/components/responses/Forbidden"
+        "409":
+          $ref: "#/components/responses/Conflict"
+        "429":
+          $ref: "#/components/responses/RateLimited"
+  /v1/organization/credentials:
     get:
-      operationId: listAccountCredentials
-      summary: List safe account credential metadata
+      operationId: listOrganizationCredentials
+      summary: List safe organization credential metadata
       description: |
-        Returns only credentials owned by the account selected by the verified
+        Returns only credentials owned by the organization selected by the verified
         Clerk organization session. Secrets and digest material are never
         returned.
       tags:
-        - Account credentials
+        - Organization credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       parameters:
         - $ref: "#/components/parameters/ApiCredentialAfterCursor"
         - $ref: "#/components/parameters/ApiCredentialPageLimit"
         - $ref: "#/components/parameters/PageNumber"
       responses:
         "200":
-          description: A stable page of safe account credential metadata.
+          description: A stable page of safe organization credential metadata.
           headers:
             WhooshBang-Diagnostic-Id:
               $ref: "#/components/headers/DiagnosticId"
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/AccountCredentialCollection"
+                $ref: "#/components/schemas/OrganizationCredentialCollection"
               examples:
-                accountCredentials:
-                  externalValue: ../fixtures/core-v1/success/account-credential-collection.json
+                organizationCredentials:
+                  externalValue: ../fixtures/core-v1/success/organization-credential-collection.json
         "400":
           $ref: "#/components/responses/BadRequest"
         "401":
@@ -140,10 +190,10 @@ paths:
         "429":
           $ref: "#/components/responses/RateLimited"
     post:
-      operationId: createAccountCredential
-      summary: Create an account-scoped API credential
+      operationId: createOrganizationCredential
+      summary: Create an organization-scoped API credential
       description: |
-        Creates one credential against the whole account. It names no project
+        Creates one credential against the whole organization. It names no project
         and no environment: a request names them in its path, and the
         credential's authority on that path is the intersection of its scopes
         with the project-credential vocabulary, so it is never wider than a
@@ -151,10 +201,10 @@ paths:
         The complete bearer secret appears only in this creation response. It
         cannot be read later and is never replayed from an idempotency cache.
       tags:
-        - Account credentials
+        - Organization credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-secret-reveal:
         responses: 1
         replayable: false
@@ -164,10 +214,10 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/CreateAccountCredentialRequest"
+              $ref: "#/components/schemas/CreateOrganizationCredentialRequest"
             examples:
-              createAccountCredential:
-                externalValue: ../fixtures/core-v1/requests/create-account-credential.json
+              createOrganizationCredential:
+                externalValue: ../fixtures/core-v1/requests/create-organization-credential.json
       responses:
         "201":
           description: Creation-only secret reveal and safe credential metadata.
@@ -177,10 +227,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/AccountCredentialSecretReveal"
+                $ref: "#/components/schemas/OrganizationCredentialSecretReveal"
               examples:
-                createdAccountCredential:
-                  externalValue: ../fixtures/core-v1/success/account-credential-created.json
+                createdOrganizationCredential:
+                  externalValue: ../fixtures/core-v1/success/organization-credential-created.json
         "400":
           $ref: "#/components/responses/BadRequest"
         "401":
@@ -191,24 +241,24 @@ paths:
           $ref: "#/components/responses/NotFound"
         "429":
           $ref: "#/components/responses/RateLimited"
-  /v1/account/credentials/{account_credential_id}/rotate:
+  /v1/organization/credentials/{organization_credential_id}/rotate:
     parameters:
-      - $ref: "#/components/parameters/AccountCredentialId"
+      - $ref: "#/components/parameters/OrganizationCredentialId"
     post:
-      operationId: rotateAccountCredential
-      summary: Rotate an account-scoped API credential
+      operationId: rotateOrganizationCredential
+      summary: Rotate an organization-scoped API credential
       description: |
         Creates one replacement with the same label and scopes. The complete new
         bearer secret appears only in this response. The replaced credential
         remains active for the explicitly declared overlap, from zero through
         86400 seconds, then becomes terminally revoked. A revoked credential
-        cannot be rotated. Missing and out-of-account credentials use the same
+        cannot be rotated. Missing and out-of-organization credentials use the same
         non-enumerating `404`.
       tags:
-        - Account credentials
+        - Organization credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-secret-reveal:
         responses: 1
         replayable: false
@@ -218,10 +268,10 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/RotateAccountCredentialRequest"
+              $ref: "#/components/schemas/RotateOrganizationCredentialRequest"
             examples:
-              rotateAccountCredential:
-                externalValue: ../fixtures/core-v1/requests/rotate-account-credential.json
+              rotateOrganizationCredential:
+                externalValue: ../fixtures/core-v1/requests/rotate-organization-credential.json
       responses:
         "201":
           description: Creation-only replacement secret and safe metadata for both credentials.
@@ -231,10 +281,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/AccountCredentialRotation"
+                $ref: "#/components/schemas/OrganizationCredentialRotation"
               examples:
-                rotatedAccountCredential:
-                  externalValue: ../fixtures/core-v1/success/account-credential-rotated.json
+                rotatedOrganizationCredential:
+                  externalValue: ../fixtures/core-v1/success/organization-credential-rotated.json
         "400":
           $ref: "#/components/responses/BadRequest"
         "401":
@@ -245,23 +295,23 @@ paths:
           $ref: "#/components/responses/NotFound"
         "429":
           $ref: "#/components/responses/RateLimited"
-  /v1/account/credentials/{account_credential_id}/revoke:
+  /v1/organization/credentials/{organization_credential_id}/revoke:
     parameters:
-      - $ref: "#/components/parameters/AccountCredentialId"
+      - $ref: "#/components/parameters/OrganizationCredentialId"
     post:
-      operationId: revokeAccountCredential
-      summary: Revoke an account-scoped API credential
+      operationId: revokeOrganizationCredential
+      summary: Revoke an organization-scoped API credential
       description: |
         Immediately and terminally revokes the selected credential. Repeating
         the request for the same visible credential is safe and returns the
         same revoked metadata without revealing secret or digest material.
-        Missing and out-of-account credentials use the same non-enumerating
+        Missing and out-of-organization credentials use the same non-enumerating
         `404`.
       tags:
-        - Account credentials
+        - Organization credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-repeat-semantics:
         same_target: idempotent
         secret_returned: false
@@ -274,10 +324,10 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/AccountCredential"
+                $ref: "#/components/schemas/OrganizationCredential"
               examples:
-                revokedAccountCredential:
-                  externalValue: ../fixtures/core-v1/success/account-credential-revoked.json
+                revokedOrganizationCredential:
+                  externalValue: ../fixtures/core-v1/success/organization-credential-revoked.json
         "401":
           $ref: "#/components/responses/Unauthorized"
         "403":
@@ -289,9 +339,9 @@ paths:
   /v1/projects:
     get:
       operationId: listProjects
-      summary: List projects in the current account
+      summary: List projects in the current organization
       description: |
-        Returns only projects owned by the account selected by the verified
+        Returns only projects owned by the organization selected by the verified
         Clerk organization session. Every project includes its complete test/live
         environment and default-notifier bootstrap.
       tags:
@@ -299,17 +349,17 @@ paths:
       security:
         - clerkSession: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - projects:read
-      x-account-membership: required
+      x-organization-membership: required
       parameters:
         - $ref: "#/components/parameters/ProjectAfterCursor"
         - $ref: "#/components/parameters/ProjectPageLimit"
         - $ref: "#/components/parameters/PageNumber"
       responses:
         "200":
-          description: A stable page of projects in the current account.
+          description: A stable page of projects in the current organization.
           headers:
             WhooshBang-Diagnostic-Id:
               $ref: "#/components/headers/DiagnosticId"
@@ -332,7 +382,7 @@ paths:
       operationId: createProject
       summary: Create a project and its default environments
       description: |
-        Creates one project inside the authenticated account. The project, its
+        Creates one project inside the authenticated organization. The project, its
         `test` and `live` environments, and one `Default` notifier per
         environment are one atomic logical resource. Equivalent replay returns
         the original `201` response without extending idempotency retention.
@@ -343,12 +393,12 @@ paths:
         - bearerGrant: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       x-idempotency:
         required: true
         retention_seconds: 604800
         scope:
-          - authenticated_account
+          - authenticated_organization
           - operation_id
           - key
         equivalence: validated_request
@@ -392,19 +442,19 @@ paths:
       - $ref: "#/components/parameters/ProjectId"
     get:
       operationId: getProject
-      summary: Read one project in the current account
+      summary: Read one project in the current organization
       description: |
         Returns the complete project bootstrap. An absent project and a project
-        outside the authenticated account use the same non-enumerating `404`.
+        outside the authenticated organization use the same non-enumerating `404`.
       tags:
         - Projects
       security:
         - clerkSession: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - projects:read
-      x-account-membership: required
+      x-organization-membership: required
       responses:
         "200":
           description: The current project and its two environments.
@@ -426,6 +476,57 @@ paths:
           $ref: "#/components/responses/NotFound"
         "429":
           $ref: "#/components/responses/RateLimited"
+    patch:
+      operationId: updateProject
+      summary: Set a project's privacy policy
+      description: |
+        Changes profile collection for both project environments. minimal is the
+        default for new and existing projects. standard permits messenger profiles;
+        minimal keeps recipient language only; private keeps delivery routing and
+        the customer-supplied subscriber identifier, with no profile data.
+        Moving standard to minimal erases existing identifying profile fields.
+        Moving to private also erases recipient language. Increasing collection
+        does not restore erased data. The operation is naturally idempotent.
+        An absent project and one outside the organization return the same 404.
+      tags:
+        - Projects
+      security:
+        - clerkSession: []
+        - bearerGrant: []
+        - bearerCredential: []
+        - bearerOrganizationCredential: []
+      x-required-scopes:
+        - projects:write
+      x-organization-membership: required
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/UpdateProjectRequest"
+            examples:
+              updateProject:
+                externalValue: ../fixtures/core-v1/requests/update-project.json
+      responses:
+        "200":
+          description: The project after changing its privacy policy and clearing disallowed profile fields.
+          headers:
+            WhooshBang-Diagnostic-Id:
+              $ref: "#/components/headers/DiagnosticId"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Project"
+        "400":
+          $ref: "#/components/responses/BadRequest"
+        "401":
+          $ref: "#/components/responses/Unauthorized"
+        "403":
+          $ref: "#/components/responses/Forbidden"
+        "404":
+          $ref: "#/components/responses/NotFound"
+        "429":
+          $ref: "#/components/responses/RateLimited"
   /v1/projects/{project_id}/recipient-copy-overrides:
     parameters:
       - $ref: "#/components/parameters/ProjectId"
@@ -434,7 +535,7 @@ paths:
       summary: List sparse recipient-copy overrides for one project
       description: |
         Returns only customer-authored overrides for the project in the
-        authenticated account. Missing values are intentionally absent and use
+        authenticated organization. Missing values are intentionally absent and use
         WhooshBang's complete shipped catalog at render time. An optional
         canonical language filter preserves the project + language + string
         address without applying locale negotiation.
@@ -446,7 +547,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:read
-      x-account-membership: required
+      x-organization-membership: required
       parameters:
         - name: language
           in: query
@@ -504,7 +605,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       requestBody:
         required: true
         content:
@@ -546,7 +647,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       responses:
         "204":
           description: The shipped catalog value is effective at this address.
@@ -569,15 +670,15 @@ paths:
       summary: List safe API credential metadata
       description: |
         Returns only credentials in the selected project environment owned by
-        the account selected by the verified Clerk organization session.
+        the organization selected by the verified Clerk organization session.
         Secrets and digest material are never returned. An absent or
-        out-of-account project or environment uses the same non-enumerating
+        out-of-organization project or environment uses the same non-enumerating
         `404`.
       tags:
         - API credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       parameters:
         - $ref: "#/components/parameters/ApiCredentialAfterCursor"
         - $ref: "#/components/parameters/ApiCredentialPageLimit"
@@ -618,7 +719,7 @@ paths:
         - API credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-secret-reveal:
         responses: 1
         replayable: false
@@ -674,7 +775,7 @@ paths:
         - API credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-secret-reveal:
         responses: 1
         replayable: false
@@ -728,7 +829,7 @@ paths:
         - API credentials
       security:
         - clerkSession: []
-      x-account-membership: required
+      x-organization-membership: required
       x-repeat-semantics:
         same_target: idempotent
         secret_returned: false
@@ -922,7 +1023,7 @@ paths:
       security:
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-idempotency:
@@ -996,7 +1097,7 @@ paths:
       security:
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-repeat-semantics:
@@ -1021,6 +1122,10 @@ paths:
         Durably accepts one logical text message for one subscriber and one
         resolved channel binding. `202` proves API acceptance only; it does not
         claim provider acceptance or end-device delivery.
+        The reserved `test:` subscriber prefix and `delivery_target: simulator`
+        are test-environment-only. Live sends are refused before acceptance or
+        idempotent replay with `400 request_invalid`; reserved subscriber IDs
+        carry a field error at `/to/subscriber_id`.
       tags:
         - Messages
       security:
@@ -1276,6 +1381,8 @@ paths:
         project credential. The notifier, subscriber, and active binding become
         immutable authorization bounds. The response never contains a readable
         secret or digest.
+        Live environments reject the reserved `test:` subscriber prefix with
+        `400 request_invalid` and a field error at `/subscriber_id` before creation.
       tags:
         - Machine clients
       security:
@@ -1669,7 +1776,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       parameters:
@@ -1709,7 +1816,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-idempotency:
@@ -1784,7 +1891,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       responses:
@@ -1814,7 +1921,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       responses:
@@ -1848,7 +1955,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-idempotency:
@@ -1921,7 +2028,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-repeat-semantics:
@@ -1956,7 +2063,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       parameters:
@@ -1997,7 +2104,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       responses:
@@ -2034,7 +2141,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       parameters:
@@ -2043,7 +2150,7 @@ paths:
         - $ref: "#/components/parameters/PageNumber"
       responses:
         "200":
-          description: Connections owned by exactly this account, project, and environment.
+          description: Connections owned by exactly this organization, project, and environment.
           headers:
             WhooshBang-Diagnostic-Id:
               $ref: "#/components/headers/DiagnosticId"
@@ -2078,7 +2185,7 @@ paths:
         on the submitted credential instead.
 
         `customer_managed` supplies no credential at all. Telegram creates a
-        brand new bot on the administrator's own account and hands WhooshBang
+        brand new bot on the administrator's own Telegram account and hands WhooshBang
         its token server to server, so the token never reaches a browser, a
         clipboard, this request, or any response. The connection is returned
         `pending` with a `setup` carrying the link the administrator opens and
@@ -2112,7 +2219,7 @@ paths:
           consequence is separate: confirming this one **disables** the other
           connection, which would otherwise go on reporting itself healthy while
           receiving nothing;
-        - the identity is already connected, by this account or any other —
+        - the identity is already connected, by this organization or any other —
           `idempotency_conflict` 409, `provider_identity_claimed` at `/`, which
           reports only that the identity the submitted credential proves is in
           use and never that some other identity is;
@@ -2126,7 +2233,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       x-idempotency:
@@ -2207,7 +2314,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       responses:
@@ -2240,7 +2347,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       requestBody:
@@ -2288,7 +2395,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       responses:
@@ -2348,7 +2455,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       responses:
@@ -2402,7 +2509,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       x-idempotency:
@@ -2482,7 +2589,7 @@ paths:
 
         A bot the previous attempt already created is not withdrawn and cannot
         be: Telegram exposes no way to delete a bot. The administrator keeps it
-        in their own account until they retire it in BotFather, and a restart
+        in their own Telegram account until they retire it in BotFather, and a restart
         walks them through creating another rather than pretending the first
         never happened.
 
@@ -2506,7 +2613,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       x-repeat-semantics:
@@ -2621,7 +2728,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       requestBody:
@@ -2700,7 +2807,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       responses:
@@ -2764,7 +2871,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       responses:
@@ -2806,7 +2913,7 @@ paths:
 
         It exists so the owner can read what they are about to approve, and a
         reviewer can check it, without opening Slack or decoding a URL. It
-        carries configuration only: no account, project, or environment, no
+        carries configuration only: no organization, project, or environment, no
         credential, and no provider-native identifier.
 
         Only a `customer_managed` Slack connection has one. Every other
@@ -2818,7 +2925,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       responses:
@@ -2858,7 +2965,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       parameters:
@@ -2951,7 +3058,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       x-idempotency:
@@ -3024,7 +3131,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       responses:
@@ -3068,7 +3175,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:read
       parameters:
@@ -3077,7 +3184,7 @@ paths:
         - $ref: "#/components/parameters/PageNumber"
       responses:
         "200":
-          description: Routes owned by exactly this account, project, and environment.
+          description: Routes owned by exactly this organization, project, and environment.
           headers:
             WhooshBang-Diagnostic-Id:
               $ref: "#/components/headers/DiagnosticId"
@@ -3133,7 +3240,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       requestBody:
@@ -3196,7 +3303,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - connections:write
       responses:
@@ -3232,7 +3339,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:read
-      x-account-membership: required
+      x-organization-membership: required
       responses:
         "200":
           description: Current constrained project recipient experience.
@@ -3260,7 +3367,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       requestBody:
         required: true
         content:
@@ -3305,7 +3412,7 @@ paths:
         - bearerCredential: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       parameters:
         - name: WhooshBang-Recipient-Experience-Version
           in: header
@@ -3352,10 +3459,10 @@ paths:
         - clerkSession: []
         - bearerGrant: []
         - bearerCredential: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - projects:read
-      x-account-membership: required
+      x-organization-membership: required
       responses:
         "200":
           description: Current revisioned environment recipient experience.
@@ -3388,10 +3495,10 @@ paths:
         - clerkSession: []
         - bearerGrant: []
         - bearerCredential: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - projects:write
-      x-account-membership: required
+      x-organization-membership: required
       requestBody:
         required: true
         content:
@@ -3423,7 +3530,7 @@ paths:
       operationId: createRecipientSession
       summary: Create one attenuated recipient browser session
       description: |
-        The authenticated project credential supplies account, project, and
+        The authenticated project credential supplies organization, project, and
         environment. The request supplies only one subscriber, optional locale,
         optional registered return key, and bounded expiry. The response is the
         only reveal of the browser capability and contains no resolved return
@@ -3494,7 +3601,7 @@ paths:
         Repeating the request is safe. An already revoked, absent, or
         out-of-scope session produces the same empty response, so this route
         cannot be used to enumerate session identifiers across environments or
-        accounts.
+        organizations.
       tags:
         - Recipient experience
       security:
@@ -4231,7 +4338,7 @@ paths:
       summary: Create a subscription link in a named project environment
       description: |
         The environment-scoped form of `createSubscriptionLink`, for a caller
-        whose authority selects an account rather than a project. Behavior,
+        whose authority selects an organization rather than a project. Behavior,
         request, and response are identical; the path names the scope the
         credential form takes from its bearer, and the service checks it
         against the granting person's membership before acting.
@@ -4239,14 +4346,14 @@ paths:
         - Subscription links
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       x-idempotency:
         required: true
         retention_seconds: 604800
         scope:
-          - authenticated_account
+          - authenticated_organization
           - operation_id
           - key
         equivalence: validated_request
@@ -4299,7 +4406,7 @@ paths:
         - Subscription links
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:read
       responses:
@@ -4332,21 +4439,21 @@ paths:
       summary: Create an asynchronous message in a named project environment
       description: |
         The environment-scoped form of `createMessage`. The path names the
-        account, project, and environment the credential form takes from its
+        organization, project, and environment the credential form takes from its
         bearer; test and live remain a property of the named environment and are
         never selected by the request body.
       tags:
         - Messages
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-idempotency:
         required: true
         retention_seconds: 604800
         scope:
-          - authenticated_account
+          - authenticated_organization
           - operation_id
           - key
         equivalence: validated_request
@@ -4404,7 +4511,7 @@ paths:
         - Messages
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       responses:
@@ -4447,7 +4554,7 @@ paths:
         - Messages
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       responses:
@@ -4487,14 +4594,14 @@ paths:
         - Machine clients
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - machine-clients:write
       x-idempotency:
         required: true
         retention_seconds: 604800
         scope:
-          - authenticated_account
+          - authenticated_organization
           - operation_id
           - key
         equivalence: validated_request
@@ -4551,7 +4658,7 @@ paths:
         - Machine clients
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - machine-clients:write
       x-idempotency:
@@ -4617,7 +4724,7 @@ paths:
         - Capabilities
       security:
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - capabilities:read
       responses:
@@ -4650,7 +4757,7 @@ paths:
       summary: Create a subscriber and initial memberships in a named project environment
       description: |
         The environment-scoped form of `createSubscriber`, for a caller whose
-        authority selects an account rather than a project. Behavior, request,
+        authority selects an organization rather than a project. Behavior, request,
         and response are identical; the path names the scope the credential
         form takes from its bearer, and the service checks it against the
         presenting session or grant before acting.
@@ -4660,7 +4767,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       x-idempotency:
@@ -4724,7 +4831,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:read
       responses:
@@ -4740,6 +4847,103 @@ paths:
           $ref: "#/components/responses/Forbidden"
         "404":
           $ref: "#/components/responses/NotFound"
+  /v1/projects/{project_id}/subscribers/{subscriber_id}:
+    parameters:
+      - $ref: "#/components/parameters/ProjectId"
+      - name: subscriber_id
+        in: path
+        required: true
+        schema:
+          $ref: "#/components/schemas/OpaqueIdentifier"
+    delete:
+      operationId: eraseSubscriber
+      summary: Erase one subscriber across the project
+      description: |
+        Erases the person represented by this customer-supplied subscriber id
+        across both project environments. Personal content, answers, identities,
+        and identifiers are removed while non-identifying delivery and usage
+        shells remain. Pending work and old capabilities cannot restore or send
+        data for the erased person.
+
+        Repeating the operation is safe, including when the subscriber is already
+        absent. Project-environment credentials cannot call this project-wide
+        operation. A provider action that has already begun returns
+        `privacy_operation_in_progress` rather than claiming erasure won the race;
+        retry after that operation finishes.
+      tags:
+        - Subscribers
+      security:
+        - clerkSession: []
+        - bearerGrant: []
+        - bearerOrganizationCredential: []
+      x-required-scopes:
+        - subscriptions:write
+        - messages:write
+        - machine-clients:write
+      x-organization-membership: required
+      x-repeat-semantics:
+        same_target: idempotent
+        secret_returned: false
+      responses:
+        "204":
+          description: The subscriber's personal data is erased or was already absent.
+        "401":
+          $ref: "#/components/responses/Unauthorized"
+        "403":
+          $ref: "#/components/responses/Forbidden"
+        "404":
+          $ref: "#/components/responses/NotFound"
+        "409":
+          $ref: "#/components/responses/Conflict"
+        "429":
+          $ref: "#/components/responses/RateLimited"
+  /v1/projects/{project_id}/subscribers/{subscriber_id}/data-export:
+    parameters:
+      - $ref: "#/components/parameters/ProjectId"
+      - name: subscriber_id
+        in: path
+        required: true
+        schema:
+          $ref: "#/components/schemas/OpaqueIdentifier"
+    get:
+      operationId: getSubscriberDataExport
+      summary: Export all customer-controlled data held for one subscriber
+      description: |
+        Returns one complete, machine-readable artifact across every environment
+        in the project. `provided_by_subscriber` is the Article 20 portable subset;
+        the three provenance sections together provide the Article 15 access copy.
+        WhooshBang-controller audit and service log data is identified as excluded
+        and requires a separate recipient request. Project-environment credentials
+        cannot call this project-wide operation.
+      tags:
+        - Subscribers
+      security:
+        - clerkSession: []
+        - bearerGrant: []
+        - bearerOrganizationCredential: []
+      x-required-scopes:
+        - subscriptions:read
+        - messages:read
+        - machine-clients:read
+      x-organization-membership: required
+      responses:
+        "200":
+          description: Complete project-wide customer-controller subscriber data export.
+          headers:
+            Content-Disposition:
+              schema:
+                type: string
+              description: Fixed safe attachment filename.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/SubscriberDataExport"
+        "401":
+          $ref: "#/components/responses/Unauthorized"
+        "403":
+          $ref: "#/components/responses/Forbidden"
+        "404":
+          $ref: "#/components/responses/NotFound"
   /v1/projects/{project_id}/environments/{environment_id}/recipient-groups:
     parameters:
       - $ref: "#/components/parameters/ProjectId"
@@ -4757,7 +4961,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:read
       parameters:
@@ -4803,7 +5007,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       x-idempotency:
@@ -4868,7 +5072,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:read
       responses:
@@ -4896,7 +5100,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       requestBody:
@@ -4935,7 +5139,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       responses:
@@ -4976,7 +5180,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:read
       parameters:
@@ -5044,7 +5248,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       responses:
@@ -5078,7 +5282,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - subscriptions:write
       responses:
@@ -5118,7 +5322,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:write
       x-idempotency:
@@ -5183,7 +5387,7 @@ paths:
         - clerkSession: []
         - bearerCredential: []
         - bearerGrant: []
-        - bearerAccountCredential: []
+        - bearerOrganizationCredential: []
       x-required-scopes:
         - messages:read
       responses:
@@ -5210,8 +5414,8 @@ components:
       bearerFormat: Clerk session JWT
       description: |
         A verified human session whose active Clerk organization selects exactly
-        one WhooshBang account. Every administration operation rechecks the
-        projected account membership; session identity never selects a project
+        one WhooshBang organization. Every administration operation rechecks the
+        projected organization membership; session identity never selects a project
         or environment from request data.
     bearerGrant:
       type: http
@@ -5219,27 +5423,27 @@ components:
       bearerFormat: OAuth 2.0 access token
       description: |
         An access token issued by the WhooshBang authorization server for one
-        consenting account member. It selects exactly one account and carries
+        consenting organization member. It selects exactly one organization and carries
         the scopes that member consented to, and never a project: an operation
         names its project and environment in the path, and the service checks
         both against the granting person's membership before acting. A project
-        credential can name no project but its own; an account credential names
+        credential can name no project but its own; an organization credential names
         one per call the same way this does.
-    bearerAccountCredential:
+    bearerOrganizationCredential:
       type: http
       scheme: bearer
-      bearerFormat: wb_ac1.acred_<16-byte-base64url>.<32-byte-base64url-secret>
+      bearerFormat: wb_oc1.ocred_<16-byte-base64url>.<32-byte-base64url-secret>
       description: |
-        Selects exactly one account and nothing below it. It names no project
+        Selects exactly one organization and nothing below it. It names no project
         and no environment, so it authenticates only operations whose path does,
         and its authority there is the intersection of its scopes with the
         project-credential vocabulary — never wider than a project credential
         would have been for the same project environment. A path naming a
-        project outside its account is refused with `credential_account_mismatch`
-        rather than a bare scope failure. `account:read` is the one scope it can
+        project outside its organization is refused with `credential_organization_mismatch`
+        rather than a bare scope failure. `organization:read` is the one scope it can
         hold that a project credential cannot, and it authorizes only the
-        account's project directory: listing the account's projects and reading
-        one, which is the account-wide question a project credential cannot ask
+        organization's project directory: listing the organization's projects and reading
+        one, which is the organization-wide question a project credential cannot ask
         and the reason a `--project <slug>` selector can work at all. It is
         required *in addition to* each of those operations' own
         `x-required-scopes`, never instead of them.
@@ -5249,7 +5453,7 @@ components:
       scheme: bearer
       bearerFormat: wb_pc1.pcred_<16-byte-base64url>.<32-byte-base64url-secret>
       description: |
-        Selects exactly one account, project, and `test` or `live` environment.
+        Selects exactly one organization, project, and `test` or `live` environment.
         Credentials cannot be read after creation. Except for explicitly
         synthetic creation/rotation reveal fixtures, complete bearer values
         must never appear in fixtures, errors, logs, metrics, or inspection
@@ -5269,7 +5473,7 @@ components:
       name: WhooshBang-Recipient-Capability
       description: |
         A creation-only, short-lived capability bound server-side to one exact
-        account, project, environment, subscriber, configuration revision,
+        organization, project, environment, subscriber, configuration revision,
         presenting origin, and registered return destination. It is accepted
         only on the `/v1/recipient-session` browser surface and never as bearer
         authority on an ordinary application route.
@@ -5312,13 +5516,13 @@ components:
       description: Canonical opaque project credential identity; never a readable secret.
       schema:
         $ref: "#/components/schemas/ApiCredentialId"
-    AccountCredentialId:
-      name: account_credential_id
+    OrganizationCredentialId:
+      name: organization_credential_id
       in: path
       required: true
-      description: Canonical opaque account credential identity; never a readable secret.
+      description: Canonical opaque organization credential identity; never a readable secret.
       schema:
-        $ref: "#/components/schemas/AccountCredentialId"
+        $ref: "#/components/schemas/OrganizationCredentialId"
     ApiCredentialAfterCursor:
       name: after
       in: query
@@ -5575,8 +5779,12 @@ components:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/DiagnosticId
     IdempotencyKey:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/IdempotencyKey
-    AccountProjection:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountProjection
+    OrganizationProjection:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationProjection
+    UpdateProjectRequest:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/UpdateProjectRequest
+    PrivacyMode:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/PrivacyMode
     CreateProjectRequest:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateProjectRequest
     DefaultNotifierSummary:
@@ -5599,20 +5807,20 @@ components:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/UpdateRecipientCopyOverrideRequest
     CreateApiCredentialRequest:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateApiCredentialRequest
-    CreateAccountCredentialRequest:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateAccountCredentialRequest
-    RotateAccountCredentialRequest:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/RotateAccountCredentialRequest
-    AccountCredentialId:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountCredentialId
-    AccountCredential:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountCredential
-    AccountCredentialCollection:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountCredentialCollection
-    AccountCredentialSecretReveal:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountCredentialSecretReveal
-    AccountCredentialRotation:
-      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/AccountCredentialRotation
+    CreateOrganizationCredentialRequest:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateOrganizationCredentialRequest
+    RotateOrganizationCredentialRequest:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/RotateOrganizationCredentialRequest
+    OrganizationCredentialId:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationCredentialId
+    OrganizationCredential:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationCredential
+    OrganizationCredentialCollection:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationCredentialCollection
+    OrganizationCredentialSecretReveal:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationCredentialSecretReveal
+    OrganizationCredentialRotation:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationCredentialRotation
     RotateApiCredentialRequest:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/RotateApiCredentialRequest
     ApiCredentialId:
@@ -5725,6 +5933,12 @@ components:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateSubscriberRequest
     Subscriber:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/Subscriber
+    SubscriberDataExport:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/SubscriberDataExport
+    CloseOrganizationRequest:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CloseOrganizationRequest
+    OrganizationClosureResult:
+      $ref: ../schemas/whooshbang-v1.schema.json#/$defs/OrganizationClosureResult
     CreateRecipientGroupRequest:
       $ref: ../schemas/whooshbang-v1.schema.json#/$defs/CreateRecipientGroupRequest
     UpdateRecipientGroupRequest:
@@ -5804,7 +6018,7 @@ components:
       description: |
         An idempotency key, project slug, credential identity, existing
         acknowledgement, or resource state conflicts with the authorized
-        account or request.
+        organization or request.
       headers:
         WhooshBang-Diagnostic-Id:
           $ref: "#/components/headers/DiagnosticId"