diff --git a/README.md b/README.md
index aac18f7..4dd5590 100644
--- a/README.md
+++ b/README.md
@@ -193,17 +193,6 @@ npx sandbox-agent --help
 bunx sandbox-agent --help
 ```
 
-Quick OpenCode attach (runs `sandbox-agent opencode` by default):
-
-```bash
-npx gigacode --token "$SANDBOX_TOKEN"
-```
-
-```bash
-npm install -g gigacode
-gigacode --token "$SANDBOX_TOKEN"
-```
-
 [CLI documentation](https://sandboxagent.dev/docs/cli)
 
 ### Inspector
diff --git a/frontend/packages/website/src/components/GetStarted.tsx b/frontend/packages/website/src/components/GetStarted.tsx
index f89a798..ee816d4 100644
--- a/frontend/packages/website/src/components/GetStarted.tsx
+++ b/frontend/packages/website/src/components/GetStarted.tsx
@@ -104,7 +104,7 @@ export function GetStarted() {
             Choose the installation method that works best for your use case.
           </p>
           <p className="mt-4 text-sm text-zinc-500">
-            Quick OpenCode attach: <span className="font-mono text-white">npx gigacode</span>
+            Quick OpenCode attach: <span className="font-mono text-white">npx @sandbox-agent/gigacode</span>
           </p>
         </div>
 
diff --git a/gigacode/README.md b/gigacode/README.md
index 6a0035c..3ebbd89 100644
--- a/gigacode/README.md
+++ b/gigacode/README.md
@@ -51,14 +51,14 @@ curl -fsSL https://releases.rivet.dev/sandbox-agent/latest/gigacode-install.sh |
 **npm i -g**
 
 ```bash
-npm install -g gigacode
+npm install -g @sandbox-agent/gigacode
 gigacode --help
 ```
 
 **bun add -g**
 
 ```bash
-bun add -g gigacode
+bun add -g @sandbox-agent/gigacode
 # Allow Bun to run postinstall scripts for native binaries.
 bun pm -g trust @sandbox-agent/gigacode-linux-x64 @sandbox-agent/gigacode-linux-arm64 @sandbox-agent/gigacode-darwin-arm64 @sandbox-agent/gigacode-darwin-x64 @sandbox-agent/gigacode-win32-x64
 gigacode --help
@@ -67,13 +67,13 @@ gigacode --help
 **npx**
 
 ```bash
-npx gigacode --help
+npx @sandbox-agent/gigacode --help
 ```
 
 **bunx**
 
 ```bash
-bunx gigacode --help
+bunx @sandbox-agent/gigacode --help
 ```
 
 > **Note:** Windows is unsupported. Please use [WSL](https://learn.microsoft.com/en-us/windows/wsl/install).
diff --git a/scripts/release/sdk.ts b/scripts/release/sdk.ts
index 23c468f..68d0dfc 100644
--- a/scripts/release/sdk.ts
+++ b/scripts/release/sdk.ts
@@ -23,7 +23,7 @@ const CLI_PACKAGES = [
 	"@sandbox-agent/cli-win32-x64",
 	"@sandbox-agent/cli-darwin-x64",
 	"@sandbox-agent/cli-darwin-arm64",
-	"gigacode",
+	"@sandbox-agent/gigacode",
 	"@sandbox-agent/gigacode-linux-x64",
 	"@sandbox-agent/gigacode-linux-arm64",
 	"@sandbox-agent/gigacode-win32-x64",
@@ -301,7 +301,7 @@ export async function publishNpmCli(opts: ReleaseOpts) {
 		let packagePath: string;
 		if (packageName === "@sandbox-agent/cli") {
 			packagePath = join(opts.root, "sdks/cli");
-		} else if (packageName === "gigacode") {
+		} else if (packageName === "@sandbox-agent/gigacode") {
 			packagePath = join(opts.root, "sdks/gigacode");
 		} else if (packageName.startsWith("@sandbox-agent/cli-")) {
 			// Platform-specific packages: @sandbox-agent/cli-linux-x64 -> sdks/cli/platforms/linux-x64
diff --git a/sdks/gigacode/bin/gigacode b/sdks/gigacode/bin/gigacode
index 204a935..0fd87cc 100644
--- a/sdks/gigacode/bin/gigacode
+++ b/sdks/gigacode/bin/gigacode
@@ -20,14 +20,14 @@ function formatHint(binPath) {
         label: "Project install",
         commands: [
           `bun pm trust ${TRUST_PACKAGES}`,
-          "bun add gigacode",
+          "bun add @sandbox-agent/gigacode",
         ],
       },
       {
         label: "Global install",
         commands: [
           `bun pm -g trust ${TRUST_PACKAGES}`,
-          "bun add -g gigacode",
+          "bun add -g @sandbox-agent/gigacode",
         ],
       },
     ],
diff --git a/sdks/gigacode/package.json b/sdks/gigacode/package.json
index 44c3025..202a612 100644
--- a/sdks/gigacode/package.json
+++ b/sdks/gigacode/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "gigacode",
+  "name": "@sandbox-agent/gigacode",
   "version": "0.1.6",
   "description": "Gigacode CLI (sandbox-agent with OpenCode attach by default)",
   "license": "Apache-2.0",