diff --git a/packages/apollo-react/src/material/components/ap-model-picker/ModelPicker.tsx b/packages/apollo-react/src/material/components/ap-model-picker/ModelPicker.tsx
index a3bc5f8a2..ca7cb1590 100644
--- a/packages/apollo-react/src/material/components/ap-model-picker/ModelPicker.tsx
+++ b/packages/apollo-react/src/material/components/ap-model-picker/ModelPicker.tsx
@@ -516,7 +516,7 @@ export const ModelPicker = React.forwardRef<HTMLButtonElement, ModelPickerProps>
           onEdit: (model) =>
             navigateToLlmConfigurations({
               intent: 'edit',
-              configurationId: model.byomDetails?.productLlmConfigurationId,
+              configurationId: model.byomDetails?.byoConfigurationId,
             }),
         });
     }, [slots?.optionActions, effectiveCanManageByo, navigateToLlmConfigurations, i18n]);
diff --git a/packages/apollo-react/src/material/components/ap-model-picker/README.md b/packages/apollo-react/src/material/components/ap-model-picker/README.md
index 80d4a3f48..ee13179ad 100644
--- a/packages/apollo-react/src/material/components/ap-model-picker/README.md
+++ b/packages/apollo-react/src/material/components/ap-model-picker/README.md
@@ -189,7 +189,7 @@ Under the hood: `GET {baseUrl}/portal_/api/organization/UserOrganizationInfo` 
 **Default navigation.** With a `requestContext` in place the affordances work with zero extra wiring — both lead to the AI Trust Layer LLM-configurations surface (`{baseUrl}/portal_/admin/ai-trust-layer/llm-configurations`):
 
 - The **"Use custom model" footer** opens the *add configuration* form, deep-linked to `/{tenantId}/{folderId}/add` when the tenant GUID and a concrete folder are known (the folder switcher's selection supplies the numeric folder id) and pre-populated via `?product=&feature=` from `requestingProduct`/`requestingFeature`. Without a concrete folder it lands on the configurations list instead.
-- The **edit row action** (BYO rows only) opens the configuration's *edit* form when the model carries `byomDetails.productLlmConfigurationId`; until Discovery serves that id, it lands on the configurations list scoped to the tenant + folder. There is deliberately no delete row action: removal lives on the configurations page.
+- The **edit row action** (BYO rows only) opens the configuration's *edit* form when the model carries `byomDetails.byoConfigurationId` (served by Discovery on gateways with UiPath/Arima#2659); on older gateways it lands on the configurations list scoped to the tenant + folder. There is deliberately no delete row action: removal lives on the configurations page.
 
 `onUseCustomModel` overrides the footer's default navigation (e.g. an in-app wizard), and `slots.optionActions` overrides the row actions. Products with their own authorization model can pass `canManageByo` (`true`/`false`); when set, no admin check request is made.
 
diff --git a/packages/apollo-react/src/material/components/ap-model-picker/types.ts b/packages/apollo-react/src/material/components/ap-model-picker/types.ts
index 23e267fc6..aa4a11017 100644
--- a/packages/apollo-react/src/material/components/ap-model-picker/types.ts
+++ b/packages/apollo-react/src/material/components/ap-model-picker/types.ts
@@ -48,13 +48,12 @@ export interface ByomDetails {
   defaultModel?: string;
   customFieldMappings?: Record<string, string> | null;
   /**
-   * Id of the `ByoProductLlmConfiguration` this model belongs to — the
-   * `:id` route segment of the AI Trust Layer LLM-configurations edit
-   * page. Not served by Discovery yet (backend follow-up); when
-   * absent, the picker's edit affordance falls back to the
-   * configurations list page.
+   * Id of the BYO configuration this model belongs to — the `:id`
+   * route segment of the AI Trust Layer LLM-configurations edit page.
+   * When absent (older gateways), the picker's edit affordance falls
+   * back to the configurations list page.
    */
-  productLlmConfigurationId?: string;
+  byoConfigurationId?: string;
 }
 
 export interface ModelCostDetails {
diff --git a/packages/apollo-react/src/material/components/ap-model-picker/usePlatformAccess.ts b/packages/apollo-react/src/material/components/ap-model-picker/usePlatformAccess.ts
index ce8bcf7ba..d2db98bb8 100644
--- a/packages/apollo-react/src/material/components/ap-model-picker/usePlatformAccess.ts
+++ b/packages/apollo-react/src/material/components/ap-model-picker/usePlatformAccess.ts
@@ -269,7 +269,7 @@ export interface LlmConfigurationsLinkOptions {
   intent: 'add' | 'edit';
   /** Numeric Orchestrator folder id — route segment of the add/edit pages. */
   folderNumericId?: number;
-  /** `ByoProductLlmConfiguration` id — required to deep-link `edit`. */
+  /** BYO configuration id — required to deep-link `edit`. */
   configurationId?: string;
 }