diff --git a/packages/cli/src/zed-integration/zedIntegration.test.ts b/packages/cli/src/acp/acpClient.test.ts
similarity index 99%
rename from packages/cli/src/zed-integration/zedIntegration.test.ts
rename to packages/cli/src/acp/acpClient.test.ts
index e8e5355dc0..7bd4bb74c6 100644
--- a/packages/cli/src/zed-integration/zedIntegration.test.ts
+++ b/packages/cli/src/acp/acpClient.test.ts
@@ -14,7 +14,7 @@ import {
   type Mock,
   type Mocked,
 } from 'vitest';
-import { GeminiAgent, Session } from './zedIntegration.js';
+import { GeminiAgent, Session } from './acpClient.js';
 import * as acp from '@agentclientprotocol/sdk';
 import {
   AuthType,
diff --git a/packages/cli/src/zed-integration/zedIntegration.ts b/packages/cli/src/acp/acpClient.ts
similarity index 99%
rename from packages/cli/src/zed-integration/zedIntegration.ts
rename to packages/cli/src/acp/acpClient.ts
index 98c9efdc75..39e411e696 100644
--- a/packages/cli/src/zed-integration/zedIntegration.ts
+++ b/packages/cli/src/acp/acpClient.ts
@@ -61,7 +61,7 @@ import { loadCliConfig } from '../config/config.js';
 import { runExitCleanup } from '../utils/cleanup.js';
 import { SessionSelector } from '../utils/sessionUtils.js';
 
-export async function runZedIntegration(
+export async function runAcpClient(
   config: Config,
   settings: LoadedSettings,
   argv: CliArgs,
diff --git a/packages/cli/src/zed-integration/acpErrors.test.ts b/packages/cli/src/acp/acpErrors.test.ts
similarity index 100%
rename from packages/cli/src/zed-integration/acpErrors.test.ts
rename to packages/cli/src/acp/acpErrors.test.ts
diff --git a/packages/cli/src/zed-integration/acpErrors.ts b/packages/cli/src/acp/acpErrors.ts
similarity index 100%
rename from packages/cli/src/zed-integration/acpErrors.ts
rename to packages/cli/src/acp/acpErrors.ts
diff --git a/packages/cli/src/zed-integration/acpResume.test.ts b/packages/cli/src/acp/acpResume.test.ts
similarity index 99%
rename from packages/cli/src/zed-integration/acpResume.test.ts
rename to packages/cli/src/acp/acpResume.test.ts
index 54c04a0ff3..b7f84d9253 100644
--- a/packages/cli/src/zed-integration/acpResume.test.ts
+++ b/packages/cli/src/acp/acpResume.test.ts
@@ -13,7 +13,7 @@ import {
   type Mocked,
   type Mock,
 } from 'vitest';
-import { GeminiAgent } from './zedIntegration.js';
+import { GeminiAgent } from './acpClient.js';
 import * as acp from '@agentclientprotocol/sdk';
 import {
   ApprovalMode,
diff --git a/packages/cli/src/zed-integration/fileSystemService.test.ts b/packages/cli/src/acp/fileSystemService.test.ts
similarity index 100%
rename from packages/cli/src/zed-integration/fileSystemService.test.ts
rename to packages/cli/src/acp/fileSystemService.test.ts
diff --git a/packages/cli/src/zed-integration/fileSystemService.ts b/packages/cli/src/acp/fileSystemService.ts
similarity index 100%
rename from packages/cli/src/zed-integration/fileSystemService.ts
rename to packages/cli/src/acp/fileSystemService.ts
diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx
index 0987069955..6071488542 100644
--- a/packages/cli/src/gemini.tsx
+++ b/packages/cli/src/gemini.tsx
@@ -79,7 +79,7 @@ import {
   type InitializationResult,
 } from './core/initializer.js';
 import { validateAuthMethod } from './config/auth.js';
-import { runZedIntegration } from './zed-integration/zedIntegration.js';
+import { runAcpClient } from './acp/acpClient.js';
 import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
 import { checkForUpdates } from './ui/utils/updateCheck.js';
 import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
@@ -673,7 +673,7 @@ export async function main() {
     }
 
     if (config.getAcpMode()) {
-      return runZedIntegration(config, settings, argv);
+      return runAcpClient(config, settings, argv);
     }
 
     let input = config.getQuestion();
diff --git a/packages/cli/src/gemini_cleanup.test.tsx b/packages/cli/src/gemini_cleanup.test.tsx
index fb37bb94ec..5c229d1782 100644
--- a/packages/cli/src/gemini_cleanup.test.tsx
+++ b/packages/cli/src/gemini_cleanup.test.tsx
@@ -141,8 +141,8 @@ vi.mock('./utils/cleanup.js', async (importOriginal) => {
   };
 });
 
-vi.mock('./zed-integration/zedIntegration.js', () => ({
-  runZedIntegration: vi.fn().mockResolvedValue(undefined),
+vi.mock('./acp/acpClient.js', () => ({
+  runAcpClient: vi.fn().mockResolvedValue(undefined),
 }));
 
 vi.mock('./utils/readStdin.js', () => ({
diff --git a/packages/core/src/code_assist/oauth2.ts b/packages/core/src/code_assist/oauth2.ts
index 82aebf4188..d31b72617c 100644
--- a/packages/core/src/code_assist/oauth2.ts
+++ b/packages/core/src/code_assist/oauth2.ts
@@ -271,7 +271,7 @@ async function initOauthClient(
 
     await triggerPostAuthCallbacks(client.credentials);
   } else {
-    // In Zed integration, we skip the interactive consent and directly open the browser
+    // In ACP mode, we skip the interactive consent and directly open the browser
     if (!config.getAcpMode()) {
       const userConsent = await getConsentForOauth('');
       if (!userConsent) {