diff --git a/README.md b/README.md
index b49020cc..bb21f642 100644
--- a/README.md
+++ b/README.md
@@ -110,3 +110,7 @@ The generated v2 client follows the API's manifest v1 contract: `module`, string
 Package icons are paths relative to the distribution root. For GitHub release assets matching the declared source repository, the site resolves them against the release tag. `FOSSBilling/modules` uses its `Ucfirst(id)/` package directory; other GitHub sources use the repository root. Unsupported sources omit relative icons. Legacy HTTP(S) icons continue to work.
 
 API mutations and site mutations both purge the `extensions` and `developers` tags. The `developers` tag is currently a no-op reserved for future cached surfaces; developer pages are uncached. Deploy this site with the API's manifest migration and cache-tag change before enabling the updated modules publisher. Existing cached pages expire through their cache windows; deployment must coordinate the new contract and tag. Old pending revisions require resubmission using the manifest fields before approval.
+
+## Directory Identity
+
+Extension and developer records use UUIDv7 internal IDs. Public routes, profile handles and publishing requests use the separate `identifier` fields. Keep UUIDs for record identity and audit-history links. A package manifest keeps its `id` field, whose value is the public extension identifier.
diff --git a/openapi/extensions-v2.json b/openapi/extensions-v2.json
index aa69be9c..cd61364c 100644
--- a/openapi/extensions-v2.json
+++ b/openapi/extensions-v2.json
@@ -115,6 +115,10 @@
             "description": "Null when a legacy URL exceeds the card length bound"
           },
           "id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifier": {
             "type": "string"
           },
           "developer": {
@@ -132,6 +136,7 @@
           "version",
           "download_url",
           "id",
+          "identifier",
           "developer"
         ]
       },
@@ -154,7 +159,7 @@
       "PublicDeveloper": {
         "type": "object",
         "properties": {
-          "id": {
+          "identifier": {
             "type": "string",
             "pattern": "^[a-z0-9]+(-[a-z0-9]+)*$"
           },
@@ -177,6 +182,10 @@
             "maxLength": 2048,
             "format": "uri"
           },
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
           "approved": {
             "type": "boolean"
           },
@@ -184,12 +193,23 @@
             "type": "boolean"
           }
         },
-        "required": ["id", "type", "name", "approved", "unclaimed"]
+        "required": [
+          "identifier",
+          "type",
+          "name",
+          "id",
+          "approved",
+          "unclaimed"
+        ]
       },
       "OwnedExtensionListItem": {
         "type": "object",
         "properties": {
           "id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifier": {
             "type": "string"
           },
           "developer": {
@@ -300,6 +320,7 @@
         },
         "required": [
           "id",
+          "identifier",
           "developer",
           "published",
           "pending_revision",
@@ -450,13 +471,17 @@
                 "minLength": 1
               },
               "id": {
+                "type": "string",
+                "format": "uuid"
+              },
+              "identifier": {
                 "type": "string"
               },
               "developer": {
                 "$ref": "#/components/schemas/PublicDeveloper"
               }
             },
-            "required": ["id", "developer"]
+            "required": ["id", "identifier", "developer"]
           }
         ]
       },
@@ -965,7 +990,7 @@
             "maxLength": 2048,
             "format": "uri"
           },
-          "id": {
+          "identifier": {
             "type": "string",
             "minLength": 1,
             "maxLength": 64,
@@ -985,7 +1010,7 @@
           "source",
           "version",
           "download_url",
-          "id"
+          "identifier"
         ],
         "additionalProperties": false
       },
@@ -1104,6 +1129,10 @@
             "type": "string"
           },
           "extension_id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "extension_identifier": {
             "type": "string"
           },
           "developer_id": {
@@ -1157,6 +1186,7 @@
         "required": [
           "id",
           "extension_id",
+          "extension_identifier",
           "developer_id",
           "submitted_by",
           "status",
@@ -1180,6 +1210,10 @@
             "type": "string"
           },
           "extension_id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "extension_identifier": {
             "type": "string"
           },
           "developer_id": {
@@ -1243,6 +1277,7 @@
         "required": [
           "id",
           "extension_id",
+          "extension_identifier",
           "developer_id",
           "submitted_by",
           "status",
@@ -1343,7 +1378,8 @@
             "type": "string"
           },
           "developer_id": {
-            "type": "string"
+            "type": "string",
+            "format": "uuid"
           },
           "claimant_id": {
             "type": "string"
@@ -1400,6 +1436,9 @@
           {
             "type": "object",
             "properties": {
+              "developer_identifier": {
+                "type": "string"
+              },
               "developer_name": {
                 "type": "string"
               },
@@ -1415,6 +1454,7 @@
               }
             },
             "required": [
+              "developer_identifier",
               "developer_name",
               "developer_type",
               "claimant_name",
@@ -1431,6 +1471,10 @@
           {
             "type": "object",
             "properties": {
+              "id": {
+                "type": "string",
+                "format": "uuid"
+              },
               "approved": {
                 "type": "boolean"
               },
@@ -1464,14 +1508,19 @@
                 "type": ["string", "null"]
               }
             },
-            "required": ["approved", "content_revision", "profile_generation"]
+            "required": [
+              "id",
+              "approved",
+              "content_revision",
+              "profile_generation"
+            ]
           }
         ]
       },
       "Developer": {
         "type": "object",
         "properties": {
-          "id": {
+          "identifier": {
             "type": "string",
             "pattern": "^[a-z0-9]+(-[a-z0-9]+)*$"
           },
@@ -1500,7 +1549,7 @@
             "format": "email"
           }
         },
-        "required": ["id", "type", "name"]
+        "required": ["identifier", "type", "name"]
       },
       "ReviewNoteRequired": {
         "type": "object",
@@ -1733,7 +1782,8 @@
             "type": "string"
           },
           "developer_id": {
-            "type": "string"
+            "type": "string",
+            "format": "uuid"
           },
           "can_publish": {
             "type": "boolean"
@@ -1758,8 +1808,7 @@
         "properties": {
           "developer_id": {
             "type": "string",
-            "minLength": 1,
-            "maxLength": 200
+            "format": "uuid"
           },
           "can_publish": {
             "type": "boolean",
@@ -1795,7 +1844,7 @@
       "DeveloperInput": {
         "type": "object",
         "properties": {
-          "id": {
+          "identifier": {
             "type": "string",
             "pattern": "^[a-z0-9]+(-[a-z0-9]+)*$"
           },
@@ -1824,7 +1873,7 @@
             "format": "email"
           }
         },
-        "required": ["id", "type", "name"],
+        "required": ["identifier", "type", "name"],
         "additionalProperties": false
       },
       "DeveloperDetailResponse": {
@@ -1883,7 +1932,7 @@
             },
             "required": false,
             "description": "Public scope only",
-            "name": "developer_id",
+            "name": "developer_identifier",
             "in": "query"
           },
           {
@@ -1937,10 +1986,10 @@
               "type": "string",
               "minLength": 1,
               "maxLength": 200,
-              "description": "All scope only: case-insensitive substring match on the extension id"
+              "description": "All scope only: case-insensitive substring match on the extension identifier"
             },
             "required": false,
-            "description": "All scope only: case-insensitive substring match on the extension id",
+            "description": "All scope only: case-insensitive substring match on the extension identifier",
             "name": "q",
             "in": "query"
           }
@@ -2026,7 +2075,7 @@
                     "result": {
                       "type": "object",
                       "properties": {
-                        "id": {
+                        "identifier": {
                           "type": "string"
                         },
                         "revision_id": {
@@ -2035,9 +2084,13 @@
                         "status": {
                           "type": "string",
                           "enum": ["pending"]
+                        },
+                        "id": {
+                          "type": "string",
+                          "format": "uuid"
                         }
                       },
-                      "required": ["id", "revision_id", "status"]
+                      "required": ["identifier", "revision_id", "status", "id"]
                     }
                   },
                   "required": ["result"]
@@ -2250,7 +2303,7 @@
                     "result": {
                       "type": "object",
                       "properties": {
-                        "id": {
+                        "identifier": {
                           "type": "string"
                         },
                         "revision_id": {
@@ -2261,7 +2314,7 @@
                           "enum": ["pending"]
                         }
                       },
-                      "required": ["id", "revision_id", "status"]
+                      "required": ["identifier", "revision_id", "status"]
                     }
                   },
                   "required": ["result"]
@@ -2392,6 +2445,10 @@
                       "type": "object",
                       "properties": {
                         "id": {
+                          "type": "string",
+                          "format": "uuid"
+                        },
+                        "identifier": {
                           "type": "string"
                         },
                         "deleted": {
@@ -2399,7 +2456,7 @@
                           "enum": [true]
                         }
                       },
-                      "required": ["id", "deleted"]
+                      "required": ["id", "identifier", "deleted"]
                     }
                   },
                   "required": ["result"]
@@ -2601,7 +2658,7 @@
                     "result": {
                       "type": "object",
                       "properties": {
-                        "id": {
+                        "identifier": {
                           "type": "string"
                         },
                         "revision_id": {
@@ -2612,7 +2669,7 @@
                           "enum": ["pending"]
                         }
                       },
-                      "required": ["id", "revision_id", "status"]
+                      "required": ["identifier", "revision_id", "status"]
                     }
                   },
                   "required": ["result"]
@@ -4505,6 +4562,10 @@
                       "type": "object",
                       "properties": {
                         "id": {
+                          "type": "string",
+                          "format": "uuid"
+                        },
+                        "identifier": {
                           "type": "string"
                         },
                         "status": {
@@ -4517,7 +4578,7 @@
                           "example": true
                         }
                       },
-                      "required": ["id", "status", "notified"]
+                      "required": ["id", "identifier", "status", "notified"]
                     }
                   },
                   "required": ["result"]
@@ -4640,6 +4701,10 @@
                       "type": "object",
                       "properties": {
                         "id": {
+                          "type": "string",
+                          "format": "uuid"
+                        },
+                        "identifier": {
                           "type": "string"
                         },
                         "status": {
@@ -4652,7 +4717,7 @@
                           "example": true
                         }
                       },
-                      "required": ["id", "status", "notified"]
+                      "required": ["id", "identifier", "status", "notified"]
                     }
                   },
                   "required": ["result"]
@@ -4764,6 +4829,10 @@
                       "type": "object",
                       "properties": {
                         "id": {
+                          "type": "string",
+                          "format": "uuid"
+                        },
+                        "identifier": {
                           "type": "string"
                         },
                         "revision_id": {
@@ -4774,7 +4843,7 @@
                           "enum": ["approved"]
                         }
                       },
-                      "required": ["id", "revision_id", "status"]
+                      "required": ["id", "identifier", "revision_id", "status"]
                     }
                   },
                   "required": ["result"]
@@ -4937,6 +5006,10 @@
                       "type": "object",
                       "properties": {
                         "id": {
+                          "type": "string",
+                          "format": "uuid"
+                        },
+                        "identifier": {
                           "type": "string"
                         },
                         "approved": {
@@ -4949,7 +5022,7 @@
                           "example": true
                         }
                       },
-                      "required": ["id", "approved", "notified"]
+                      "required": ["id", "identifier", "approved", "notified"]
                     }
                   },
                   "required": ["result"]
@@ -5033,9 +5106,11 @@
           {
             "schema": {
               "type": "string",
-              "example": "b6e2c9c4-3f1a-4e9b-9c3a-2e4b1a2f9d10"
+              "format": "uuid",
+              "description": "Internal developer UUID"
             },
             "required": true,
+            "description": "Internal developer UUID",
             "name": "id",
             "in": "path"
           },
diff --git a/src/components/ExtensionCard.astro b/src/components/ExtensionCard.astro
index d1e67bf1..fc99eae7 100644
--- a/src/components/ExtensionCard.astro
+++ b/src/components/ExtensionCard.astro
@@ -19,7 +19,7 @@ const iconUrl = await getSignedImageUrl(
      requests to Worker routes with an empty 503 (cf-speculation-refused),
      so any prefetch strategy only produces console errors, never speed. -->
 <a
-  href={`/extension/${ext.id}`}
+  href={`/extension/${ext.identifier}`}
   class="block"
   data-extension-id={ext.id}
   data-astro-prefetch="false"
diff --git a/src/components/ExtensionForm.astro b/src/components/ExtensionForm.astro
index ca6a6f33..2c3bb2b2 100644
--- a/src/components/ExtensionForm.astro
+++ b/src/components/ExtensionForm.astro
@@ -19,7 +19,7 @@ interface Props {
   // Best-effort redisplay of a failed submission's values (see
   // echoNewExtensionFromForm and echoExtensionFromForm). Values only:
   // passing an echo never flips the form into edit mode, so create keeps
-  // its writable extension_id and create submit semantics.
+  // its writable extension_identifier and create submit semantics.
   echo?: ExtensionFormEcho;
   error?: string | null;
   submitLabel?: string;
@@ -102,7 +102,8 @@ const otherSpdxIds = SPDX_LICENSE_IDS.filter((id) => !popularSpdxIds.has(id));
           <legend>Publisher</legend>
           <p class="flex items-center gap-1">
             <span>
-              Publishing as <strong>{developer.name}</strong> ({developer.id}).
+              Publishing as <strong>{developer.name}</strong> (
+              {developer.identifier}).
             </span>
             <a
               href="/account/developer"
@@ -138,18 +139,18 @@ const otherSpdxIds = SPDX_LICENSE_IDS.filter((id) => !popularSpdxIds.has(id));
             />
           </div>
           <div class="field">
-            <label for="extension_id">
-              Extension ID <span class="text-destructive">*</span>
+            <label for="extension_identifier">
+              Extension Identifier <span class="text-destructive">*</span>
             </label>
             <input
               class="input"
               type="text"
-              id="extension_id"
-              name="extension_id"
+              id="extension_identifier"
+              name="extension_identifier"
               required
               pattern="[a-z0-9_\-]+"
               maxlength={64}
-              value={shown?.id}
+              value={shown?.identifier}
               disabled={isEdit}
             />
             {isEdit ? (
@@ -576,31 +577,27 @@ const otherSpdxIds = SPDX_LICENSE_IDS.filter((id) => !popularSpdxIds.has(id));
 </div>
 
 <script>
-  // Suggests an Extension ID from the Name field, matching the server's
-  // `[a-z0-9]+(-[a-z0-9]+)*` pattern. Stops once the user edits the ID
-  // directly, same as the slug-from-title pattern elsewhere (WordPress,
-  // GitHub repo creation, etc.) — a manual edit always wins. Only wired up
-  // for new extensions; the edit form disables this field entirely.
+  // Suggest an identifier from the name for new extensions. A manual edit,
+  // including a redisplayed failed submission, always wins.
   const nameInput = document.querySelector<HTMLInputElement>('#name');
-  const idInput = document.querySelector<HTMLInputElement>('#extension_id');
+  const identifierInput = document.querySelector<HTMLInputElement>(
+    '#extension_identifier',
+  );
 
-  if (nameInput && idInput && !idInput.disabled) {
+  if (nameInput && identifierInput && !identifierInput.disabled) {
     const slugify = (value: string) =>
       value
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, '-')
         .replace(/^-+|-+$/g, '');
 
-    let idEditedByUser = idInput.value.length > 0;
-    // A prefilled id is a previously submitted one (the failed-create echo):
-    // treat it as user-authored so a later name edit doesn't silently
-    // replace the id the submitter already chose.
-    idInput.addEventListener('input', () => {
-      idEditedByUser = true;
+    let identifierEditedByUser = identifierInput.value.length > 0;
+    identifierInput.addEventListener('input', () => {
+      identifierEditedByUser = true;
     });
     nameInput.addEventListener('input', () => {
-      if (!idEditedByUser) {
-        idInput.value = slugify(nameInput.value);
+      if (!identifierEditedByUser) {
+        identifierInput.value = slugify(nameInput.value);
       }
     });
   }
diff --git a/src/components/ExtensionHeader.astro b/src/components/ExtensionHeader.astro
index f3b33c89..4424bce8 100644
--- a/src/components/ExtensionHeader.astro
+++ b/src/components/ExtensionHeader.astro
@@ -9,7 +9,7 @@ import { isSafeHttpUrl } from '@/lib/safe-url';
 interface Props {
   id: string;
   content: StoredExtensionFields;
-  developer: Pick<Developer, 'id' | 'name'>;
+  developer: Pick<Developer, 'identifier' | 'name'>;
   versionLabel?: string;
   backHref?: string;
   backLabel?: string;
@@ -84,7 +84,7 @@ const downloadUrl = latest?.download_url ?? content.download_url;
       </div>
       <p class="flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
         <a
-          href={`/developer/${developer.id}`}
+          href={`/developer/${developer.identifier}`}
           class="inline-flex items-center gap-1.5 underline-offset-4 hover:underline"
           data-astro-prefetch="false"
         >
diff --git a/src/components/OwnerExtensionView.astro b/src/components/OwnerExtensionView.astro
index ab82d526..70a43abd 100644
--- a/src/components/OwnerExtensionView.astro
+++ b/src/components/OwnerExtensionView.astro
@@ -12,7 +12,7 @@ interface Props {
   userId: string;
 }
 const { owned, userId } = Astro.props;
-const id = owned.id;
+const id = owned.identifier;
 const env = Astro.locals.env;
 const api = createApiClient(env, userId);
 // A review decision and publication are independent: rejecting an update
diff --git a/src/components/admin/ClaimCard.astro b/src/components/admin/ClaimCard.astro
index 0881a864..9cdb06d6 100644
--- a/src/components/admin/ClaimCard.astro
+++ b/src/components/admin/ClaimCard.astro
@@ -21,7 +21,7 @@ const Title = titleTag;
 <li class="card gap-4 p-5 scroll-mt-24" id={`claim-${c.id}`}>
   <header class="px-0">
     <Title class="font-semibold flex flex-wrap items-center gap-2">
-      {c.developer_name} ({c.developer_id})
+      {c.developer_name} ({c.developer_identifier})
       {c.github_org_verified && <span class="badge">GitHub Verified</span>}
     </Title>
     <p class="text-sm text-muted-foreground">
@@ -61,7 +61,7 @@ const Title = titleTag;
 
   <ApproveDialog
     id={`approve-claim-${c.id}`}
-    title={`Approve claim on "${c.developer_id}"?`}
+    title={`Approve claim on "${c.developer_identifier}"?`}
     description="The claimant will gain ownership of this profile immediately."
     formAction={`/account/admin/developers/claims/${c.id}/approve`}
     notifyRecipient="claimant"
@@ -69,7 +69,7 @@ const Title = titleTag;
   />
   <RejectDialog
     id={`reject-claim-${c.id}`}
-    title={`Reject claim on "${c.developer_id}"?`}
+    title={`Reject claim on "${c.developer_identifier}"?`}
     description="The claimant will see this reason."
     formAction={`/account/admin/developers/claims/${c.id}/reject`}
     notifyRecipient="claimant"
diff --git a/src/components/admin/DecidedRevisionsTable.astro b/src/components/admin/DecidedRevisionsTable.astro
index 032b0074..10a877bf 100644
--- a/src/components/admin/DecidedRevisionsTable.astro
+++ b/src/components/admin/DecidedRevisionsTable.astro
@@ -52,17 +52,22 @@ const DETAIL_COLUMNS = showNote ? 5 : 4;
       {revisions.map((r) => {
         return (
           <>
-            <tr data-extension-id={r.extension_id} data-revision-id={r.id}>
+            <tr
+              data-extension-id={r.extension_identifier}
+              data-revision-id={r.id}
+            >
               <td class="px-4 py-2">
                 <p class="font-medium">
                   <a
-                    href={`/account/admin/extensions/${r.extension_id}`}
+                    href={`/account/admin/extensions/${r.extension_identifier}`}
                     title={`Submitted on ${formatDateTime(r.created_at)}.`}
                   >
-                    {r.name ?? r.extension_id}
+                    {r.name ?? r.extension_identifier}
                   </a>
                 </p>
-                <p class="text-xs text-muted-foreground">{r.extension_id}</p>
+                <p class="text-xs text-muted-foreground">
+                  {r.extension_identifier}
+                </p>
                 {!showNote && r.review_note && (
                   <p
                     class="text-xs text-muted-foreground truncate"
diff --git a/src/components/admin/DeveloperProfilesTable.astro b/src/components/admin/DeveloperProfilesTable.astro
index 95f4dfe7..8b1ea641 100644
--- a/src/components/admin/DeveloperProfilesTable.astro
+++ b/src/components/admin/DeveloperProfilesTable.astro
@@ -32,7 +32,7 @@ const { developers } = Astro.props;
                 {d.name}
               </a>
             </p>
-            <p class="text-xs text-muted-foreground">{d.id}</p>
+            <p class="text-xs text-muted-foreground">{d.identifier}</p>
             {d.URL && (
               <p
                 class="text-xs text-muted-foreground truncate max-w-64"
@@ -81,7 +81,7 @@ const { developers } = Astro.props;
                   class="btn"
                   data-size="sm"
                   data-approve-developer
-                  data-developer-id={d.id}
+                  data-developer-id={d.identifier}
                   data-developer-name={d.name}
                   data-expected-revision={d.content_revision}
                   data-expected-generation={d.profile_generation}
diff --git a/src/components/admin/ExtensionAdminTable.astro b/src/components/admin/ExtensionAdminTable.astro
index 14fc0dc2..acdead26 100644
--- a/src/components/admin/ExtensionAdminTable.astro
+++ b/src/components/admin/ExtensionAdminTable.astro
@@ -32,11 +32,11 @@ function statusOf(ext: OwnedExtensionListItem) {
         <tr class="align-middle">
           <td class="px-4 py-2">
             <p class="font-medium">
-              <a href={`/account/admin/extensions/${ext.id}`}>
-                {ext.published?.name ?? ext.id}
+              <a href={`/account/admin/extensions/${ext.identifier}`}>
+                {ext.published?.name ?? ext.identifier}
               </a>
             </p>
-            <p class="text-xs text-muted-foreground">{ext.id}</p>
+            <p class="text-xs text-muted-foreground">{ext.identifier}</p>
           </td>
           <td class="px-4 py-2 text-muted-foreground">
             <a
@@ -66,7 +66,7 @@ function statusOf(ext: OwnedExtensionListItem) {
           <td class="px-4 py-2">
             <div class="flex items-center gap-2">
               <a
-                href={`/account/admin/extensions/${ext.id}`}
+                href={`/account/admin/extensions/${ext.identifier}`}
                 class="btn px-0 flex-1 justify-start"
                 data-size="sm"
                 data-variant="ghost"
@@ -79,7 +79,7 @@ function statusOf(ext: OwnedExtensionListItem) {
                   class="btn"
                   data-size="sm"
                   data-variant="destructive"
-                  data-delist-id={ext.id}
+                  data-delist-id={ext.identifier}
                   data-delist-name={ext.published.name}
                 >
                   Delist
diff --git a/src/components/admin/PendingRevisionsTable.astro b/src/components/admin/PendingRevisionsTable.astro
index 666c8135..f881c1d2 100644
--- a/src/components/admin/PendingRevisionsTable.astro
+++ b/src/components/admin/PendingRevisionsTable.astro
@@ -31,23 +31,27 @@ const DETAIL_COLUMNS = 4;
     </thead>
     <tbody class="divide-y divide-border">
       {revisions.map((r) => {
-        const title = r.name ?? r.extension_id;
+        const title = r.name ?? r.extension_identifier;
         const version = r.version?.trim() || null;
         const description = r.description?.trim() || null;
         return (
           <>
             <tr
               data-pending-row
-              data-extension-id={r.extension_id}
+              data-extension-id={r.extension_identifier}
               data-revision-id={r.id}
             >
               <td class="px-4 py-2">
                 <p class="font-medium">
-                  <a href={`/account/admin/extensions/${r.extension_id}`}>
+                  <a
+                    href={`/account/admin/extensions/${r.extension_identifier}`}
+                  >
                     {title}
                   </a>
                 </p>
-                <p class="text-xs text-muted-foreground">{r.extension_id}</p>
+                <p class="text-xs text-muted-foreground">
+                  {r.extension_identifier}
+                </p>
               </td>
               <td class="px-4 py-2 text-muted-foreground whitespace-nowrap">
                 {version ?? '—'}
@@ -79,7 +83,7 @@ const DETAIL_COLUMNS = 4;
                     data-size="sm"
                     disabled={!r.content_available}
                     data-open-approve={r.id}
-                    data-extension-id={r.extension_id}
+                    data-extension-id={r.extension_identifier}
                     data-revision-id={r.id}
                     data-title={title}
                   >
@@ -91,7 +95,7 @@ const DETAIL_COLUMNS = 4;
                     data-size="sm"
                     data-variant="destructive"
                     data-open-reject={r.id}
-                    data-extension-id={r.extension_id}
+                    data-extension-id={r.extension_identifier}
                     data-revision-id={r.id}
                     data-title={title}
                   >
diff --git a/src/lib/api/client.ts b/src/lib/api/client.ts
index 9ded9687..326868fe 100644
--- a/src/lib/api/client.ts
+++ b/src/lib/api/client.ts
@@ -74,12 +74,12 @@ type ExtensionListQuery = NonNullable<GetExtensionsData['query']>;
 type RevisionQueueQuery = NonNullable<GetRevisionsData['query']>;
 type ListFilters = Pick<
   ExtensionListQuery,
-  'type' | 'developer_id' | 'status' | 'q' | 'limit' | 'cursor'
+  'type' | 'developer_identifier' | 'status' | 'q' | 'limit' | 'cursor'
 >;
 
 export type ExtensionDirectoryFilters = Pick<
   ExtensionListQuery,
-  'type' | 'developer_id' | 'limit' | 'cursor'
+  'type' | 'developer_identifier' | 'limit' | 'cursor'
 >;
 
 type ExtensionMineFilters = Pick<ListFilters, 'type' | 'limit' | 'cursor'>;
@@ -382,8 +382,8 @@ function listQuery(
   if (filters.type !== undefined) {
     query.type = filters.type;
   }
-  if (filters.developer_id !== undefined) {
-    query.developer_id = filters.developer_id;
+  if (filters.developer_identifier !== undefined) {
+    query.developer_identifier = filters.developer_identifier;
   }
   if (filters.status !== undefined) {
     query.status = filters.status;
@@ -410,7 +410,7 @@ export async function listExtensions(
   return cachedEdgeRead(
     dataCacheKey('extensions', {
       cursor: query.cursor,
-      developer_id: query.developer_id,
+      developer_identifier: query.developer_identifier,
       limit: query.limit,
       type: query.type,
     }),
@@ -429,7 +429,7 @@ export async function listExtensions(
   );
 }
 
-export async function getExtensionById(
+export async function getExtensionByIdentifier(
   env: ApplicationEnv,
   id: string,
 ): Promise<Extension> {
@@ -445,7 +445,7 @@ export async function getExtensionById(
   );
 }
 
-export async function getDeveloperById(
+export async function getDeveloperByIdentifier(
   env: ApplicationEnv,
   id: string,
 ): Promise<PublicDeveloper> {
diff --git a/src/lib/api/generated/extensions-v2/types.gen.ts b/src/lib/api/generated/extensions-v2/types.gen.ts
index ac2a3c67..e65a0670 100644
--- a/src/lib/api/generated/extensions-v2/types.gen.ts
+++ b/src/lib/api/generated/extensions-v2/types.gen.ts
@@ -37,6 +37,7 @@ export type ExtensionListItem = {
    */
   download_url: string | null;
   id: string;
+  identifier: string;
   developer: PublicDeveloper;
 };
 
@@ -46,17 +47,19 @@ export type Repository = {
 };
 
 export type PublicDeveloper = {
-  id: string;
+  identifier: string;
   type: 'user' | 'organization';
   name: string;
   URL?: string;
   avatar_url?: string;
+  id: string;
   approved: boolean;
   unclaimed: boolean;
 };
 
 export type OwnedExtensionListItem = {
   id: string;
+  identifier: string;
   developer: PublicDeveloper;
   published: {
     manifest_version: 1;
@@ -145,6 +148,7 @@ export type Extension = ExtensionContent & {
   version?: string;
   download_url?: string;
   id: string;
+  identifier: string;
   developer: PublicDeveloper;
 };
 
@@ -286,7 +290,7 @@ export type ExtensionCreate = {
   source: Repository;
   version: string;
   download_url: string;
-  id: string;
+  identifier: string;
 };
 
 export type ExtensionUpdate = {
@@ -318,6 +322,7 @@ export type ExtensionUpdate = {
 export type ExtensionRevisionSummary = {
   id: string;
   extension_id: string;
+  extension_identifier: string;
   developer_id: string;
   submitted_by: string;
   status: 'pending' | 'approved' | 'rejected';
@@ -337,6 +342,7 @@ export type ExtensionRevisionSummary = {
 export type ExtensionRevision = {
   id: string;
   extension_id: string;
+  extension_identifier: string;
   developer_id: string;
   submitted_by: string;
   status: 'pending' | 'approved' | 'rejected';
@@ -397,6 +403,7 @@ export type ClaimNote = {
 };
 
 export type PendingDeveloperClaim = DeveloperClaim & {
+  developer_identifier: string;
   developer_name: string;
   developer_type: 'user' | 'organization';
   claimant_name: string | null;
@@ -404,6 +411,7 @@ export type PendingDeveloperClaim = DeveloperClaim & {
 };
 
 export type DeveloperProfile = Developer & {
+  id: string;
   approved: boolean;
   content_revision: number;
   profile_generation: string;
@@ -417,7 +425,7 @@ export type DeveloperProfile = Developer & {
 };
 
 export type Developer = {
-  id: string;
+  identifier: string;
   type: 'user' | 'organization';
   name: string;
   URL?: string;
@@ -508,7 +516,7 @@ export type OwnedDeveloperProfile =
   | null;
 
 export type DeveloperInput = {
-  id: string;
+  identifier: string;
   type: 'user' | 'organization';
   name: string;
   URL?: string;
@@ -534,7 +542,7 @@ export type GetExtensionsData = {
     /**
      * Public scope only
      */
-    developer_id?: string;
+    developer_identifier?: string;
     limit?: number;
     /**
      * Opaque cursor returned by the previous page
@@ -549,7 +557,7 @@ export type GetExtensionsData = {
      */
     status?: 'published' | 'delisted' | 'unpublished';
     /**
-     * All scope only: case-insensitive substring match on the extension id
+     * All scope only: case-insensitive substring match on the extension identifier
      */
     q?: string;
   };
@@ -638,9 +646,10 @@ export type PostExtensionsResponses = {
    */
   201: {
     result: {
-      id: string;
+      identifier: string;
       revision_id: string;
       status: 'pending';
+      id: string;
     };
   };
 };
@@ -690,6 +699,7 @@ export type DeleteExtensionsByIdResponses = {
   200: {
     result: {
       id: string;
+      identifier: string;
       deleted: true;
     };
   };
@@ -800,7 +810,7 @@ export type PutExtensionsByIdResponses = {
    */
   202: {
     result: {
-      id: string;
+      identifier: string;
       revision_id: string;
       status: 'pending';
     };
@@ -967,7 +977,7 @@ export type PutExtensionsByIdRevisionsByRevisionIdResponses = {
    */
   202: {
     result: {
-      id: string;
+      identifier: string;
       revision_id: string;
       status: 'pending';
     };
@@ -1814,6 +1824,7 @@ export type PostExtensionsByIdDelistResponses = {
   200: {
     result: {
       id: string;
+      identifier: string;
       status: 'delisted';
       /**
        * Whether a notification email was dispatched - delivery itself is asynchronous
@@ -1877,6 +1888,7 @@ export type PostExtensionsByIdRelistResponses = {
   200: {
     result: {
       id: string;
+      identifier: string;
       status: 'relisted';
       /**
        * Whether a notification email was dispatched - delivery itself is asynchronous
@@ -1951,6 +1963,7 @@ export type PostExtensionsByIdModeratorCorrectResponses = {
   200: {
     result: {
       id: string;
+      identifier: string;
       revision_id: string;
       status: 'approved';
     };
@@ -2011,6 +2024,7 @@ export type PostDevelopersByIdApproveResponses = {
   200: {
     result: {
       id: string;
+      identifier: string;
       approved: true;
       /**
        * Whether a notification email was dispatched - delivery itself is asynchronous
@@ -2026,6 +2040,9 @@ export type PostDevelopersByIdApproveResponse =
 export type GetDevelopersByIdHistoryData = {
   body?: never;
   path: {
+    /**
+     * Internal developer UUID
+     */
     id: string;
   };
   query?: {
diff --git a/src/lib/developer-form.ts b/src/lib/developer-form.ts
index 561eff8a..5cc970d2 100644
--- a/src/lib/developer-form.ts
+++ b/src/lib/developer-form.ts
@@ -10,21 +10,22 @@ import { withHttpsScheme } from './url-prefix';
 export class DeveloperValidationError extends Error {}
 
 // Builds a DeveloperProfileInput from the developer-profile form, for
-// PUT /developers/me. The id is immutable once a developer profile exists —
-// see the readonly id field in /account/developer.
+// PUT /developers/me. An existing profile keeps its public identifier;
+// the API generates the UUID when creating a profile.
 export function buildDeveloperProfile(
   form: FormData,
   existingDeveloper: Developer | null,
 ): DeveloperProfileInput {
   const str = (name: string) => formString(form, name);
   const typeInput = str('type');
-  const id = existingDeveloper?.id ?? str('id').toLowerCase();
-  if (!id) {
-    throw new DeveloperValidationError('Publisher ID is required.');
+  const identifier =
+    existingDeveloper?.identifier ?? str('identifier').toLowerCase();
+  if (!identifier) {
+    throw new DeveloperValidationError('Publisher Identifier is required.');
   }
 
   return {
-    id,
+    identifier,
     type: isDeveloperType(typeInput) ? typeInput : 'user',
     name: str('name'),
     URL: withHttpsScheme(str('url')),
diff --git a/src/lib/directory-filters.ts b/src/lib/directory-filters.ts
index 5dc5c754..4c65b1b7 100644
--- a/src/lib/directory-filters.ts
+++ b/src/lib/directory-filters.ts
@@ -21,9 +21,9 @@ export function parseDirectoryFilters(params: URLSearchParams):
   if (type) {
     filters.type = type;
   }
-  const developerId = params.get('developer_id');
+  const developerId = params.get('developer_identifier');
   if (developerId !== null) {
-    filters.developer_id = developerId;
+    filters.developer_identifier = developerId;
   }
   const limit = params.get('limit');
   if (limit !== null) {
diff --git a/src/lib/directory-pagination.ts b/src/lib/directory-pagination.ts
index 9d54ae9a..d47c4e95 100644
--- a/src/lib/directory-pagination.ts
+++ b/src/lib/directory-pagination.ts
@@ -11,7 +11,7 @@ type DirectoryPage<Item extends DirectoryItem = ExtensionListItem> = {
 
 type DirectoryPageFilters = {
   type?: string;
-  developer_id?: string;
+  developer_identifier?: string;
   limit?: number;
 };
 
diff --git a/src/lib/extension-form.ts b/src/lib/extension-form.ts
index 7bd472ad..a88c6ae1 100644
--- a/src/lib/extension-form.ts
+++ b/src/lib/extension-form.ts
@@ -7,7 +7,9 @@ import { repositoryFromFields, repositoryInputUrl } from './repository';
 import { formString } from './form';
 import { withHttpsScheme } from './url-prefix';
 
-export type ExtensionFormEcho = Extension & { moduleRequirementsInput: string };
+export type ExtensionFormEcho = Omit<Extension, 'id'> & {
+  moduleRequirementsInput: string;
+};
 
 // Thrown for form-level validation failures that should be shown to the
 // user, distinct from ApiRequestError (the api rejecting an otherwise
@@ -187,11 +189,11 @@ function buildContent(
   };
 }
 
-// Builds the payload for POST /extensions. The id is only ever set here —
-// PUT can't rename, since the id comes from the path and is immutable.
+// POST /extensions supplies the public identifier; the API generates the UUID.
+// PUT uses the existing identifier from the path and cannot change it.
 export function buildExtensionCreatePayload(form: FormData): ExtensionCreate {
   return {
-    id: formString(form, 'extension_id').toLowerCase(),
+    identifier: formString(form, 'extension_identifier').toLowerCase(),
     ...buildContent(
       form,
       { releases: [], version: '', download_url: '' },
@@ -223,7 +225,7 @@ export function buildExtensionUpdatePayload(
 // page so a new form field only needs adding here.
 export function echoExtensionFromForm(
   form: FormData,
-  base: Extension,
+  base: Omit<Extension, 'id'>,
 ): ExtensionFormEcho {
   const selectedLicenseId = formString(form, 'license_spdx_id');
   const isRecognizedLicense =
@@ -281,7 +283,7 @@ export function echoReleaseDraftFromForm(form: FormData): ReleaseDraft {
 }
 
 // Best-effort echo for the create page: there is no existing extension to
-// spread over, so the base is a blank, submission-shaped extension — the id
+// spread over, so the base is a blank, submission-shaped extension — the identifier
 // comes from the form (lowercased, matching what a successful submit would
 // store) and the developer is the submitter's own profile. Returns both the
 // field echo and the release draft for ExtensionForm's redisplay props.
@@ -289,11 +291,11 @@ export function echoNewExtensionFromForm(
   form: FormData,
   developer: Extension['developer'],
 ): { extension: ExtensionFormEcho; releaseDraft: ReleaseDraft } {
-  const base: Extension = {
+  const base: Omit<Extension, 'id'> = {
     manifest_version: 1,
     author: { name: developer.name, url: developer.URL },
     requires: { fossbilling: '', php: '' },
-    id: formString(form, 'extension_id').toLowerCase(),
+    identifier: formString(form, 'extension_identifier').toLowerCase(),
     type: 'module',
     name: '',
     description: '',
diff --git a/src/lib/extension-view.ts b/src/lib/extension-view.ts
index 759314a1..58a69038 100644
--- a/src/lib/extension-view.ts
+++ b/src/lib/extension-view.ts
@@ -1,7 +1,7 @@
 import {
   ApiRequestError,
   createApiClient,
-  getExtensionById,
+  getExtensionByIdentifier,
   type OwnedExtension,
 } from './api/client';
 import type { Extension } from '@/types';
@@ -39,5 +39,5 @@ export async function loadExtensionView(
         throw error;
     }
   }
-  return { kind: 'public', extension: await getExtensionById(env, id) };
+  return { kind: 'public', extension: await getExtensionByIdentifier(env, id) };
 }
diff --git a/src/lib/extensions-data.ts b/src/lib/extensions-data.ts
index efef291e..04a45791 100644
--- a/src/lib/extensions-data.ts
+++ b/src/lib/extensions-data.ts
@@ -3,7 +3,7 @@
 // generated Extensions v2 client.
 import {
   createApiClient,
-  getDeveloperById as getDeveloperByIdFromApi,
+  getDeveloperByIdentifier as getDeveloperByIdentifierFromApi,
   paginateAll,
   type DeveloperProfile as ApiDeveloperProfile,
   type Extension as ApiExtension,
@@ -52,6 +52,7 @@ export interface LastReview {
 // must not collapse them into a single derived status.
 export interface OwnedExtensionDetail {
   id: string;
+  identifier: string;
   developer: PublicDeveloperProfile;
   published: Extension | null;
   pendingRevision: PendingRevision | null;
@@ -64,6 +65,7 @@ function toDeveloperProfile(
 ): DeveloperProfile & { has_pending_transfer?: boolean } {
   return {
     id: developer.id,
+    identifier: developer.identifier,
     type: developer.type,
     name: developer.name,
     URL: developer.URL,
@@ -86,6 +88,7 @@ function toDeveloperProfile(
 function toPublicDeveloper(developer: PublicDeveloper): PublicDeveloperProfile {
   return {
     id: developer.id,
+    identifier: developer.identifier,
     type: developer.type,
     name: developer.name,
     URL: developer.URL,
@@ -101,6 +104,7 @@ function toExtension(extension: ApiExtension): Extension {
     author: extension.author,
     requires: extension.requires,
     id: extension.id,
+    identifier: extension.identifier,
     type: extension.type,
     name: extension.name,
     description: extension.description,
@@ -126,11 +130,13 @@ export function toOwnedExtensionDetail(
 ): OwnedExtensionDetail {
   return {
     id: owned.id,
+    identifier: owned.identifier,
     developer: toPublicDeveloper(owned.developer),
     published: owned.published
       ? toExtension({
           ...owned.published,
           id: owned.id,
+          identifier: owned.identifier,
           developer: owned.developer,
         })
       : null,
@@ -215,12 +221,12 @@ export async function getDeveloperByOwner(
   }
 }
 
-export async function getDeveloperById(
+export async function getDeveloperByIdentifier(
   env: ApplicationEnv,
   id: string,
 ): Promise<PublicDeveloperProfile | null> {
   try {
-    return toPublicDeveloper(await getDeveloperByIdFromApi(env, id));
+    return toPublicDeveloper(await getDeveloperByIdentifierFromApi(env, id));
   } catch {
     // Public pages historically treated any domain read failure as a missing
     // profile. Keep that fail-soft behavior at the API adapter boundary.
diff --git a/src/pages/account/admin/developers/[id]/history.astro b/src/pages/account/admin/developers/[id]/history.astro
index a6024342..c992c105 100644
--- a/src/pages/account/admin/developers/[id]/history.astro
+++ b/src/pages/account/admin/developers/[id]/history.astro
@@ -36,6 +36,8 @@ try {
       : 'Unable to load history for this developer profile.';
 }
 
+const developerName = entries[0]?.name;
+
 // listDeveloperHistory walks every page of the API's 100-row window, so a
 // server-side substring filter over the loaded rows is complete.
 const historyQuery = Astro.url.searchParams.get('q')?.trim() || undefined;
@@ -53,9 +55,9 @@ if (historyQuery) {
 ---
 
 <Admin
-  title={`Profile History: ${id} — FOSSBilling Extensions`}
+  title={`Profile History${developerName ? `: ${developerName}` : ''} — FOSSBilling Extensions`}
   active="developers"
-  description={`Recorded writes for ${id}, newest first.`}
+  description={`Recorded writes for ${developerName ?? 'this developer profile'}, newest first.`}
 >
   <div slot="actions">
     <a
diff --git a/src/pages/account/admin/developers/index.astro b/src/pages/account/admin/developers/index.astro
index 30ba18ab..dc2de63b 100644
--- a/src/pages/account/admin/developers/index.astro
+++ b/src/pages/account/admin/developers/index.astro
@@ -72,7 +72,7 @@ if (query) {
     claims = claims.filter((c) =>
       [
         c.developer_name,
-        c.developer_id,
+        c.developer_identifier,
         c.claimant_name ?? '',
         c.claimant_id,
         c.claimant_github_login ?? '',
@@ -80,7 +80,7 @@ if (query) {
     );
   } else {
     developers = developers.filter((d) =>
-      [d.name, d.id, d.owner_name ?? ''].some((field) =>
+      [d.name, d.identifier, d.owner_name ?? ''].some((field) =>
         field.toLowerCase().includes(needle),
       ),
     );
diff --git a/src/pages/account/admin/extensions/[id].astro b/src/pages/account/admin/extensions/[id].astro
index 7bd8d2cb..db1285f7 100644
--- a/src/pages/account/admin/extensions/[id].astro
+++ b/src/pages/account/admin/extensions/[id].astro
@@ -70,7 +70,7 @@ const correctable = Boolean(
   <div slot="actions">
     {ext && correctable && (
       <a
-        href={`/account/admin/extensions/${ext.id}/edit`}
+        href={`/account/admin/extensions/${ext.identifier}/edit`}
         class="btn"
         data-size="sm"
         data-variant="outline"
@@ -106,7 +106,7 @@ const correctable = Boolean(
           <p class="font-medium">
             {ext.developer.name}
             <span class="text-muted-foreground text-sm ml-2">
-              ({ext.developer.id})
+              ({ext.developer.identifier})
             </span>
           </p>
           <div class="flex items-center gap-2">
diff --git a/src/pages/account/admin/extensions/[id]/edit.astro b/src/pages/account/admin/extensions/[id]/edit.astro
index f02fc4ad..7f270553 100644
--- a/src/pages/account/admin/extensions/[id]/edit.astro
+++ b/src/pages/account/admin/extensions/[id]/edit.astro
@@ -88,15 +88,15 @@ if (
       throw new ExtensionValidationError('A correction note is required.');
     }
     const payload = buildExtensionUpdatePayload(form, base);
-    await api.correctExtension(owned.id, payload, submittedNote);
+    await api.correctExtension(owned.identifier, payload, submittedNote);
     purgeDirectory(Astro);
     await setFlash(Astro, env.sessionSecret, {
       category: 'success',
-      title: `"${owned.id}" corrected.`,
+      title: `"${owned.identifier}" corrected.`,
       description:
         'Recorded as a moderator revision — the author sees it in history; no email was sent.',
     });
-    return Astro.redirect(`/account/admin/extensions/${owned.id}`);
+    return Astro.redirect(`/account/admin/extensions/${owned.identifier}`);
   } catch (e) {
     error =
       e instanceof ApiRequestError
@@ -107,7 +107,7 @@ if (
   }
 }
 
-const title = base?.name || owned?.id || id;
+const title = base?.name || owned?.identifier || id;
 ---
 
 <Admin
@@ -119,7 +119,7 @@ const title = base?.name || owned?.id || id;
     <a
       href={
         owned
-          ? `/account/admin/extensions/${owned.id}`
+          ? `/account/admin/extensions/${owned.identifier}`
           : '/account/admin/extensions'
       }
       class="btn"
@@ -146,7 +146,7 @@ const title = base?.name || owned?.id || id;
   {owned && (
     <div class="max-w-2xl mx-auto space-y-6">
       <h1 class="text-2xl font-semibold tracking-tight">
-        Correct {owned.published?.name ?? owned.id}
+        Correct {owned.published?.name ?? owned.identifier}
       </h1>
 
       {!owned.published ? (
@@ -178,8 +178,10 @@ const title = base?.name || owned?.id || id;
             An edit submitted {formatDate(owned.pendingRevision.createdAt)} is
             still awaiting review. Approve or reject it first — a correction
             cannot supersede a pending edit. See the{' '}
-            <a href={`/account/admin/extensions/${owned.id}`}>detail page</a> or
-            the <a href="/account/admin/revisions">revision queue</a>.
+            <a href={`/account/admin/extensions/${owned.identifier}`}>
+              detail page
+            </a>{' '}
+            or the <a href="/account/admin/revisions">revision queue</a>.
           </section>
         </div>
       ) : (
@@ -196,7 +198,7 @@ const title = base?.name || owned?.id || id;
               releaseDraft={submittedReleaseDraft ?? undefined}
               error={error}
               submitLabel="Correct Live Listing"
-              cancelHref={`/account/admin/extensions/${owned.id}`}
+              cancelHref={`/account/admin/extensions/${owned.identifier}`}
               correctionNote={submittedNote}
             />
           </Fragment>
diff --git a/src/pages/account/developer/index.astro b/src/pages/account/developer/index.astro
index 41d85514..329615d7 100644
--- a/src/pages/account/developer/index.astro
+++ b/src/pages/account/developer/index.astro
@@ -8,7 +8,7 @@ import {
 } from '@/lib/api/client';
 import {
   getDeveloperByOwner,
-  getDeveloperById,
+  getDeveloperByIdentifier,
   getExtensionsByOwner,
 } from '@/lib/extensions-data';
 import {
@@ -98,7 +98,7 @@ if (Astro.request.method === 'POST') {
   // route (transfer/revoke.ts), matching the rest of the app.
   if (form.get('intent') === 'transfer-initiate' && developer) {
     try {
-      transferResult = await api.initiateTransfer(developer.id);
+      transferResult = await api.initiateTransfer(developer.identifier);
       pendingTransfer = true;
     } catch (e) {
       error =
@@ -153,9 +153,12 @@ if (Astro.request.method === 'POST') {
         !isEdit &&
         e instanceof ApiRequestError &&
         e.code === 'DEVELOPER_ID_TAKEN' &&
-        submitted?.id
+        submitted?.identifier
       ) {
-        const conflicting = await getDeveloperById(env, submitted.id);
+        const conflicting = await getDeveloperByIdentifier(
+          env,
+          submitted.identifier,
+        );
         idTaken = conflicting?.unclaimed === true;
       }
       if (e instanceof ApiRequestError && e.code === 'GITHUB_MISMATCH') {
@@ -205,7 +208,7 @@ const reconnectUrl = buildGithubReconnectUrl(
           <ul class="space-y-2">
             {myClaims.map((c) => (
               <li class="text-sm flex items-center justify-between gap-3">
-                <code>{c.developer_id}</code>
+                <code>{c.developer_identifier}</code>
                 <div class="flex items-center gap-2">
                   {c.status === 'pending' && (
                     <span class="badge" data-variant="secondary">
@@ -248,12 +251,12 @@ const reconnectUrl = buildGithubReconnectUrl(
         <CircleAlert class="size-4" />
         <section>
           <p>{error}</p>
-          {idTaken && submitted?.id && (
+          {idTaken && submitted?.identifier && (
             <p>
               If this is your existing extension author profile, you can request
               to claim it instead of creating a new one — visit{' '}
-              <a href={`/developer/${submitted.id}`} class="underline">
-                the public profile page for "{submitted.id}"
+              <a href={`/developer/${submitted.identifier}`} class="underline">
+                the public profile page for "{submitted.identifier}"
               </a>{' '}
               and use the "Claim this profile" option.
             </p>
@@ -285,9 +288,9 @@ const reconnectUrl = buildGithubReconnectUrl(
         ) : !isEdit && pendingClaim ? (
           <p class="text-muted-foreground text-sm">
             You have a pending claim on{' '}
-            <strong>{pendingClaim.developer_id}</strong>. Cancel it above before
-            creating a separate profile — a claim can be approved at any time,
-            and you can only ever own one.
+            <strong>{pendingClaim.developer_identifier}</strong>. Cancel it
+            above before creating a separate profile — a claim can be approved
+            at any time, and you can only ever own one.
           </p>
         ) : (
           <form method="POST" class="space-y-8">
@@ -299,18 +302,18 @@ const reconnectUrl = buildGithubReconnectUrl(
               <fieldset class="fieldset space-y-4">
                 <legend>Publisher Identity</legend>
                 <div class="field">
-                  <label for="id">
-                    Publisher ID <span class="text-destructive">*</span>
+                  <label for="identifier">
+                    Publisher Identifier <span class="text-destructive">*</span>
                   </label>
                   <input
                     class="input"
                     type="text"
-                    id="id"
-                    name="id"
+                    id="identifier"
+                    name="identifier"
                     required
                     pattern="[a-z0-9]+(-[a-z0-9]+)*"
                     placeholder="my-org"
-                    value={fields?.id}
+                    value={fields?.identifier}
                     disabled={isEdit}
                   />
                   {isEdit ? (
@@ -350,7 +353,8 @@ const reconnectUrl = buildGithubReconnectUrl(
                         <section>
                           <h3>User</h3>
                           <p>
-                            Publisher ID must match your own GitHub username.
+                            Publisher Identifier must match your own GitHub
+                            username.
                           </p>
                         </section>
                         <input
@@ -374,8 +378,8 @@ const reconnectUrl = buildGithubReconnectUrl(
                         <section>
                           <h3>Organization</h3>
                           <p>
-                            Publisher ID must match a GitHub organization you
-                            belong to.
+                            Publisher Identifier must match a GitHub
+                            organization you belong to.
                           </p>
                         </section>
                         <input
@@ -426,8 +430,8 @@ const reconnectUrl = buildGithubReconnectUrl(
                 <p>
                   Shown on your public developer page at
                   {developer
-                    ? ` /developer/${developer.id}`
-                    : ' /developer/<your-id>'}
+                    ? ` /developer/${developer.identifier}`
+                    : ' /developer/<your-identifier>'}
                   .
                 </p>
                 <div class="field">
@@ -608,8 +612,8 @@ const reconnectUrl = buildGithubReconnectUrl(
             <>
               <p class="text-sm text-muted-foreground">
                 Permanently deletes your publisher identity (name, contact info)
-                and its public page. This can't be undone, and the ID may be
-                used by someone else afterward.
+                and its public page. This can't be undone, and the public
+                identifier may be used by someone else afterward.
               </p>
               <button
                 type="button"
@@ -623,8 +627,8 @@ const reconnectUrl = buildGithubReconnectUrl(
               <ConfirmDeleteDialog
                 id="delete-developer-profile"
                 title="Delete developer profile"
-                description="Permanently deletes your publisher identity and its public page. This can't be undone, and the ID may be used by someone else afterward."
-                confirmText={developer!.id}
+                description="Permanently deletes your publisher identity and its public page. This can't be undone, and the public identifier may be used by someone else afterward."
+                confirmText={developer!.identifier}
                 intentField={{ name: 'intent', value: 'delete' }}
                 submitLabel="Delete Developer Profile"
               />
diff --git a/src/pages/account/developer/transfer/revoke.ts b/src/pages/account/developer/transfer/revoke.ts
index df9c71f6..49c9a728 100644
--- a/src/pages/account/developer/transfer/revoke.ts
+++ b/src/pages/account/developer/transfer/revoke.ts
@@ -13,7 +13,7 @@ export const POST: APIRoute = formAction({
     const developer = await getDeveloperByOwner(env, user.sub);
     if (!developer) return '/account/developer';
 
-    await createApiClient(env, user.sub).revokeTransfer(developer.id);
+    await createApiClient(env, user.sub).revokeTransfer(developer.identifier);
     await setFlash(context, env.sessionSecret, {
       title: 'Pending transfer link revoked.',
     });
diff --git a/src/pages/account/extensions/new.astro b/src/pages/account/extensions/new.astro
index 07838d7a..e79b8b26 100644
--- a/src/pages/account/extensions/new.astro
+++ b/src/pages/account/extensions/new.astro
@@ -40,7 +40,7 @@ if (Astro.request.method === 'POST') {
     await setFlash(Astro, Astro.locals.env.sessionSecret, {
       title: 'Submitted for Review.',
     });
-    return Astro.redirect(`/extension/${payload.id}`);
+    return Astro.redirect(`/extension/${payload.identifier}`);
   } catch (e) {
     error =
       e instanceof ApiRequestError
diff --git a/src/pages/account/index.astro b/src/pages/account/index.astro
index a7ec52b4..0304c701 100644
--- a/src/pages/account/index.astro
+++ b/src/pages/account/index.astro
@@ -232,12 +232,14 @@ const reconnectUrl = buildGithubReconnectUrl(Astro.url.origin, '/account');
                       githubVerifiedAt={developer.github_verified_at}
                     />
                   </p>
-                  <p class="text-sm text-muted-foreground">{developer.id}</p>
+                  <p class="text-sm text-muted-foreground">
+                    {developer.identifier}
+                  </p>
                 </div>
               </div>
               <div class="flex items-center gap-2">
                 <a
-                  href={`/developer/${developer.id}`}
+                  href={`/developer/${developer.identifier}`}
                   class="btn"
                   data-size="sm"
                   data-variant="outline"
@@ -290,7 +292,7 @@ const reconnectUrl = buildGithubReconnectUrl(Astro.url.origin, '/account');
         ) : displayClaim ? (
           <div class="space-y-2">
             <p class="text-sm flex items-center gap-2">
-              Claim on <strong>{displayClaim.developer_id}</strong>
+              Claim on <strong>{displayClaim.developer_identifier}</strong>
               {displayClaim.status === 'pending' && (
                 <span class="badge" data-variant="secondary">
                   Pending Review
@@ -366,13 +368,15 @@ const reconnectUrl = buildGithubReconnectUrl(Astro.url.origin, '/account');
                 <li class="py-3 flex items-center justify-between gap-3">
                   <div>
                     <a
-                      href={`/extension/${ext.id}`}
+                      href={`/extension/${ext.identifier}`}
                       class="font-medium hover:underline underline-offset-4"
                     >
-                      {ext.published?.name ?? ext.id}
+                      {ext.published?.name ?? ext.identifier}
                     </a>
                     <p class="text-sm text-muted-foreground">
-                      {ext.published ? `v${ext.published.version}` : ext.id}
+                      {ext.published
+                        ? `v${ext.published.version}`
+                        : ext.identifier}
                     </p>
                     {rejectedEdit && ext.last_review?.review_note && (
                       <p
@@ -397,7 +401,7 @@ const reconnectUrl = buildGithubReconnectUrl(Astro.url.origin, '/account');
                       </span>
                     ) : null}
                     <a
-                      href={`/extension/${ext.id}`}
+                      href={`/extension/${ext.identifier}`}
                       class="btn"
                       data-size="sm"
                       data-variant="outline"
diff --git a/src/pages/api/admin/revision-detail.ts b/src/pages/api/admin/revision-detail.ts
index 4d67afcb..c2d7a5a1 100644
--- a/src/pages/api/admin/revision-detail.ts
+++ b/src/pages/api/admin/revision-detail.ts
@@ -44,7 +44,6 @@ export const GET: APIRoute = async (context) => {
         : null;
     return Response.json({
       result: {
-        extension_id: revision.extension_id,
         revision: revision.content,
         published: ext?.published ?? null,
       },
diff --git a/src/pages/developer/[id].astro b/src/pages/developer/[id].astro
index 6c6c2160..a37ba296 100644
--- a/src/pages/developer/[id].astro
+++ b/src/pages/developer/[id].astro
@@ -1,7 +1,7 @@
 ---
 import Base from '../../layouts/Base.astro';
 import DirectorySection from '@/components/DirectorySection.astro';
-import { getDeveloperById } from '@/lib/extensions-data';
+import { getDeveloperByIdentifier } from '@/lib/extensions-data';
 import {
   ApiRequestError,
   createApiClient,
@@ -33,10 +33,10 @@ if (!id) {
 // on an invalid id, but keeps listExtensions off the critical path for every
 // valid request — the far more common case — and repeat misses hit the
 // per-colo data cache.
-const extensionsPromise = listExtensions(env, { developer_id: id });
+const extensionsPromise = listExtensions(env, { developer_identifier: id });
 extensionsPromise.catch(() => {});
 
-const developer = await getDeveloperById(env, id);
+const developer = await getDeveloperByIdentifier(env, id);
 
 if (!developer) {
   return Astro.rewrite('/404');
@@ -58,7 +58,7 @@ if (Astro.request.method === 'POST' && developer.unclaimed) {
 
   const api = createApiClient(env, user.sub);
   try {
-    await api.claimDeveloper(developer.id, submittedNote || undefined);
+    await api.claimDeveloper(developer.identifier, submittedNote || undefined);
     claimSubmitted = true;
   } catch (e) {
     claimError =
@@ -189,7 +189,7 @@ const extensions = extensionsPage?.result ?? [];
     data-extension-directory
     data-api-url="/api/extensions/cards"
     data-limit="50"
-    data-developer-id={developer.id}
+    data-developer-id={developer.identifier}
     data-has-more={
       extensionsPage ? hasNextPage(extensionsPage.pagination) : false
     }
diff --git a/src/pages/extension/[id].astro b/src/pages/extension/[id].astro
index d6006b00..2b17025f 100644
--- a/src/pages/extension/[id].astro
+++ b/src/pages/extension/[id].astro
@@ -94,12 +94,12 @@ const releasesView = Astro.url.searchParams.get('view') === 'releases';
       ) : (
         <>
           <ExtensionHeader
-            id={view.extension.id}
+            id={view.extension.identifier}
             content={view.extension}
             developer={view.extension.developer}
           />
           <ExtensionWorkspace
-            id={view.extension.id}
+            id={view.extension.identifier}
             content={view.extension}
             developerName={view.extension.developer.name}
             releases={releasesView}
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 6aa19bf5..0ab37d79 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -14,8 +14,10 @@ import { EXTENSION_TYPES, isExtensionType } from '@/types';
 const env = Astro.locals.env;
 const requestedType = Astro.url.searchParams.get('type');
 const activeType = isExtensionType(requestedType) ? requestedType : undefined;
-const requestedDeveloperId = Astro.url.searchParams.get('developer_id');
-const activeDeveloperId = requestedDeveloperId || undefined;
+const requestedDeveloperIdentifier = Astro.url.searchParams.get(
+  'developer_identifier',
+);
+const activeDeveloperIdentifier = requestedDeveloperIdentifier || undefined;
 const requestedLimit = Astro.url.searchParams.get('limit');
 const activeLimit = clampApiPageLimit(
   requestedLimit === null ? undefined : Number(requestedLimit),
@@ -27,7 +29,7 @@ let directoryError: string | null = null;
 try {
   directoryPage = await listExtensions(env, {
     type: activeType,
-    developer_id: activeDeveloperId,
+    developer_identifier: activeDeveloperIdentifier,
     limit: activeLimit,
   });
 } catch (error) {
@@ -47,7 +49,7 @@ try {
 
 const extensions = directoryPage?.result ?? [];
 const activeFilterCount =
-  Number(Boolean(activeType)) + Number(Boolean(activeDeveloperId));
+  Number(Boolean(activeType)) + Number(Boolean(activeDeveloperIdentifier));
 ---
 
 <Base
@@ -79,7 +81,7 @@ const activeFilterCount =
     data-api-url="/api/extensions/cards"
     data-limit={activeLimit}
     data-type={activeType}
-    data-developer-id={activeDeveloperId}
+    data-developer-id={activeDeveloperIdentifier}
     data-has-more={
       directoryPage ? hasNextPage(directoryPage.pagination) : false
     }
@@ -110,12 +112,12 @@ const activeFilterCount =
             </select>
           </label>
           <label class="flex flex-col gap-2">
-            <span class="font-medium text-sm">Developer ID</span>
+            <span class="font-medium text-sm">Developer Identifier</span>
             <input
               type="text"
-              name="developer_id"
-              value={activeDeveloperId ?? ''}
-              placeholder="Filter by Developer"
+              name="developer_identifier"
+              value={activeDeveloperIdentifier ?? ''}
+              placeholder="e.g. fossbilling"
               class="input w-full"
             />
           </label>
@@ -124,7 +126,7 @@ const activeFilterCount =
           <button type="submit" class="btn" data-variant="primary">
             Apply Filters
           </button>
-          {activeType || activeDeveloperId ? (
+          {activeType || activeDeveloperIdentifier ? (
             <a href="/" class="btn" data-variant="ghost">
               Clear Filters
             </a>
diff --git a/src/scripts/extension-directory.ts b/src/scripts/extension-directory.ts
index c6877b86..2409f9c1 100644
--- a/src/scripts/extension-directory.ts
+++ b/src/scripts/extension-directory.ts
@@ -41,8 +41,8 @@ async function loadPage(
   if (request.type !== undefined) {
     params.set('type', request.type);
   }
-  if (request.developer_id !== undefined) {
-    params.set('developer_id', request.developer_id);
+  if (request.developer_identifier !== undefined) {
+    params.set('developer_identifier', request.developer_identifier);
   }
   // Cursors are opaque. URLSearchParams performs transport encoding only;
   // the cursor value itself is passed through unchanged.
@@ -110,7 +110,7 @@ function installDirectory(root: HTMLElement): void {
   };
   const filters = {
     type: root.dataset.type || undefined,
-    developer_id: root.dataset.developerId,
+    developer_identifier: root.dataset.developerId,
     limit: Number(root.dataset.limit) || DEFAULT_PAGE_LIMIT,
   };
   const pager = createDirectoryPagerFromIds<DirectoryCard>(
diff --git a/src/types/index.ts b/src/types/index.ts
index 6a6021ca..62bcf2c9 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -66,6 +66,7 @@ export type License = string;
 
 export type Developer = {
   id: string;
+  identifier: string;
   type: DeveloperType;
   name: string;
   URL?: string;
@@ -74,6 +75,7 @@ export type Developer = {
 };
 
 export type Extension = {
+  identifier: string;
   manifest_version: 1;
   author: PackageAuthor;
   requires: Requirements;
@@ -104,7 +106,7 @@ export type DeveloperProfile = Developer & {
   unclaimed?: boolean;
 };
 
-// What getDeveloperById (the public /developer/[id] read) returns — private
+// What getDeveloperByIdentifier (the public /developer/[id] read) returns — private
 // owner and moderation fields are excluded from the local public view.
 export type PublicDeveloperProfile = Omit<
   DeveloperProfile,
diff --git a/test/directory-pagination.test.ts b/test/directory-pagination.test.ts
index 2f788bdf..f1f4ac56 100644
--- a/test/directory-pagination.test.ts
+++ b/test/directory-pagination.test.ts
@@ -12,7 +12,7 @@ import { item, page } from './helpers/directory-fixtures';
 describe('directory page accumulation', () => {
   const filters = {
     type: 'module' as const,
-    developer_id: 'developer-id',
+    developer_identifier: 'developer-id',
     limit: 100,
   };
 
@@ -36,7 +36,7 @@ describe('directory page accumulation', () => {
       ...filters,
       cursor: 'cursor-2',
     } satisfies DirectoryPageRequest);
-    expect(state.items.map((extension) => extension.id)).toEqual([
+    expect(state.items.map((extension) => extension.identifier)).toEqual([
       'zeta',
       'alpha',
       'beta',
@@ -50,7 +50,7 @@ describe('directory page accumulation', () => {
       .fn()
       .mockResolvedValue(page([item('ALPHA'), item('second')], null, false));
     const pager = createDirectoryPagerFromIds(
-      ['alpha'],
+      [item('alpha').id],
       { next_cursor: 'cursor-2', has_more: true },
       filters,
       loadPage,
@@ -58,7 +58,9 @@ describe('directory page accumulation', () => {
 
     const state = await pager.loadNextPage();
 
-    expect(state.items.map((extension) => extension.id)).toEqual(['second']);
+    expect(state.items.map((extension) => extension.identifier)).toEqual([
+      'second',
+    ]);
   });
 
   it('does not duplicate concurrent next-page requests', async () => {
@@ -73,7 +75,7 @@ describe('directory page accumulation', () => {
         }),
     );
     const pager = createDirectoryPagerFromIds(
-      ['first'],
+      [item('first').id],
       { next_cursor: 'cursor-2', has_more: true },
       filters,
       loadPage,
@@ -87,9 +89,9 @@ describe('directory page accumulation', () => {
     resolvePage?.(page([item('first'), item('second')], null, false));
     await Promise.all([firstRequest, duplicateRequest]);
 
-    expect(pager.getState().items.map((extension) => extension.id)).toEqual([
-      'second',
-    ]);
+    expect(
+      pager.getState().items.map((extension) => extension.identifier),
+    ).toEqual(['second']);
   });
 
   it('appends a final page and offers no further request', async () => {
@@ -105,7 +107,7 @@ describe('directory page accumulation', () => {
     const state = await pager.loadNextPage();
     await pager.loadNextPage();
 
-    expect(state.items.map((extension) => extension.id)).toEqual([
+    expect(state.items.map((extension) => extension.identifier)).toEqual([
       'first',
       'last',
     ]);
@@ -137,7 +139,7 @@ describe('directory page accumulation', () => {
       .mockResolvedValueOnce(page([item('second')], 'invalid-cursor', true))
       .mockRejectedValueOnce(invalidCursor);
     const pager = createDirectoryPagerFromIds(
-      ['first'],
+      [item('first').id],
       { next_cursor: 'cursor-2', has_more: true },
       filters,
       loadPage,
@@ -146,35 +148,12 @@ describe('directory page accumulation', () => {
     await pager.loadNextPage();
     const state = await pager.loadNextPage();
 
-    expect(state.items.map((extension) => extension.id)).toEqual(['second']);
+    expect(state.items.map((extension) => extension.identifier)).toEqual([
+      'second',
+    ]);
     expect(state.nextCursor).toBe('invalid-cursor');
     expect(state.hasMore).toBe(true);
     expect(state.error).toBe(invalidCursor);
     expect(loadPage).toHaveBeenCalledTimes(2);
   });
-
-  it('dedupes fragment cards whose markup is missing an extension id', async () => {
-    // Production feeds {id, html} cards parsed from the rendered fragment;
-    // a card without a usable id still counts once so it renders, but two
-    // of them must not both stack up on every page load.
-    const loadPage = vi.fn().mockResolvedValue({
-      result: [
-        { id: '', html: '<a data-extension-id></a>' },
-        { id: '', html: '<b></b>' },
-      ],
-      pagination: { next_cursor: null, has_more: false },
-    });
-    const pager = createDirectoryPagerFromIds(
-      [],
-      { next_cursor: 'cursor-2', has_more: true },
-      filters,
-      loadPage,
-    );
-
-    const state = await pager.loadNextPage();
-
-    expect(state.items).toEqual([
-      { id: '', html: '<a data-extension-id></a>' },
-    ]);
-  });
 });
diff --git a/test/extension-directory.test.ts b/test/extension-directory.test.ts
index de378200..224b9d88 100644
--- a/test/extension-directory.test.ts
+++ b/test/extension-directory.test.ts
@@ -16,12 +16,12 @@ describe('application boundary validation', () => {
 describe('directory filter parsing', () => {
   it('parses every supported filter and ignores unknown params', () => {
     const params = new URLSearchParams(
-      'type=module&developer_id=dev-1&limit=24&cursor=opaque&q=ignored',
+      'type=module&developer_identifier=dev-1&limit=24&cursor=opaque&q=ignored',
     );
     expect(parseDirectoryFilters(params)).toEqual({
       filters: {
         type: 'module',
-        developer_id: 'dev-1',
+        developer_identifier: 'dev-1',
         limit: 24,
         cursor: 'opaque',
       },
diff --git a/test/extension-form.test.ts b/test/extension-form.test.ts
index ca66cb39..799b4db8 100644
--- a/test/extension-form.test.ts
+++ b/test/extension-form.test.ts
@@ -12,7 +12,7 @@ import type { Extension } from '@/types';
 function extensionForm(overrides: Record<string, string | undefined> = {}) {
   const form = new FormData();
   const values = {
-    extension_id: 'example_module',
+    extension_identifier: 'example_module',
     type: 'module',
     name: 'Example',
     description: 'Description',
@@ -36,7 +36,8 @@ function extensionForm(overrides: Record<string, string | undefined> = {}) {
   return form;
 }
 const developer = {
-  id: 'owner',
+  id: '019a0000-0000-7000-8000-000000000001',
+  identifier: 'owner',
   type: 'organization' as const,
   name: 'Developer',
 };
@@ -69,7 +70,8 @@ const published: Extension = {
       },
     },
   ],
-  id: 'example_module',
+  id: '019a0000-0000-7000-8000-000000000002',
+  identifier: 'example_module',
   developer,
 };
 
@@ -77,7 +79,7 @@ describe('manifest publishing forms', () => {
   it('sends the new manifest fields without transforming constraints or attribution', () => {
     const body = buildExtensionCreatePayload(extensionForm());
     expect(body).toMatchObject({
-      id: 'example_module',
+      identifier: 'example_module',
       manifest_version: 1,
       type: 'module',
       license: 'MIT',
@@ -95,11 +97,11 @@ describe('manifest publishing forms', () => {
     expect(body).not.toHaveProperty('website');
     expect(body.releases[0]).not.toHaveProperty('min_fossbilling_version');
   });
-  it('lowercases new ids and accepts an omitted homepage', () => {
+  it('lowercases new identifiers and accepts an omitted homepage', () => {
     const body = buildExtensionCreatePayload(
-      extensionForm({ extension_id: 'My_Module', homepage_url: '' }),
+      extensionForm({ extension_identifier: 'My_Module', homepage_url: '' }),
     );
-    expect(body.id).toBe('my_module');
+    expect(body.identifier).toBe('my_module');
     expect(body.homepage_url).toBeUndefined();
   });
   it('carries published releases unchanged when editing metadata', () => {
@@ -237,9 +239,9 @@ describe('manifest publishing forms', () => {
     expect(echo.moduleRequirementsInput).toBe('unfinished dependency');
     expect(echo.license).toBe('MIT OR BSD-3-Clause');
     expect(echoReleaseDraftFromForm(form).version_tag).toBe('1.0.0');
-    expect(echoNewExtensionFromForm(form, developer).extension.id).toBe(
-      'example_module',
-    );
+    const createdEcho = echoNewExtensionFromForm(form, developer).extension;
+    expect(createdEcho).not.toHaveProperty('id');
+    expect(createdEcho.identifier).toBe('example_module');
   });
 });
 
@@ -273,7 +275,7 @@ it('safely echoes blank new-extension and release submissions', () => {
   });
   const echo = echoNewExtensionFromForm(form, developer);
   expect(echo.extension).toMatchObject({
-    id: '',
+    identifier: '',
     name: '',
     license: '',
     moduleRequirementsInput: '',
diff --git a/test/extension-view.test.ts b/test/extension-view.test.ts
index 24b43476..3803c9d5 100644
--- a/test/extension-view.test.ts
+++ b/test/extension-view.test.ts
@@ -2,32 +2,43 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 const mocks = vi.hoisted(() => ({
   getOwnDeveloper: vi.fn(),
   getMyExtension: vi.fn(),
-  getExtensionById: vi.fn(),
+  getExtensionByIdentifier: vi.fn(),
   createApiClient: vi.fn(),
 }));
 vi.mock('@/lib/api/client', async (original) => ({
   ...(await original<typeof import('@/lib/api/client')>()),
   createApiClient: mocks.createApiClient,
-  getExtensionById: mocks.getExtensionById,
+  getExtensionByIdentifier: mocks.getExtensionByIdentifier,
 }));
 import { loadExtensionView } from '@/lib/extension-view';
 import { ApiRequestError } from '@/lib/api/client';
 import { makeEnv } from './helpers/env';
 const env = makeEnv();
 const user = { sub: 'owner', name: 'Owner', email: 'owner@example.test' };
-const published = { id: 'sample', name: 'Published' };
+const published = {
+  id: '019a0000-0000-7000-8000-000000000001',
+  identifier: 'sample',
+  name: 'Published',
+};
 const owned = {
-  id: 'sample',
-  developer: { id: 'my-profile' },
+  id: published.id,
+  identifier: 'sample',
+  developer: {
+    id: '019a0000-0000-7000-8000-000000000002',
+    identifier: 'my-profile',
+  },
   published,
   pending_revision: { content: { name: 'Private pending' } },
 };
 beforeEach(() => {
   vi.resetAllMocks();
   mocks.createApiClient.mockReturnValue(mocks);
-  mocks.getOwnDeveloper.mockResolvedValue({ id: 'my-profile' });
+  mocks.getOwnDeveloper.mockResolvedValue({
+    id: owned.developer.id,
+    identifier: 'my-profile',
+  });
   mocks.getMyExtension.mockResolvedValue(owned);
-  mocks.getExtensionById.mockResolvedValue(published);
+  mocks.getExtensionByIdentifier.mockResolvedValue(published);
 });
 describe('permission-aware extension view', () => {
   it('uses only the public read for anonymous visitors', async () => {
@@ -35,6 +46,7 @@ describe('permission-aware extension view', () => {
       kind: 'public',
       extension: published,
     });
+    expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(env, 'sample');
     expect(mocks.createApiClient).not.toHaveBeenCalled();
   });
   it('enables editing only for the API-verified owner', async () => {
@@ -44,29 +56,37 @@ describe('permission-aware extension view', () => {
       userId: user.sub,
     });
     expect(mocks.createApiClient).toHaveBeenCalledWith(env, user.sub);
-    expect(mocks.getExtensionById).not.toHaveBeenCalled();
+    expect(mocks.getMyExtension).toHaveBeenCalledWith('sample');
+    expect(mocks.getExtensionByIdentifier).not.toHaveBeenCalled();
   });
   it('allows an owner to view a first submission without a public listing', async () => {
     mocks.getMyExtension.mockResolvedValue({ ...owned, published: null });
     expect((await loadExtensionView(env, 'sample', user)).kind).toBe('owner');
-    expect(mocks.getExtensionById).not.toHaveBeenCalled();
+    expect(mocks.getExtensionByIdentifier).not.toHaveBeenCalled();
   });
   it('does not grant editing from a moderator cookie flag', async () => {
     mocks.getOwnDeveloper.mockResolvedValue(null);
     expect(
       await loadExtensionView(env, 'sample', { ...user, is_moderator: true }),
     ).toEqual({ kind: 'public', extension: published });
+    expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(env, 'sample');
     expect(mocks.getMyExtension).not.toHaveBeenCalled();
   });
-  it('does not mistake a moderator-readable record for an owned extension', async () => {
+  it('does not grant editing when a profile identifier has been reused', async () => {
+    // The profile can be deleted and its identifier reused between the two
+    // API reads. A moderator can then read the replacement's extension.
     mocks.getMyExtension.mockResolvedValue({
       ...owned,
-      developer: { id: 'someone-else' },
+      developer: {
+        id: '019a0000-0000-7000-8000-000000000003',
+        identifier: 'my-profile',
+      },
     });
     expect(await loadExtensionView(env, 'sample', user)).toEqual({
       kind: 'public',
       extension: published,
     });
+    expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(env, 'sample');
   });
   it.each([403, 404])(
     'falls back to public content when the account/profile is unavailable (%s)',
@@ -77,6 +97,10 @@ describe('permission-aware extension view', () => {
       expect((await loadExtensionView(env, 'sample', user)).kind).toBe(
         'public',
       );
+      expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(
+        env,
+        'sample',
+      );
     },
   );
   it('falls back to public content for another developer’s extension', async () => {
@@ -87,15 +111,17 @@ describe('permission-aware extension view', () => {
       kind: 'public',
       extension: published,
     });
+    expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(env, 'sample');
   });
   it('keeps unpublished content inaccessible to unrelated visitors', async () => {
     mocks.getOwnDeveloper.mockResolvedValue(null);
-    mocks.getExtensionById.mockRejectedValue(
+    mocks.getExtensionByIdentifier.mockRejectedValue(
       new ApiRequestError(404, 'NOT_FOUND', 'Not published'),
     );
     await expect(loadExtensionView(env, 'sample', user)).rejects.toMatchObject({
       status: 404,
     });
+    expect(mocks.getExtensionByIdentifier).toHaveBeenCalledWith(env, 'sample');
   });
   it.each(['getOwnDeveloper', 'getMyExtension'] as const)(
     'keeps %s outages retryable rather than hiding owner controls',
@@ -106,7 +132,7 @@ describe('permission-aware extension view', () => {
       await expect(
         loadExtensionView(env, 'sample', user),
       ).rejects.toMatchObject({ status: 503 });
-      expect(mocks.getExtensionById).not.toHaveBeenCalled();
+      expect(mocks.getExtensionByIdentifier).not.toHaveBeenCalled();
     },
   );
 });
diff --git a/test/extensions-api.test.ts b/test/extensions-api.test.ts
index a18bdf35..fefe7843 100644
--- a/test/extensions-api.test.ts
+++ b/test/extensions-api.test.ts
@@ -19,7 +19,7 @@ import {
   clampApiPageLimit,
   createApiClient,
   getApiErrorMessage,
-  getExtensionById,
+  getExtensionByIdentifier,
   listExtensions,
   type Extension,
   type ExtensionCreate,
@@ -144,7 +144,7 @@ describe('generated Extensions v2 façade', () => {
       .mockResolvedValue(apiResponse(page([], null, false)));
     const request = {
       type: 'theme' as const,
-      developer_id: 'developer-id',
+      developer_identifier: 'developer-id',
       limit: 25,
       cursor: 'opaque-cursor',
     };
@@ -257,14 +257,14 @@ describe('generated Extensions v2 façade', () => {
 
     await listExtensions(publicEnv, {
       type: 'theme',
-      developer_id: 'developer-id',
+      developer_identifier: 'developer-id',
       limit: 100,
       cursor: opaqueCursor,
     });
 
     const url = requestUrl(fetchMock);
     expect(url.searchParams.get('type')).toBe('theme');
-    expect(url.searchParams.get('developer_id')).toBe('developer-id');
+    expect(url.searchParams.get('developer_identifier')).toBe('developer-id');
     expect(url.searchParams.get('cursor')).toBe(opaqueCursor);
   });
 
@@ -296,7 +296,10 @@ describe('generated Extensions v2 façade', () => {
       .mockResolvedValue(apiResponse({ result: detail }));
     vi.stubGlobal('fetch', fetchMock);
 
-    const response = await getExtensionById(publicEnv, 'full-extension');
+    const response = await getExtensionByIdentifier(
+      publicEnv,
+      'full-extension',
+    );
 
     expect(requestFrom(fetchMock).url).toBe(
       'https://api.example.test/extensions/v2/extensions/full-extension',
@@ -311,7 +314,10 @@ describe('generated Extensions v2 façade', () => {
     expect(response.source.repo).toBe('fossbilling/full-extension');
     expect(response.version).toBe('1.0.0');
     expect(response.download_url).toContain('full-extension.zip');
-    expect(response.developer.id).toBe('fossbilling');
+    expect(response.id).toBe(detail.id);
+    expect(response.identifier).toBe('full-extension');
+    expect(response.developer.id).toBe(detail.developer.id);
+    expect(response.developer.identifier).toBe('fossbilling');
   });
 
   it('uses generated serialization and a fresh bearer callback for authenticated requests', async () => {
@@ -352,17 +358,17 @@ describe('generated Extensions v2 façade', () => {
       'opaque cursor',
     );
     // The mine scope forwards a type filter when asked, and never carries
-    // the public directory's developer_id filter.
+    // the public directory's developer_identifier filter.
     expect(requestUrl(fetchMock, 0).searchParams.get('type')).toBe('theme');
-    expect(requestUrl(fetchMock, 0).searchParams.has('developer_id')).toBe(
-      false,
-    );
+    expect(
+      requestUrl(fetchMock, 0).searchParams.has('developer_identifier'),
+    ).toBe(false);
     expect(requestUrl(fetchMock, 1).searchParams.has('cursor')).toBe(false);
   });
 
   it('serializes a create payload with no developer field and reports the new revision', async () => {
     const payload = {
-      id: 'body-extension',
+      identifier: 'body-extension',
       manifest_version: 1 as const,
       author: { name: 'Package Author' },
       requires: { fossbilling: '^0.8.9', php: '>=8.3' },
@@ -381,7 +387,8 @@ describe('generated Extensions v2 façade', () => {
       apiResponse(
         {
           result: {
-            id: 'body-extension',
+            id: '019a0000-0000-7000-8000-000000000001',
+            identifier: 'body-extension',
             revision_id: 'revision-1',
             status: 'pending',
           },
@@ -402,7 +409,8 @@ describe('generated Extensions v2 façade', () => {
     expect(request.headers.get('content-type')).toBe('application/json');
     expect(await request.json()).toEqual(payload);
     expect(result).toEqual({
-      id: 'body-extension',
+      id: '019a0000-0000-7000-8000-000000000001',
+      identifier: 'body-extension',
       revision_id: 'revision-1',
       status: 'pending',
     });
@@ -428,7 +436,7 @@ describe('generated Extensions v2 façade', () => {
       apiResponse(
         {
           result: {
-            id: 'body-extension',
+            identifier: 'body-extension',
             revision_id: 'revision-2',
             status: 'pending',
           },
@@ -455,7 +463,11 @@ describe('generated Extensions v2 façade', () => {
   it('withdraws an unpublished extension with DELETE', async () => {
     const fetchMock = vi.fn().mockResolvedValue(
       apiResponse({
-        result: { id: 'body-extension', deleted: true },
+        result: {
+          id: '019a0000-0000-7000-8000-000000000001',
+          identifier: 'body-extension',
+          deleted: true,
+        },
       }),
     );
     vi.stubGlobal('fetch', fetchMock);
@@ -470,7 +482,11 @@ describe('generated Extensions v2 façade', () => {
       '/extensions/v2/extensions/body-extension',
     );
     expect(request.method).toBe('DELETE');
-    expect(result).toEqual({ id: 'body-extension', deleted: true });
+    expect(result).toEqual({
+      id: '019a0000-0000-7000-8000-000000000001',
+      identifier: 'body-extension',
+      deleted: true,
+    });
   });
 
   it('approves and rejects a revision by extension id + revision id', async () => {
@@ -515,7 +531,12 @@ describe('generated Extensions v2 façade', () => {
   it('corrects live content as a moderator with no notify query', async () => {
     const fetchMock = vi.fn().mockResolvedValue(
       apiResponse({
-        result: { id: 'live-ext', revision_id: 'rev-1', status: 'approved' },
+        result: {
+          id: '019a0000-0000-7000-8000-000000000001',
+          identifier: 'live-ext',
+          revision_id: 'rev-1',
+          status: 'approved',
+        },
       }),
     );
     vi.stubGlobal('fetch', fetchMock);
@@ -552,7 +573,8 @@ describe('generated Extensions v2 façade', () => {
       correction_note: 'Fix truncated readme',
     });
     expect(result).toEqual({
-      id: 'live-ext',
+      id: '019a0000-0000-7000-8000-000000000001',
+      identifier: 'live-ext',
       revision_id: 'rev-1',
       status: 'approved',
     });
@@ -561,7 +583,12 @@ describe('generated Extensions v2 façade', () => {
   it('skips the author email on moderation writes when asked', async () => {
     const delistFetch = vi.fn().mockResolvedValue(
       apiResponse({
-        result: { id: 'body-extension', status: 'delisted', notified: false },
+        result: {
+          id: '019a0000-0000-7000-8000-000000000001',
+          identifier: 'body-extension',
+          status: 'delisted',
+          notified: false,
+        },
       }),
     );
     vi.stubGlobal('fetch', delistFetch);
@@ -572,14 +599,20 @@ describe('generated Extensions v2 façade', () => {
     expect(delistFetch).toHaveBeenCalledOnce();
     expect(requestUrl(delistFetch).searchParams.get('notify')).toBe('false');
     expect(delisted).toEqual({
-      id: 'body-extension',
+      id: '019a0000-0000-7000-8000-000000000001',
+      identifier: 'body-extension',
       status: 'delisted',
       notified: false,
     });
 
     const approveFetch = vi.fn().mockResolvedValue(
       apiResponse({
-        result: { id: 'dev-1', approved: true, notified: true },
+        result: {
+          id: '019a0000-0000-7000-8000-000000000001',
+          identifier: 'dev-1',
+          approved: true,
+          notified: true,
+        },
       }),
     );
     vi.stubGlobal('fetch', approveFetch);
@@ -596,7 +629,12 @@ describe('generated Extensions v2 façade', () => {
 
     const optOutFetch = vi.fn().mockResolvedValue(
       apiResponse({
-        result: { id: 'dev-1', approved: true, notified: false },
+        result: {
+          id: '019a0000-0000-7000-8000-000000000001',
+          identifier: 'dev-1',
+          approved: true,
+          notified: false,
+        },
       }),
     );
     vi.stubGlobal('fetch', optOutFetch);
@@ -703,7 +741,8 @@ describe('generated Extensions v2 façade', () => {
   it('fetches one revision on demand and supports compacted content', async () => {
     const compacted = {
       id: 'revision-1',
-      extension_id: 'extension-1',
+      extension_id: '019a0000-0000-7000-8000-000000000001',
+      extension_identifier: 'extension-1',
       content: null,
       content_available: false,
       content_hash: 'hash',
@@ -931,11 +970,12 @@ describe('cursor-paginated moderator lists', () => {
   // The API caps these lists at 100 rows per request, so the wrappers walk
   // keyset pages with the opaque cursor instead of assuming one whole-list
   // response.
-  function developerProfile(id: string): DeveloperProfile {
+  function developerProfile(id: string, identifier: string): DeveloperProfile {
     return {
       id,
+      identifier,
       type: 'user',
-      name: id,
+      name: identifier,
       approved: true,
       content_revision: 1,
       profile_generation: '0123456789abcdef0123456789abcdef',
@@ -945,7 +985,8 @@ describe('cursor-paginated moderator lists', () => {
   function myClaim(id: string): PendingDeveloperClaim {
     return {
       id,
-      developer_id: 'dev-1',
+      developer_id: '019a0000-0000-7000-8000-000000000001',
+      developer_identifier: 'dev-1',
       claimant_id: 'user-1',
       status: 'pending',
       created_at: '2026-01-01T00:00:00Z',
@@ -960,17 +1001,29 @@ describe('cursor-paginated moderator lists', () => {
     const fetchMock = vi
       .fn()
       .mockResolvedValueOnce(
-        apiResponse(page([developerProfile('a')], 'cursor-1', true)),
+        apiResponse(
+          page(
+            [developerProfile('019a0000-0000-7000-8000-000000000001', 'a')],
+            'cursor-1',
+            true,
+          ),
+        ),
       )
       .mockResolvedValueOnce(
-        apiResponse(page([developerProfile('b')], null, false)),
+        apiResponse(
+          page(
+            [developerProfile('019a0000-0000-7000-8000-000000000002', 'b')],
+            null,
+            false,
+          ),
+        ),
       );
     vi.stubGlobal('fetch', fetchMock);
 
     const api = createApiClient(authenticatedEnv, 'moderator-sub');
     const developers = await api.listAllDevelopers();
 
-    expect(developers.map((d) => d.id)).toEqual(['a', 'b']);
+    expect(developers.map((d) => d.identifier)).toEqual(['a', 'b']);
     expect(fetchMock).toHaveBeenCalledTimes(2);
     expect(requestUrl(fetchMock, 0).searchParams.get('limit')).toBe('100');
     expect(requestUrl(fetchMock, 0).searchParams.get('cursor')).toBe(null);
@@ -985,14 +1038,20 @@ describe('cursor-paginated moderator lists', () => {
     const fetchMock = vi
       .fn()
       .mockResolvedValue(
-        apiResponse(page([developerProfile('only')], null, false)),
+        apiResponse(
+          page(
+            [developerProfile('019a0000-0000-7000-8000-000000000003', 'only')],
+            null,
+            false,
+          ),
+        ),
       );
     vi.stubGlobal('fetch', fetchMock);
 
     const api = createApiClient(authenticatedEnv, 'moderator-sub');
     const developers = await api.listUnapprovedDevelopers();
 
-    expect(developers.map((d) => d.id)).toEqual(['only']);
+    expect(developers.map((d) => d.identifier)).toEqual(['only']);
     expect(fetchMock).toHaveBeenCalledTimes(1);
     expect(requestUrl(fetchMock).searchParams.get('scope')).toBe('unapproved');
   });
@@ -1000,7 +1059,7 @@ describe('cursor-paginated moderator lists', () => {
   it('walks the claims queue and profile history with explicit pages', async () => {
     const claim = myClaim('claim-1');
     const entry: DeveloperHistoryEntry = {
-      developer_id: 'dev-1',
+      developer_id: '019a0000-0000-7000-8000-000000000001',
       type: 'user',
       name: 'Dev One',
       changed_by: 'user-1',
@@ -1025,11 +1084,13 @@ describe('cursor-paginated moderator lists', () => {
     const api = createApiClient(authenticatedEnv, 'moderator-sub');
     const [claims, history] = await Promise.all([
       api.listPendingClaims(),
-      api.listDeveloperHistory('dev-1'),
+      api.listDeveloperHistory('019a0000-0000-7000-8000-000000000001'),
     ]);
 
     expect(claims.map((c) => c.id)).toEqual(['claim-1']);
-    expect(history.map((h) => h.developer_id)).toEqual(['dev-1']);
+    expect(history.map((h) => h.developer_id)).toEqual([
+      '019a0000-0000-7000-8000-000000000001',
+    ]);
     const urls = fetchMock.mock.calls.map(
       (call) => new URL((call[0] as Request).url),
     );
@@ -1037,6 +1098,9 @@ describe('cursor-paginated moderator lists', () => {
       u.pathname.endsWith('/developers/claims'),
     );
     const historyUrl = urls.find((u) => u.pathname.endsWith('/history'));
+    expect(historyUrl?.pathname).toBe(
+      '/extensions/v2/developers/019a0000-0000-7000-8000-000000000001/history',
+    );
     expect(claimsUrl?.searchParams.get('scope')).toBe('pending');
     expect(claimsUrl?.searchParams.get('limit')).toBe('100');
     expect(claimsUrl?.searchParams.get('cursor')).toBe(null);
diff --git a/test/extensions-data.test.ts b/test/extensions-data.test.ts
index dcf9c897..c1cb72e9 100644
--- a/test/extensions-data.test.ts
+++ b/test/extensions-data.test.ts
@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   createApiClient: vi.fn(),
-  getDeveloperById: vi.fn(),
+  getDeveloperByIdentifier: vi.fn(),
 }));
 
 // paginateAll stays real: the adapters under test route their whole-list
@@ -10,11 +10,11 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/lib/api/client', async (importOriginal) => ({
   ...(await importOriginal<typeof import('@/lib/api/client')>()),
   createApiClient: mocks.createApiClient,
-  getDeveloperById: mocks.getDeveloperById,
+  getDeveloperByIdentifier: mocks.getDeveloperByIdentifier,
 }));
 
 import {
-  getDeveloperById,
+  getDeveloperByIdentifier,
   getDeveloperByOwner,
   getExtensionsByOwner,
   getOwnedExtension,
@@ -25,7 +25,8 @@ import { makeEnv } from './helpers/env';
 const env = makeEnv();
 
 const developer = {
-  id: 'developer',
+  id: '019a0000-0000-7000-8000-000000000001',
+  identifier: 'developer',
   type: 'organization' as const,
   name: 'Example developer',
   approved: true,
@@ -34,24 +35,27 @@ const developer = {
 
 beforeEach(() => {
   mocks.createApiClient.mockReset();
-  mocks.getDeveloperById.mockReset();
+  mocks.getDeveloperByIdentifier.mockReset();
 });
 
 describe('API-backed extension data adapters', () => {
   it('treats a failed or unauthorized owner detail read as a missing resource', async () => {
-    mocks.createApiClient.mockReturnValue({
-      getMyExtension: vi.fn().mockRejectedValue(new Error('API unavailable')),
-    });
+    const getMyExtension = vi
+      .fn()
+      .mockRejectedValue(new Error('API unavailable'));
+    mocks.createApiClient.mockReturnValue({ getMyExtension });
 
     await expect(
-      getOwnedExtension(env, 'user-subject', 'extension-id'),
+      getOwnedExtension(env, 'user-subject', 'example'),
     ).resolves.toBe(null);
+    expect(getMyExtension).toHaveBeenCalledExactlyOnceWith('example');
   });
 
   it('splits the owner detail response into published/pendingRevision/lastReview', async () => {
     mocks.createApiClient.mockReturnValue({
       getMyExtension: vi.fn().mockResolvedValue({
-        id: 'extension-id',
+        id: '019a0000-0000-7000-8000-000000000002',
+        identifier: 'example',
         developer,
         published: {
           manifest_version: 1 as const,
@@ -88,8 +92,17 @@ describe('API-backed extension data adapters', () => {
       }),
     });
 
-    const detail = await getOwnedExtension(env, 'user-subject', 'extension-id');
+    const detail = await getOwnedExtension(env, 'user-subject', 'example');
 
+    expect(detail).toMatchObject({
+      id: '019a0000-0000-7000-8000-000000000002',
+      identifier: 'example',
+      developer: { id: developer.id, identifier: developer.identifier },
+      published: {
+        id: '019a0000-0000-7000-8000-000000000002',
+        identifier: 'example',
+      },
+    });
     expect(detail?.published?.name).toBe('Example');
     expect(detail?.published?.author).toEqual({ name: 'Package Author' });
     expect(detail?.published?.requires).toEqual({
@@ -114,7 +127,8 @@ describe('API-backed extension data adapters', () => {
 
   it('maps either detail view to the same shape, delisted state included', () => {
     const detail = toOwnedExtensionDetail({
-      id: 'extension-id',
+      id: '019a0000-0000-7000-8000-000000000002',
+      identifier: 'example',
       developer,
       published: {
         manifest_version: 1 as const,
@@ -150,9 +164,13 @@ describe('API-backed extension data adapters', () => {
   });
 
   it('treats failed public developer reads as missing profiles', async () => {
-    mocks.getDeveloperById.mockRejectedValue(new Error('API unavailable'));
+    mocks.getDeveloperByIdentifier.mockRejectedValue(
+      new Error('API unavailable'),
+    );
 
-    await expect(getDeveloperById(env, 'developer-id')).resolves.toBeNull();
+    await expect(
+      getDeveloperByIdentifier(env, 'developer-id'),
+    ).resolves.toBeNull();
   });
 
   it('keeps owner pages usable when the API cannot load the profile or list', async () => {
diff --git a/test/helpers/directory-fixtures.ts b/test/helpers/directory-fixtures.ts
index ee8ece24..e051e5fb 100644
--- a/test/helpers/directory-fixtures.ts
+++ b/test/helpers/directory-fixtures.ts
@@ -1,22 +1,28 @@
+import { createHash } from 'node:crypto';
 import type { ExtensionListItem } from '@/lib/api/client';
 
-// Full ExtensionListItem fixture: the generated DTO requires every field,
-// even though most tests only assert on ids.
-export function item(id: string, name = id): ExtensionListItem {
+// Keep record UUIDs distinct from public identifiers in API fixtures.
+export function item(identifier: string, name = identifier): ExtensionListItem {
+  const suffix = createHash('sha256')
+    .update(identifier.toLowerCase())
+    .digest('hex')
+    .slice(0, 12);
   return {
-    id,
+    id: `019a0000-0000-7000-8000-${suffix}`,
+    identifier,
     manifest_version: 1 as const,
     author: { name: 'Package Author' },
     type: 'module',
     name,
     description: `${name} description`,
-    homepage_url: `https://example.test/${id}`,
+    homepage_url: `https://example.test/${identifier}`,
     license: 'MIT',
-    source: { type: 'github', repo: `fossbilling/${id}` },
+    source: { type: 'github', repo: `fossbilling/${identifier}` },
     version: '1.0.0',
-    download_url: `https://example.test/${id}.zip`,
+    download_url: `https://example.test/${identifier}.zip`,
     developer: {
-      id: 'fossbilling',
+      id: '019a0000-0000-7000-8000-000000000001',
+      identifier: 'fossbilling',
       type: 'organization',
       name: 'FOSSBilling',
       approved: true,
diff --git a/test/revision-detail.test.ts b/test/revision-detail.test.ts
index 713f3b04..630e309e 100644
--- a/test/revision-detail.test.ts
+++ b/test/revision-detail.test.ts
@@ -25,7 +25,6 @@ beforeEach(() => {
   vi.clearAllMocks();
   mocks.guard.mockResolvedValue({ sub: 'moderator' });
   mocks.getRevision.mockResolvedValue({
-    extension_id: 'ext',
     content_available: true,
     content: { name: 'Proposed' },
   });
@@ -49,6 +48,9 @@ describe('on-demand revision proxy', () => {
   it('fetches only one frozen revision unless comparison was requested', async () => {
     const response = await GET(context('extensionId=ext&revisionId=rev'));
     expect(response.status).toBe(200);
+    await expect(response.json()).resolves.toEqual({
+      result: { revision: { name: 'Proposed' }, published: null },
+    });
     expect(mocks.getRevision).toHaveBeenCalledExactlyOnceWith('ext', 'rev');
     expect(mocks.getModerationExtension).not.toHaveBeenCalled();
     await GET(context('extensionId=ext&revisionId=rev&compare=1'));