7 files changed, 13 insertions, 12 deletions
diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts
index da4234e0..51178513 100644
--- a/packages/cli/src/config/auth.ts
+++ b/packages/cli/src/config/auth.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '@gemini-cli/core';
+import { AuthType } from '@google/gemini-cli-core';
 import { loadEnvironment } from './config.js';
 
 export const validateAuthMethod = (authMethod: string): string | null => {
diff --git a/packages/cli/src/config/config.integration.test.ts b/packages/cli/src/config/config.integration.test.ts
index 6d8a6c7d..5d83986e 100644
--- a/packages/cli/src/config/config.integration.test.ts
+++ b/packages/cli/src/config/config.integration.test.ts
@@ -12,7 +12,7 @@ import {
   Config,
   ConfigParameters,
   ContentGeneratorConfig,
-} from '@gemini-cli/core';
+} from '@google/gemini-cli-core';
 
 const TEST_CONTENT_GENERATOR_CONFIG: ContentGeneratorConfig = {
   apiKey: 'test-key',
@@ -21,8 +21,8 @@ const TEST_CONTENT_GENERATOR_CONFIG: ContentGeneratorConfig = {
 };
 
 // Mock file discovery service and tool registry
-vi.mock('@gemini-cli/core', async () => {
-  const actual = await vi.importActual('@gemini-cli/core');
+vi.mock('@google/gemini-cli-core', async () => {
+  const actual = await vi.importActual('@google/gemini-cli-core');
   return {
     ...actual,
     FileDiscoveryService: vi.fn().mockImplementation(() => ({
diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts
index cc1310dd..9808c407 100644
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -9,7 +9,7 @@ import * as os from 'os';
 import { loadCliConfig } from './config.js';
 import { Settings } from './settings.js';
 import { Extension } from './extension.js';
-import * as ServerConfig from '@gemini-cli/core';
+import * as ServerConfig from '@google/gemini-cli-core';
 
 vi.mock('os', async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
@@ -29,9 +29,10 @@ vi.mock('read-package-up', () => ({
   ),
 }));
 
-vi.mock('@gemini-cli/core', async () => {
-  const actualServer =
-    await vi.importActual<typeof ServerConfig>('@gemini-cli/core');
+vi.mock('@google/gemini-cli-core', async () => {
+  const actualServer = await vi.importActual<typeof ServerConfig>(
+    '@google/gemini-cli-core',
+  );
   return {
     ...actualServer,
     loadEnvironment: vi.fn(),
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 7f957245..c053f4b6 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -18,7 +18,7 @@ import {
   DEFAULT_GEMINI_EMBEDDING_MODEL,
   FileDiscoveryService,
   TelemetryTarget,
-} from '@gemini-cli/core';
+} from '@google/gemini-cli-core';
 import { Settings } from './settings.js';
 
 import { Extension } from './extension.js';
diff --git a/packages/cli/src/config/extension.ts b/packages/cli/src/config/extension.ts
index 418e5fb9..31a6111f 100644
--- a/packages/cli/src/config/extension.ts
+++ b/packages/cli/src/config/extension.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MCPServerConfig } from '@gemini-cli/core';
+import { MCPServerConfig } from '@google/gemini-cli-core';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
diff --git a/packages/cli/src/config/sandboxConfig.ts b/packages/cli/src/config/sandboxConfig.ts
index 9997046f..d31bfc7f 100644
--- a/packages/cli/src/config/sandboxConfig.ts
+++ b/packages/cli/src/config/sandboxConfig.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SandboxConfig } from '@gemini-cli/core';
+import { SandboxConfig } from '@google/gemini-cli-core';
 import commandExists from 'command-exists';
 import * as os from 'node:os';
 import { getPackageJson } from '../utils/package.js';
diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts
index 36b16446..de1e5569 100644
--- a/packages/cli/src/config/settings.ts
+++ b/packages/cli/src/config/settings.ts
@@ -13,7 +13,7 @@ import {
   BugCommandSettings,
   TelemetrySettings,
   AuthType,
-} from '@gemini-cli/core';
+} from '@google/gemini-cli-core';
 import stripJsonComments from 'strip-json-comments';
 import { DefaultLight } from '../ui/themes/default-light.js';
 import { DefaultDark } from '../ui/themes/default.js';