diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index 084b5b743..2eb396944 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -434,7 +434,7 @@ Inside that summary, the operational and supporting context rows stay inline
 instead of sitting in a collapsed `Details` disclosure or nested bordered
 cards, so the first read stays like one linear sheet rather than a stack of
 cards inside the summary.
-Discovery support now also lives inside an overview-only `Discovery`
+Discovery support now also lives inside an overview-only `Analysis`
 instead of a peer drawer tab, so supplemental discovery detail stays available
 without claiming the same navigation weight as runtime, identity, or
 service-specific operational views.
@@ -443,8 +443,8 @@ an on-demand metadata panel, so the actionable web-interface path stays primary
 while deeper discovery inspection remains available without reading like a
 second peer overview surface.
 For ordinary host discovery, that support row now stays even quieter: the
-surface is titled `Discovery`, and the collapsed state does not repeat a
-baseline `Host discovery via <hostname>` summary when the discovery target is
+surface is titled `Analysis`, and the collapsed state does not repeat a
+baseline `Host analysis via <hostname>` summary when the discovery target is
 just the same host identity already shown elsewhere in the drawer.
 The discovery metadata panel now expands directly under the outer support
 disclosure instead of nesting a second bordered card, so the support surface
diff --git a/frontend-modern/src/components/Infrastructure/ResourceDetailDrawerOverviewTab.tsx b/frontend-modern/src/components/Infrastructure/ResourceDetailDrawerOverviewTab.tsx
index 1d391a4d7..512359a90 100644
--- a/frontend-modern/src/components/Infrastructure/ResourceDetailDrawerOverviewTab.tsx
+++ b/frontend-modern/src/components/Infrastructure/ResourceDetailDrawerOverviewTab.tsx
@@ -1064,12 +1064,12 @@ export const ResourceDetailDrawerOverviewTab: Component<ResourceDetailDrawerOver
             />
 
             <SupportDisclosure
-              title="Discovery"
+              title="Analysis"
               summary={drawer.discoveryContextSummary()}
               expanded={drawer.showDiscoveryContext()}
               onToggle={() => drawer.setShowDiscoveryContext((value) => !value)}
-              showLabel="Open discovery"
-              hideLabel="Hide discovery"
+              showLabel="Open analysis"
+              hideLabel="Hide analysis"
               class="h-full"
               dataTestId="resource-discovery-context"
             >
diff --git a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
index d56464d90..91b84eee1 100644
--- a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
+++ b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.history.test.tsx
@@ -339,11 +339,11 @@ describe('ResourceDetailDrawer change history section', () => {
     expect(screen.queryByText('Container Updates')).toBeNull();
     expect(screen.queryByText('Check Updates')).toBeNull();
     expect(screen.queryByText('Show update controls')).toBeNull();
-    expect(screen.getByText('Discovery')).toBeInTheDocument();
+    expect(screen.getByText('Analysis')).toBeInTheDocument();
     expect(
       screen.queryByText('Supporting metadata only. The web interface path above stays primary.'),
     ).toBeNull();
-    expect(screen.getByRole('button', { name: 'Open discovery' })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Open analysis' })).toBeInTheDocument();
     expect(
       screen
         .getByTestId('resource-discovery-context')
diff --git a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.identity-runtime.test.tsx b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.identity-runtime.test.tsx
index 6f44f6b29..6abea146e 100644
--- a/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.identity-runtime.test.tsx
+++ b/frontend-modern/src/components/Infrastructure/__tests__/ResourceDetailDrawer.identity-runtime.test.tsx
@@ -142,9 +142,9 @@ describe('ResourceDetailDrawer runtime and identity cards', () => {
       () => <ResourceDetailDrawer resource={baseResource({})} />,
     );
 
-    expect(queryByRole('button', { name: 'Discovery' })).toBeNull();
-    expect(getByText('Discovery')).toBeInTheDocument();
-    expect(queryByText('Host discovery via host-1')).toBeNull();
+    expect(queryByRole('button', { name: 'Analysis' })).toBeNull();
+    expect(getByText('Analysis')).toBeInTheDocument();
+    expect(queryByText('Host analysis via host-1')).toBeNull();
     expect(
       queryByText('Supporting metadata only. The web interface path above stays primary.'),
     ).toBeNull();
@@ -155,9 +155,9 @@ describe('ResourceDetailDrawer runtime and identity cards', () => {
       ),
     ).toBeNull();
 
-    expect(getByRole('button', { name: 'Open discovery' })).toBeInTheDocument();
+    expect(getByRole('button', { name: 'Open analysis' })).toBeInTheDocument();
 
-    fireEvent.click(getByRole('button', { name: 'Open discovery' }));
+    fireEvent.click(getByRole('button', { name: 'Open analysis' }));
 
     await waitFor(() => {
       expect(queryByTestId('discovery-tab')).toBeInTheDocument();
diff --git a/frontend-modern/src/components/Infrastructure/useResourceDetailDrawerDerivedState.ts b/frontend-modern/src/components/Infrastructure/useResourceDetailDrawerDerivedState.ts
index 647cafd1c..32bcf637e 100644
--- a/frontend-modern/src/components/Infrastructure/useResourceDetailDrawerDerivedState.ts
+++ b/frontend-modern/src/components/Infrastructure/useResourceDetailDrawerDerivedState.ts
@@ -240,8 +240,8 @@ export const useResourceDetailDrawerDerivedState = (
 
     const discoveryMode =
       config.resourceType === 'agent'
-        ? 'Host discovery'
-        : `${formatIdentifierLabel(config.resourceType)} discovery`;
+        ? 'Host analysis'
+        : `${formatIdentifierLabel(config.resourceType)} analysis`;
 
     return config.hostname ? `${discoveryMode} via ${config.hostname}` : discoveryMode;
   });