diff --git a/scripts/init-cli-agent.ts b/scripts/init-cli-agent.ts
index 4a56827bc..7924f3ee6 100644
--- a/scripts/init-cli-agent.ts
+++ b/scripts/init-cli-agent.ts
@@ -1,5 +1,5 @@
 /**
- * Initialize the scratch CLI agent used during `/new-setup`.
+ * Initialize the scratch CLI agent used during `/setup`.
  *
  * Creates the synthetic `cli:local` user, grants owner role if no owner
  * exists yet, builds an agent group with a minimal CLAUDE.md, and wires it
diff --git a/setup/auth.ts b/setup/auth.ts
index 14e27b042..54a3f45bd 100644
--- a/setup/auth.ts
+++ b/setup/auth.ts
@@ -7,7 +7,7 @@
  *                             already exists unless --force is passed.
  *
  * The actual user-facing prompt (subscription vs API key, paste the token)
- * stays in the /new-setup SKILL.md. This step is just the machine side:
+ * stays in the /setup SKILL.md. This step is just the machine side:
  * it calls `onecli secrets list` / `onecli secrets create` and emits a
  * structured status block. The token value is never logged.
  */
@@ -124,7 +124,7 @@ export async function run(args: string[]): Promise<void> {
     emitStatus('AUTH', {
       STATUS: 'failed',
       ERROR: 'onecli_list_failed',
-      HINT: 'Is OneCLI running? Run `/new-setup` from the onecli step.',
+      HINT: 'Is OneCLI running? Run `/setup` from the onecli step.',
       LOG: 'logs/setup.log',
     });
     process.exit(1);
diff --git a/setup/cli-agent.ts b/setup/cli-agent.ts
index d9a90c576..91ffa81bc 100644
--- a/setup/cli-agent.ts
+++ b/setup/cli-agent.ts
@@ -1,8 +1,8 @@
 /**
- * Step: cli-agent — Create the scratch CLI agent for `/new-setup`.
+ * Step: cli-agent — Create the scratch CLI agent for `/setup`.
  *
  * Thin wrapper around `scripts/init-cli-agent.ts`. Emits a status block so
- * /new-setup SKILL.md can parse the result without having to read the
+ * /setup SKILL.md can parse the result without having to read the
  * script's plain stdout.
  *
  * Args:
diff --git a/setup/install-discord.sh b/setup/install-discord.sh
index 6f5a9c878..20fe11040 100755
--- a/setup/install-discord.sh
+++ b/setup/install-discord.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-discord — bundles the preflight + install commands
-# from the /add-discord skill into one idempotent script so /new-setup can
+# from the /add-discord skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Discord adapter in from the `channels` branch; appends the
diff --git a/setup/install-docker.sh b/setup/install-docker.sh
index 4aaadcecb..452ef68bc 100755
--- a/setup/install-docker.sh
+++ b/setup/install-docker.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-docker — bundles Docker install into one idempotent
-# script so /new-setup can run it without needing `curl | sh` in the allowlist
+# script so /setup can run it without needing `curl | sh` in the allowlist
 # (pipelines split at matching time, and `sh` receiving stdin can't be
 # pre-approved safely).
 #
diff --git a/setup/install-gchat.sh b/setup/install-gchat.sh
index b9166f1a1..403e02086 100755
--- a/setup/install-gchat.sh
+++ b/setup/install-gchat.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-gchat — bundles the preflight + install commands
-# from the /add-gchat skill into one idempotent script so /new-setup can
+# from the /add-gchat skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Google Chat adapter in from the `channels` branch; appends the
diff --git a/setup/install-github.sh b/setup/install-github.sh
index cb28bfc39..91231788b 100755
--- a/setup/install-github.sh
+++ b/setup/install-github.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-github — bundles the preflight + install commands
-# from the /add-github skill into one idempotent script so /new-setup can
+# from the /add-github skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the GitHub adapter in from the `channels` branch; appends the
diff --git a/setup/install-imessage.sh b/setup/install-imessage.sh
index 864e12796..ff8a0a2a4 100755
--- a/setup/install-imessage.sh
+++ b/setup/install-imessage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-imessage — bundles the preflight + install commands
-# from the /add-imessage skill into one idempotent script so /new-setup can
+# from the /add-imessage skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the iMessage adapter in from the `channels` branch; appends the
diff --git a/setup/install-linear.sh b/setup/install-linear.sh
index f8788be1f..d8317d7a5 100755
--- a/setup/install-linear.sh
+++ b/setup/install-linear.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-linear — bundles the preflight + install commands
-# from the /add-linear skill into one idempotent script so /new-setup can
+# from the /add-linear skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Linear adapter in from the `channels` branch; appends the
diff --git a/setup/install-matrix.sh b/setup/install-matrix.sh
index c9854731f..c80128397 100755
--- a/setup/install-matrix.sh
+++ b/setup/install-matrix.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-matrix — bundles the preflight + install commands
-# from the /add-matrix skill into one idempotent script so /new-setup can
+# from the /add-matrix skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Matrix adapter in from the `channels` branch; appends the
diff --git a/setup/install-node.sh b/setup/install-node.sh
index e100ccd55..0561792df 100755
--- a/setup/install-node.sh
+++ b/setup/install-node.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-node — bundles Node 22 install into one idempotent
-# script so /new-setup can run it without needing `curl | sudo -E bash -` in
+# script so /setup can run it without needing `curl | sudo -E bash -` in
 # the allowlist (that pattern is inherently unmatchable — bash reads from
 # stdin, so pre-approval can't inspect what's being executed).
 #
diff --git a/setup/install-resend.sh b/setup/install-resend.sh
index 9f18a9f96..85bd091bd 100755
--- a/setup/install-resend.sh
+++ b/setup/install-resend.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-resend — bundles the preflight + install commands
-# from the /add-resend skill into one idempotent script so /new-setup can
+# from the /add-resend skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Resend adapter in from the `channels` branch; appends the
diff --git a/setup/install-slack.sh b/setup/install-slack.sh
index 55d5e8573..dd1787318 100755
--- a/setup/install-slack.sh
+++ b/setup/install-slack.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-slack — bundles the preflight + install commands
-# from the /add-slack skill into one idempotent script so /new-setup can
+# from the /add-slack skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Slack adapter in from the `channels` branch; appends the
diff --git a/setup/install-teams.sh b/setup/install-teams.sh
index 4b8c21690..a7471462c 100755
--- a/setup/install-teams.sh
+++ b/setup/install-teams.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-teams — bundles the preflight + install commands
-# from the /add-teams skill into one idempotent script so /new-setup can
+# from the /add-teams skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Teams adapter in from the `channels` branch; appends the
diff --git a/setup/install-telegram.sh b/setup/install-telegram.sh
index 307dba226..351ce6eb4 100755
--- a/setup/install-telegram.sh
+++ b/setup/install-telegram.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-telegram — bundles the preflight + install commands
-# from the /add-telegram skill into one idempotent script so /new-setup can
+# from the /add-telegram skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials and pairing.
 #
 # Copies the Telegram adapter, helpers, tests, and the pair-telegram setup
diff --git a/setup/install-webex.sh b/setup/install-webex.sh
index adf52fc4d..15e0bad1a 100755
--- a/setup/install-webex.sh
+++ b/setup/install-webex.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-webex — bundles the preflight + install commands
-# from the /add-webex skill into one idempotent script so /new-setup can
+# from the /add-webex skill into one idempotent script so /setup can
 # run them programmatically before continuing to credentials.
 #
 # Copies the Webex adapter in from the `channels` branch; appends the
diff --git a/setup/install-whatsapp-cloud.sh b/setup/install-whatsapp-cloud.sh
index 70e8e0279..e67ea4f07 100755
--- a/setup/install-whatsapp-cloud.sh
+++ b/setup/install-whatsapp-cloud.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Setup helper: install-whatsapp-cloud — bundles the preflight + install
 # commands from the /add-whatsapp-cloud skill into one idempotent script so
-# /new-setup can run them programmatically before continuing to credentials.
+# /setup can run them programmatically before continuing to credentials.
 #
 # Copies the WhatsApp Cloud adapter in from the `channels` branch; appends the
 # self-registration import; installs the pinned @chat-adapter/whatsapp package;
diff --git a/setup/install-whatsapp.sh b/setup/install-whatsapp.sh
index 1c62d65d4..34a594583 100755
--- a/setup/install-whatsapp.sh
+++ b/setup/install-whatsapp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Setup helper: install-whatsapp — bundles the preflight + install commands
-# from the /add-whatsapp skill into one idempotent script so /new-setup can
+# from the /add-whatsapp skill into one idempotent script so /setup can
 # run them programmatically before continuing to QR/pairing-code auth.
 #
 # Copies the native Baileys WhatsApp adapter, its whatsapp-auth and groups
diff --git a/setup/probe.sh b/setup/probe.sh
index f4cbf3faa..5425c87e8 100755
--- a/setup/probe.sh
+++ b/setup/probe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Setup step: probe — single upfront parallel-ish scan that snapshots every
-# prerequisite and dependency for /new-setup's dynamic context injection.
+# prerequisite and dependency for /setup's dynamic context injection.
 # Rendered into the SKILL.md prompt via `!bash setup/probe.sh` so Claude sees
 # the current system state before generating its first response.
 #