diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cd33b65..de090cd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -72,7 +72,7 @@ jobs:
       - name: PrePluginPack
         # The pluginpack-action runs `npx pluginpack diff/build` directly (not
         # `npm run build`), so the repo's prebuild esbuild step never fires.
-        # sources/glean-vnext/dist/index.js is gitignored, so build it here or
+        # sources/local-mcp/dist/index.js is gitignored, so build it here or
         # pluginpack's additionalFiles source read fails for every target.
         run: npm run build:bundle
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b716b81..af8e64a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: Test
 
 # Guard the source on every PR (and pushes to main): the transplanted
-# glean-vnext server suite + typecheck, and a full build/validate of all
+# local-mcp server suite + typecheck, and a full build/validate of all
 # targets. publish.yml only runs on release, so without this nothing catches
 # regressions before merge.
 on:
diff --git a/.gitignore b/.gitignore
index 4a892f8..91b36b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@ node_modules/
 
 # Generated build output (published to the target repos by CI)
 dist/
-# glean-vnext runtime MCP server bundle (regenerated by build:bundle / prebuild)
-sources/glean-vnext/dist/
+# local-mcp runtime MCP server bundle (regenerated by build:bundle / prebuild)
+sources/local-mcp/dist/
 
-# Claude Code runtime cache (glean-vnext skills cache written during local runs)
+# Claude Code runtime cache (local-mcp skills cache written during local runs)
 .claude/tmp/
 
 # OS files
diff --git a/package.json b/package.json
index 726271c..c993925 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,12 @@
   "type": "module",
   "scripts": {
     "build": "pluginpack build",
-    "build:bundle": "node sources/glean-vnext/build.mjs",
+    "build:bundle": "node sources/local-mcp/build.mjs",
     "clean": "pluginpack clean",
     "check:no-shell": "node scripts/check-no-shell-scripts.mjs",
     "prune": "pluginpack prune",
-    "typecheck:bundle": "tsc --noEmit -p sources/glean-vnext/tsconfig.json",
-    "test:bundle": "vitest run --root sources/glean-vnext",
+    "typecheck:bundle": "tsc --noEmit -p sources/local-mcp/tsconfig.json",
+    "test:bundle": "vitest run --root sources/local-mcp",
     "validate": "pluginpack validate --target claude --dir dist/claude && pluginpack validate --target cursor --dir dist/cursor && pluginpack validate --target codex --dir dist/codex",
     "test": "npm run build && npm run validate",
     "prebuild": "node scripts/sync-changelog.mjs && npm run build:bundle",
diff --git a/pluginpack.config.ts b/pluginpack.config.ts
index 61ebd89..5a0bdf9 100644
--- a/pluginpack.config.ts
+++ b/pluginpack.config.ts
@@ -34,7 +34,7 @@ export default defineConfig({
       },
       plugins: {
         glean: {
-          from: ["glean-lib", "shared", "claude", "glean-vnext"],
+          from: ["glean-lib", "shared", "claude", "local-mcp"],
           components: ["skills", "agents", "hooks"],
           displayName: "Glean",
           description:
@@ -95,7 +95,7 @@ export default defineConfig({
       },
       plugins: {
         glean: {
-          from: ["glean-lib", "codex", "codex-assets", "glean-vnext"],
+          from: ["glean-lib", "codex", "codex-assets", "local-mcp"],
           components: ["skills", "assets"],
           description:
             "Official Glean plugin — search documents, Slack, and email; explore code across repos; find experts and stakeholders; prep for meetings and onboarding.",
diff --git a/scripts/check-no-shell-scripts.mjs b/scripts/check-no-shell-scripts.mjs
index eb6b494..04ef0e9 100644
--- a/scripts/check-no-shell-scripts.mjs
+++ b/scripts/check-no-shell-scripts.mjs
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-// CI guard: fail if any shell/bash script is added under the glean-vnext
+// CI guard: fail if any shell/bash script is added under the local-mcp
 // source tree.
 //
-// Why: the glean-vnext plugin ships and runs on end-user machines, including
+// Why: the local-mcp plugin ships and runs on end-user machines, including
 // Windows, where POSIX shell (.sh / bash) is not available. We already
 // migrated the launcher from start.sh to start.mjs for exactly this reason.
 // Every executable helper the plugin relies on must be cross-platform, so the
@@ -15,9 +15,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-// Scope: the glean-vnext plugin source. Broaden this list if the rule should
+// Scope: the local-mcp plugin source. Broaden this list if the rule should
 // cover other source trees too.
-const SCAN_ROOTS = ["sources/glean-vnext"];
+const SCAN_ROOTS = ["sources/local-mcp"];
 // Never descend into generated/vendored trees.
 const SKIP_DIRS = new Set(["node_modules", "dist", ".git"]);
 
@@ -69,11 +69,11 @@ if (offenders.length > 0) {
     .sort()
     .join("\n");
   console.error(
-    `\n\u274c Shell/bash scripts are not allowed in the glean-vnext plugin source.\n\n` +
+    `\n\u274c Shell/bash scripts are not allowed in the local-mcp plugin source.\n\n` +
       `Found ${offenders.length} shell script(s):\n${rel}\n\n` +
       `The plugin runs on end-user machines including Windows, where POSIX shell\n` +
       `is unavailable. Use a cross-platform Node.js script instead:\n\n` +
-      `  - Write it as a .mjs file (see sources/glean-vnext/start.mjs).\n` +
+      `  - Write it as a .mjs file (see sources/local-mcp/start.mjs).\n` +
       `  - Use Node built-ins (node:fs, node:path, node:child_process) instead of\n` +
       `    shell utilities, and avoid shell-only syntax.\n` +
       `  - Invoke it with "node <script>.mjs" so it works on Windows/macOS/Linux.\n`,
diff --git a/sources/glean-vnext/.mcp.json b/sources/local-mcp/.mcp.json
similarity index 90%
rename from sources/glean-vnext/.mcp.json
rename to sources/local-mcp/.mcp.json
index 6d4a8c6..ecf86d8 100644
--- a/sources/glean-vnext/.mcp.json
+++ b/sources/local-mcp/.mcp.json
@@ -1,6 +1,6 @@
 {
   "mcpServers": {
-    "glean-local": {
+    "glean_plugin": {
       "command": "node",
       "args": ["${CLAUDE_PLUGIN_ROOT}/start.mjs"],
       "env": {
diff --git a/sources/glean-vnext/build.mjs b/sources/local-mcp/build.mjs
similarity index 95%
rename from sources/glean-vnext/build.mjs
rename to sources/local-mcp/build.mjs
index bc0e8b9..5626423 100644
--- a/sources/glean-vnext/build.mjs
+++ b/sources/local-mcp/build.mjs
@@ -25,8 +25,8 @@ const nodeBuiltins = [
 ];
 
 await build({
-  entryPoints: ["sources/glean-vnext/src/index.ts"],
-  outfile: "sources/glean-vnext/dist/index.js",
+  entryPoints: ["sources/local-mcp/src/index.ts"],
+  outfile: "sources/local-mcp/dist/index.js",
   bundle: true,
   platform: "node",
   format: "esm",
diff --git a/sources/glean-vnext/hooks/auto-approve-run-tool.mjs b/sources/local-mcp/hooks/auto-approve-run-tool.mjs
similarity index 85%
rename from sources/glean-vnext/hooks/auto-approve-run-tool.mjs
rename to sources/local-mcp/hooks/auto-approve-run-tool.mjs
index fab53d5..366fd69 100644
--- a/sources/glean-vnext/hooks/auto-approve-run-tool.mjs
+++ b/sources/local-mcp/hooks/auto-approve-run-tool.mjs
@@ -33,7 +33,7 @@ try {
 const toolName = String(input.tool_name ?? "");
 const bareName = toolName.split("__").pop() ?? "";
 // Scope strictly to this plugin's run_tool — the tool name carries the glean
-// plugin/server prefix (e.g. mcp__plugin_glean-vnext_glean__run_tool).
+// plugin/server prefix (e.g. mcp__plugin_local-mcp_glean_plugin__run_tool).
 if (!toolName.includes("glean") || bareName !== "run_tool") {
   process.exit(0);
 }
@@ -44,11 +44,16 @@ let env = {};
 try {
   const root = process.env.CLAUDE_PLUGIN_ROOT ?? ".";
   const cfg = JSON.parse(fs.readFileSync(path.join(root, ".mcp.json"), "utf-8"));
-  // The server is named "glean-local" in the shipped .mcp.json (to avoid
-  // clashing with a user-connected remote "glean" server). Keep a fallback to
-  // the legacy "glean" key for backwards compatibility with older installs.
+  // The server is named "glean_plugin" in the shipped .mcp.json (namespaced
+  // under "glean" so it's recognizable alongside a user-connected remote
+  // Glean server, e.g. "glean_default"). Keep fallbacks to the prior names
+  // ("glean-local", then the original "glean") for backwards compatibility
+  // with older installs.
   env =
-    cfg?.mcpServers?.["glean-local"]?.env ?? cfg?.mcpServers?.glean?.env ?? {};
+    cfg?.mcpServers?.["glean_plugin"]?.env ??
+    cfg?.mcpServers?.["glean-local"]?.env ??
+    cfg?.mcpServers?.glean?.env ??
+    {};
 } catch {
   // No readable config: do nothing.
 }
diff --git a/sources/glean-vnext/hooks/hooks.json b/sources/local-mcp/hooks/hooks.json
similarity index 100%
rename from sources/glean-vnext/hooks/hooks.json
rename to sources/local-mcp/hooks/hooks.json
diff --git a/sources/glean-vnext/package.json b/sources/local-mcp/package.json
similarity index 100%
rename from sources/glean-vnext/package.json
rename to sources/local-mcp/package.json
diff --git a/sources/glean-vnext/plugin.pluginpack.json b/sources/local-mcp/plugin.pluginpack.json
similarity index 87%
rename from sources/glean-vnext/plugin.pluginpack.json
rename to sources/local-mcp/plugin.pluginpack.json
index cec0cf7..5b05ae4 100644
--- a/sources/glean-vnext/plugin.pluginpack.json
+++ b/sources/local-mcp/plugin.pluginpack.json
@@ -1,5 +1,5 @@
 {
-  "description": "Glean runtime MCP server — a local stdio server (find_skills_and_tools, run_tool, setup), the glean_run skill, and an auto-approve hook. Folded into the glean emitted plugin so it coexists with the portable skills; a user may still connect a remote Glean MCP server separately. The local server is named glean-local to avoid clashing with a remote glean server.",
+  "description": "Glean runtime MCP server — a local stdio server (find_skills_and_tools, run_tool, setup), the glean_run skill, and an auto-approve hook. Folded into the glean emitted plugin so it coexists with the portable skills; a user may still connect a remote Glean MCP server separately. The local server is named glean_plugin to avoid clashing with a remote glean server.",
   "additionalFiles": {
     "dist/index.js": "dist/index.js",
     "start.mjs": "start.mjs",
diff --git a/sources/glean-vnext/skills/glean_run/SKILL.md b/sources/local-mcp/skills/glean_run/SKILL.md
similarity index 100%
rename from sources/glean-vnext/skills/glean_run/SKILL.md
rename to sources/local-mcp/skills/glean_run/SKILL.md
diff --git a/sources/glean-vnext/src/auth-callback-server.ts b/sources/local-mcp/src/auth-callback-server.ts
similarity index 100%
rename from sources/glean-vnext/src/auth-callback-server.ts
rename to sources/local-mcp/src/auth-callback-server.ts
diff --git a/sources/glean-vnext/src/auth-provider.ts b/sources/local-mcp/src/auth-provider.ts
similarity index 100%
rename from sources/glean-vnext/src/auth-provider.ts
rename to sources/local-mcp/src/auth-provider.ts
diff --git a/sources/glean-vnext/src/config-search.ts b/sources/local-mcp/src/config-search.ts
similarity index 100%
rename from sources/glean-vnext/src/config-search.ts
rename to sources/local-mcp/src/config-search.ts
diff --git a/sources/glean-vnext/src/index.ts b/sources/local-mcp/src/index.ts
similarity index 100%
rename from sources/glean-vnext/src/index.ts
rename to sources/local-mcp/src/index.ts
diff --git a/sources/glean-vnext/src/remote-client.ts b/sources/local-mcp/src/remote-client.ts
similarity index 100%
rename from sources/glean-vnext/src/remote-client.ts
rename to sources/local-mcp/src/remote-client.ts
diff --git a/sources/glean-vnext/src/remote-tools-cache-store.ts b/sources/local-mcp/src/remote-tools-cache-store.ts
similarity index 100%
rename from sources/glean-vnext/src/remote-tools-cache-store.ts
rename to sources/local-mcp/src/remote-tools-cache-store.ts
diff --git a/sources/glean-vnext/src/session-id.ts b/sources/local-mcp/src/session-id.ts
similarity index 100%
rename from sources/glean-vnext/src/session-id.ts
rename to sources/local-mcp/src/session-id.ts
diff --git a/sources/glean-vnext/src/skill-writer.ts b/sources/local-mcp/src/skill-writer.ts
similarity index 100%
rename from sources/glean-vnext/src/skill-writer.ts
rename to sources/local-mcp/src/skill-writer.ts
diff --git a/sources/glean-vnext/src/token-store.ts b/sources/local-mcp/src/token-store.ts
similarity index 100%
rename from sources/glean-vnext/src/token-store.ts
rename to sources/local-mcp/src/token-store.ts
diff --git a/sources/glean-vnext/src/tools/approval-args.ts b/sources/local-mcp/src/tools/approval-args.ts
similarity index 100%
rename from sources/glean-vnext/src/tools/approval-args.ts
rename to sources/local-mcp/src/tools/approval-args.ts
diff --git a/sources/glean-vnext/src/tools/find-skills.ts b/sources/local-mcp/src/tools/find-skills.ts
similarity index 100%
rename from sources/glean-vnext/src/tools/find-skills.ts
rename to sources/local-mcp/src/tools/find-skills.ts
diff --git a/sources/glean-vnext/src/tools/remote-passthrough.ts b/sources/local-mcp/src/tools/remote-passthrough.ts
similarity index 100%
rename from sources/glean-vnext/src/tools/remote-passthrough.ts
rename to sources/local-mcp/src/tools/remote-passthrough.ts
diff --git a/sources/glean-vnext/src/tools/run-tool.ts b/sources/local-mcp/src/tools/run-tool.ts
similarity index 100%
rename from sources/glean-vnext/src/tools/run-tool.ts
rename to sources/local-mcp/src/tools/run-tool.ts
diff --git a/sources/glean-vnext/src/types.ts b/sources/local-mcp/src/types.ts
similarity index 100%
rename from sources/glean-vnext/src/types.ts
rename to sources/local-mcp/src/types.ts
diff --git a/sources/glean-vnext/src/url-config-store.ts b/sources/local-mcp/src/url-config-store.ts
similarity index 100%
rename from sources/glean-vnext/src/url-config-store.ts
rename to sources/local-mcp/src/url-config-store.ts
diff --git a/sources/glean-vnext/start.mjs b/sources/local-mcp/start.mjs
similarity index 100%
rename from sources/glean-vnext/start.mjs
rename to sources/local-mcp/start.mjs
diff --git a/sources/glean-vnext/targets/codex/.mcp.json b/sources/local-mcp/targets/codex/.mcp.json
similarity index 89%
rename from sources/glean-vnext/targets/codex/.mcp.json
rename to sources/local-mcp/targets/codex/.mcp.json
index 2785e10..d7bd1d2 100644
--- a/sources/glean-vnext/targets/codex/.mcp.json
+++ b/sources/local-mcp/targets/codex/.mcp.json
@@ -1,6 +1,6 @@
 {
   "mcpServers": {
-    "glean-local": {
+    "glean_plugin": {
       "command": "node",
       "args": ["./start.mjs"],
       "cwd": ".",
diff --git a/sources/glean-vnext/tests/auth-callback-server.test.ts b/sources/local-mcp/tests/auth-callback-server.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/auth-callback-server.test.ts
rename to sources/local-mcp/tests/auth-callback-server.test.ts
diff --git a/sources/glean-vnext/tests/auth-provider.test.ts b/sources/local-mcp/tests/auth-provider.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/auth-provider.test.ts
rename to sources/local-mcp/tests/auth-provider.test.ts
diff --git a/sources/glean-vnext/tests/auto-approve-hook.test.ts b/sources/local-mcp/tests/auto-approve-hook.test.ts
similarity index 97%
rename from sources/glean-vnext/tests/auto-approve-hook.test.ts
rename to sources/local-mcp/tests/auto-approve-hook.test.ts
index c117535..892b6e6 100644
--- a/sources/glean-vnext/tests/auto-approve-hook.test.ts
+++ b/sources/local-mcp/tests/auto-approve-hook.test.ts
@@ -28,7 +28,7 @@ async function runHook(
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "approve-hook-"));
   await fs.writeFile(
     path.join(root, ".mcp.json"),
-    JSON.stringify({ mcpServers: { "glean-local": { env } } }),
+    JSON.stringify({ mcpServers: { "glean_plugin": { env } } }),
   );
   // Isolate the marker under a throwaway CLAUDE_PLUGIN_DATA so the hook never
   // touches the developer's real ~/.glean during tests.
@@ -79,7 +79,7 @@ async function runHook(
   }
 }
 
-const glean = (tool: string) => `mcp__plugin_glean-vnext_glean__${tool}`;
+const glean = (tool: string) => `mcp__plugin_local-mcp_glean_plugin__${tool}`;
 const hitlOn = { ENABLE_HITL: "true" };
 const hitlOff = { ENABLE_HITL: "false" };
 const bypass = { permission_mode: "bypassPermissions", session_id: "sess-1" };
diff --git a/sources/glean-vnext/tests/config-search.test.ts b/sources/local-mcp/tests/config-search.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/config-search.test.ts
rename to sources/local-mcp/tests/config-search.test.ts
diff --git a/sources/glean-vnext/tests/find-skills.test.ts b/sources/local-mcp/tests/find-skills.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/find-skills.test.ts
rename to sources/local-mcp/tests/find-skills.test.ts
diff --git a/sources/glean-vnext/tests/open-browser.test.ts b/sources/local-mcp/tests/open-browser.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/open-browser.test.ts
rename to sources/local-mcp/tests/open-browser.test.ts
diff --git a/sources/glean-vnext/tests/remote-client.test.ts b/sources/local-mcp/tests/remote-client.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/remote-client.test.ts
rename to sources/local-mcp/tests/remote-client.test.ts
diff --git a/sources/glean-vnext/tests/remote-passthrough.test.ts b/sources/local-mcp/tests/remote-passthrough.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/remote-passthrough.test.ts
rename to sources/local-mcp/tests/remote-passthrough.test.ts
diff --git a/sources/glean-vnext/tests/remote-tools-cache-store.test.ts b/sources/local-mcp/tests/remote-tools-cache-store.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/remote-tools-cache-store.test.ts
rename to sources/local-mcp/tests/remote-tools-cache-store.test.ts
diff --git a/sources/glean-vnext/tests/run-tool.test.ts b/sources/local-mcp/tests/run-tool.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/run-tool.test.ts
rename to sources/local-mcp/tests/run-tool.test.ts
diff --git a/sources/glean-vnext/tests/session-id.test.ts b/sources/local-mcp/tests/session-id.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/session-id.test.ts
rename to sources/local-mcp/tests/session-id.test.ts
diff --git a/sources/glean-vnext/tests/skill-writer.test.ts b/sources/local-mcp/tests/skill-writer.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/skill-writer.test.ts
rename to sources/local-mcp/tests/skill-writer.test.ts
diff --git a/sources/glean-vnext/tests/token-store.test.ts b/sources/local-mcp/tests/token-store.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/token-store.test.ts
rename to sources/local-mcp/tests/token-store.test.ts
diff --git a/sources/glean-vnext/tests/url-config-store.test.ts b/sources/local-mcp/tests/url-config-store.test.ts
similarity index 100%
rename from sources/glean-vnext/tests/url-config-store.test.ts
rename to sources/local-mcp/tests/url-config-store.test.ts
diff --git a/sources/glean-vnext/tsconfig.json b/sources/local-mcp/tsconfig.json
similarity index 100%
rename from sources/glean-vnext/tsconfig.json
rename to sources/local-mcp/tsconfig.json