diff --git a/.claude/launch.json b/.claude/launch.json
new file mode 100644
index 00000000..6e222e9e
--- /dev/null
+++ b/.claude/launch.json
@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "serve-sim",
+      "runtimeExecutable": "node",
+      "runtimeArgs": ["packages/serve-sim/dist/serve-sim.js", "--port", "3242"],
+      "port": 3242
+    }
+  ]
+}
diff --git a/bun.lock b/bun.lock
index 6de1175f..fbdcecf8 100644
--- a/bun.lock
+++ b/bun.lock
@@ -12,7 +12,7 @@
       },
     },
     "packages/serve-sim": {
-      "name": "serve-sim",
+      "name": "@expo/serve-sim",
       "version": "0.1.34",
       "bin": {
         "serve-sim": "dist/serve-sim.js",
@@ -268,7 +268,7 @@
 
     "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
 
-    "serve-sim": ["serve-sim@workspace:packages/serve-sim"],
+    "@expo/serve-sim": ["@expo/serve-sim@workspace:packages/serve-sim"],
 
     "smol-toml": ["smol-toml@1.6.1", "", {}, "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg=="],
 
diff --git a/package.json b/package.json
index 06dacaf2..7c4eb0d7 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "bun run --filter '*' build",
-    "dev": "bun run --filter 'serve-sim' dev",
+    "dev": "bun run --filter '@expo/serve-sim' dev",
     "knip": "knip",
     "typecheck": "tsc --noEmit",
     "lint": "oxlint"
diff --git a/packages/serve-sim/README.md b/packages/serve-sim/README.md
index b8e93648..17cac5b5 100644
--- a/packages/serve-sim/README.md
+++ b/packages/serve-sim/README.md
@@ -142,9 +142,7 @@ Sources:
 An [Agent Skill](https://platform.claude.com/docs/en/agents-and-tools/agent-skills/overview) ships in [`skills/serve-sim`](skills/serve-sim) — it teaches AI coding agents (Claude Code, Cursor, Codex CLI, Gemini CLI, and any host implementing the open Agent Skills standard) how to drive a simulator through the CLI: taps, gestures, hardware buttons, rotation, camera injection, and handing the stream off to the host's preview pane.
 
 ```sh
-bunx add-skill EvanBacon/serve-sim
-# in Claude Code:
-/plugin marketplace add EvanBacon/serve-sim
+bunx add-skill expo/serve-sim
 ```
 
 See [`skills/serve-sim/README.md`](skills/serve-sim/README.md) for the full capability list.
diff --git a/packages/serve-sim/package.json b/packages/serve-sim/package.json
index 18abf3d8..42b2d7bd 100644
--- a/packages/serve-sim/package.json
+++ b/packages/serve-sim/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "serve-sim",
+  "name": "@expo/serve-sim",
   "version": "0.1.34",
   "type": "module",
   "author": {
@@ -10,12 +10,12 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/EvanBacon/serve-sim.git",
+    "url": "git+https://github.com/expo/serve-sim.git",
     "directory": "packages/serve-sim"
   },
-  "homepage": "https://github.com/EvanBacon/serve-sim#readme",
+  "homepage": "https://github.com/expo/serve-sim#readme",
   "bugs": {
-    "url": "https://github.com/EvanBacon/serve-sim/issues"
+    "url": "https://github.com/expo/serve-sim/issues"
   },
   "bin": {
     "serve-sim": "dist/serve-sim.js"