diff --git a/packages/cli/src/lib/preflight.ts b/packages/cli/src/lib/preflight.ts
index 166db7c21..717cbec1d 100644
--- a/packages/cli/src/lib/preflight.ts
+++ b/packages/cli/src/lib/preflight.ts
@@ -34,7 +34,7 @@ async function checkPort(port: number): Promise<void> {
  */
 async function checkBuilt(webDir: string): Promise<void> {
   const isNpmInstall = isInstalledUnderNodeModules(webDir);
-  const corePkgDir = findPackageUp(webDir, "@composio", "ao-core");
+  const corePkgDir = findPackageUp(webDir, "@aoagents", "ao-core");
   if (!corePkgDir) {
     const hint = isNpmInstall
       ? "Run: npm install -g @aoagents/ao@latest"
diff --git a/packages/plugins/scm-github/test/graphql-batch.integration.test.ts b/packages/plugins/scm-github/test/graphql-batch.integration.test.ts
index f81461bb4..767112302 100644
--- a/packages/plugins/scm-github/test/graphql-batch.integration.test.ts
+++ b/packages/plugins/scm-github/test/graphql-batch.integration.test.ts
@@ -15,8 +15,8 @@ const SKIP_INTEGRATION_TESTS = !GITHUB_TOKEN;
 describe.skipIf(SKIP_INTEGRATION_TESTS)("GraphQL Batch Enrichment Integration", () => {
   const testPRs = [
     {
-      owner: "ComposioHQ",
-      repo: "agent-orchestrator",
+      owner: "aoagents",
+      repo: "ao",
       number: 1,
       url: "https://github.com/aoagents/ao/pull/1",
       title: "Test PR",
@@ -42,8 +42,8 @@ describe.skipIf(SKIP_INTEGRATION_TESTS)("GraphQL Batch Enrichment Integration",
   it("should handle non-existent PR gracefully", async () => {
     const nonExistentPRs = [
       {
-        owner: "ComposioHQ",
-        repo: "agent-orchestrator",
+        owner: "aoagents",
+        repo: "ao",
         number: 99999999,
         url: "https://github.com/aoagents/ao/pull/99999999",
         title: "Non-existent",
@@ -67,8 +67,8 @@ describe.skipIf(SKIP_INTEGRATION_TESTS)("GraphQL Batch Enrichment Integration",
     // Test with multiple PRs from the same repo
     const multiPRs = [
       {
-        owner: "ComposioHQ",
-        repo: "agent-orchestrator",
+        owner: "aoagents",
+        repo: "ao",
         number: 1,
         url: "https://github.com/aoagents/ao/pull/1",
         title: "PR 1",
@@ -77,8 +77,8 @@ describe.skipIf(SKIP_INTEGRATION_TESTS)("GraphQL Batch Enrichment Integration",
         isDraft: false,
       },
       {
-        owner: "ComposioHQ",
-        repo: "agent-orchestrator",
+        owner: "aoagents",
+        repo: "ao",
         number: 2,
         url: "https://github.com/aoagents/ao/pull/2",
         title: "PR 2",
@@ -111,8 +111,8 @@ describe.skipIf(SKIP_INTEGRATION_TESTS)("GraphQL Batch Enrichment Integration",
   it("should handle PRs from different repositories", async () => {
     const multiRepoPRs = [
       {
-        owner: "ComposioHQ",
-        repo: "agent-orchestrator",
+        owner: "aoagents",
+        repo: "ao",
         number: 1,
         url: "https://github.com/aoagents/ao/pull/1",
         title: "PR in repo 1",
diff --git a/packages/web/server/__tests__/server-compatibility.test.ts b/packages/web/server/__tests__/server-compatibility.test.ts
index 6f4854e7a..49c887a26 100644
--- a/packages/web/server/__tests__/server-compatibility.test.ts
+++ b/packages/web/server/__tests__/server-compatibility.test.ts
@@ -26,7 +26,7 @@ describe("direct-terminal-ws.ts", () => {
   });
 
   it("does not import loadConfig from @aoagents/ao-core", () => {
-    expect(source).not.toMatch(/import\s.*loadConfig.*from\s+["']@composio\/ao-core["']/);
+    expect(source).not.toMatch(/import\s.*loadConfig.*from\s+["']@aoagents\/ao-core["']/);
   });
 
   it("does not reference config.dataDir", () => {
@@ -49,6 +49,7 @@ describe("direct-terminal-ws.ts", () => {
   });
 });
 
+
 describe("OrchestratorConfig compatibility", () => {
   it("OrchestratorConfig does not have dataDir property", () => {
     const typesSource = readFileSync(
diff --git a/scripts/ao-doctor.sh b/scripts/ao-doctor.sh
index dee26e12d..39ee2e5a1 100755
--- a/scripts/ao-doctor.sh
+++ b/scripts/ao-doctor.sh
@@ -250,13 +250,13 @@ check_install_layout() {
   if [ -f "$REPO_ROOT/packages/core/dist/index.js" ]; then
     pass "core package is built"
   else
-    fail "core package is not built. Fix: run pnpm --filter @composio/ao-core build"
+    fail "core package is not built. Fix: run pnpm --filter @aoagents/ao-core build"
   fi
 
   if [ -f "$REPO_ROOT/packages/cli/dist/index.js" ]; then
     pass "CLI package is built"
   else
-    fail "CLI package is not built. Fix: run pnpm --filter @composio/ao-cli build"
+    fail "CLI package is not built. Fix: run pnpm --filter @aoagents/ao-cli build"
   fi
 }
 
diff --git a/scripts/ao-update.sh b/scripts/ao-update.sh
index 43a2b26c4..0f92277d6 100755
--- a/scripts/ao-update.sh
+++ b/scripts/ao-update.sh
@@ -106,13 +106,13 @@ if [ "$SMOKE_ONLY" = false ]; then
   run_cmd git pull --ff-only origin "$TARGET_BRANCH"
   run_cmd pnpm install
 
-  run_cmd pnpm --filter @composio/ao-core clean
-  run_cmd pnpm --filter @composio/ao-cli clean
-  run_cmd pnpm --filter @composio/ao-web clean
+  run_cmd pnpm --filter @aoagents/ao-core clean
+  run_cmd pnpm --filter @aoagents/ao-cli clean
+  run_cmd pnpm --filter @aoagents/ao-web clean
 
-  run_cmd pnpm --filter @composio/ao-core build
-  run_cmd pnpm --filter @composio/ao-cli build
-  run_cmd pnpm --filter @composio/ao-web build
+  run_cmd pnpm --filter @aoagents/ao-core build
+  run_cmd pnpm --filter @aoagents/ao-cli build
+  run_cmd pnpm --filter @aoagents/ao-web build
 
   printf '\nRefreshing ao launcher...\n'
   (
diff --git a/scripts/try-pr.sh b/scripts/try-pr.sh
index e7549b2d8..f594d800e 100755
--- a/scripts/try-pr.sh
+++ b/scripts/try-pr.sh
@@ -55,15 +55,15 @@ cd "$WORKTREE"
 # ── build CLI/core/plugins ─────────────────────────────────────────────────────
 echo -e "\n${BOLD}Building $SESSION${RESET} (branch: ${CYAN}$BRANCH${RESET})\n"
 
-pnpm --filter @composio/ao-core \
-     --filter @composio/ao-cli \
-     --filter '@composio/ao-plugin-*' \
+pnpm --filter @aoagents/ao-core \
+     --filter @aoagents/ao-cli \
+     --filter '@aoagents/ao-plugin-*' \
      build
 
 # ── build web if requested ─────────────────────────────────────────────────────
 if [ "$WITH_WEB" = true ]; then
   echo -e "\n${BOLD}Building dashboard...${RESET}\n"
-  pnpm --filter @composio/ao-web build
+  pnpm --filter @aoagents/ao-web build
 fi
 
 # ── link ao ───────────────────────────────────────────────────────────────────