diff --git a/docs/health.md b/docs/health.md
index d583faab6..55890f5f0 100644
--- a/docs/health.md
+++ b/docs/health.md
@@ -6,7 +6,7 @@ Short guide to verify the WhatsApp Web / Baileys stack without guessing.
 - `pnpm clawdis status --json` — confirms creds exist (`web.linked`), shows auth age (`authAgeMs`), heartbeat interval, and where the session store lives.
 - Send `/status` in WhatsApp/WebChat to see agent readiness, session context usage, current thinking/verbose options, and when the web creds were last refreshed (relink if it looks stale) without invoking the agent.
 - `pnpm clawdis heartbeat --verbose --dry-run` — runs the heartbeat path end-to-end (session resolution, message creation) without sending anything. Drop `--dry-run` or add `--message "Ping"` to actually send.
-- `pnpm clawdis relay --verbose --heartbeat-now` — spins the full monitor loop, fires a heartbeat immediately, and will reconnect per `web.reconnect` settings. Good for soak testing.
+- `pnpm clawdis gateway --verbose --heartbeat-now` — spins the full monitor loop, fires a heartbeat immediately, and will reconnect per `web.reconnect` settings. Good for soak testing.
 - Logs: tail `/tmp/clawdis/clawdis.log` and filter for `web-heartbeat`, `web-reconnect`, `web-auto-reply`, `web-inbound`.
 
 ## Deep diagnostics
diff --git a/docs/refactor/web-relay-troubleshooting.md b/docs/refactor/web-relay-troubleshooting.md
index 66a328a72..3e29da8fa 100644
--- a/docs/refactor/web-relay-troubleshooting.md
+++ b/docs/refactor/web-relay-troubleshooting.md
@@ -8,8 +8,8 @@
 - **Fast nuke:** From an allowed WhatsApp sender you can send `/restart` to kick `com.steipete.clawdis` via launchd; wait a few seconds for it to relink.
 
 ## Helpful commands
-- Start relay web-only: `pnpm clawdis relay --provider web --verbose`
-- Show who is linked: `pnpm clawdis relay --provider web --verbose` (first line prints the linked E.164)
+- Start relay web-only: `pnpm clawdis gateway --provider web --verbose`
+- Show who is linked: `pnpm clawdis gateway --provider web --verbose` (first line prints the linked E.164)
 - Logout (clear creds): `pnpm clawdis logout`
 - Relink: `pnpm clawdis login --provider web`
 - Tail logs (default): `tail -f /tmp/clawdis/clawdis.log`
diff --git a/src/infra/tailscale.ts b/src/infra/tailscale.ts
index ebe19fc4e..220e9c329 100644
--- a/src/infra/tailscale.ts
+++ b/src/infra/tailscale.ts
@@ -150,7 +150,7 @@ export async function ensureFunnel(
     );
     runtime.error(
       info(
-        "Tip: Funnel is optional for CLAWDIS. You can keep running the web relay without it: `pnpm clawdis relay`",
+        "Tip: Funnel is optional for CLAWDIS. You can keep running the web relay without it: `pnpm clawdis gateway`",
       ),
     );
     if (isVerbose()) {