diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 302ea3a..18bdfad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Thank you for your interest in contributing! This document covers how to get set
 
 ## Who uses this
 
-workbench is built and used by the [PAP](https://pap.dev) team internally and is open for community contributions.
+workbench is built and used by the [workbench-codes](https://workbench.codes) team internally and is open for community contributions.
 
 ## Project structure
 
@@ -25,7 +25,7 @@ workbench/
 - [gh CLI](https://cli.github.com) installed and authenticated
 
 ```bash
-git clone https://github.com/plan-and-publish/workbench.git
+git clone https://github.com/workbench-codes/workbench.git
 cd workbench/packages/workbench-cli
 bun install
 ```
@@ -66,11 +66,11 @@ npm run release:minor   # 0.x.0
 npm run release:major   # x.0.0
 ```
 
-This bumps the version, commits, and tags. Pushing the tag triggers the publish workflow, which publishes to both [npm](https://www.npmjs.com/package/@pap.dev/workbench) and [JSR](https://jsr.io/@pap/workbench).
+This bumps the version, commits, and tags. Pushing the tag triggers the publish workflow, which publishes to both [npm](https://www.npmjs.com/package/@workbench-codes/workbench) and [JSR](https://jsr.io/@workbench-codes/workbench).
 
 ## Reporting bugs
 
-Open an issue using the [bug report template](https://github.com/plan-and-publish/workbench/issues/new?template=bug_report.md).
+Open an issue using the [bug report template](https://github.com/workbench-codes/workbench/issues/new?template=bug_report.md).
 
 ## Code of Conduct
 
diff --git a/LICENSE b/LICENSE
index 9717537..6edcb5e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 plan-and-publish
+Copyright (c) 2026 workbench-codes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 9af96d1..058fe44 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # workbench
 
-[![CI](https://github.com/plan-and-publish/workbench/actions/workflows/ci-workbench-cli.yml/badge.svg)](https://github.com/plan-and-publish/workbench/actions/workflows/ci-workbench-cli.yml)
-[![npm](https://img.shields.io/npm/v/@pap.dev/workbench)](https://www.npmjs.com/package/@pap.dev/workbench)
-[![JSR](https://jsr.io/badges/@pap/workbench)](https://jsr.io/@pap/workbench)
+[![CI](https://github.com/workbench-codes/workbench/actions/workflows/ci-workbench-cli.yml/badge.svg)](https://github.com/workbench-codes/workbench/actions/workflows/ci-workbench-cli.yml)
+[![npm](https://img.shields.io/npm/v/@workbench-codes/workbench)](https://www.npmjs.com/package/@workbench-codes/workbench)
+[![JSR](https://jsr.io/badges/@workbench-codes/workbench)](https://jsr.io/@workbench-codes/workbench)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 
 ## Getting Started
@@ -17,12 +17,12 @@ Choose to install the CLI from the package manager or the source code.
 
 #### 2.1 Install from the package manager (recommended)
 
-Install the package from [![npm](https://img.shields.io/npm/v/@pap.dev/workbench)](https://www.npmjs.com/package/@pap.dev/workbench) or [![JSR](https://jsr.io/badges/@pap/workbench)](https://jsr.io/@pap/workbench).
+Install the package from [![npm](https://img.shields.io/npm/v/@workbench-codes/workbench)](https://www.npmjs.com/package/@workbench-codes/workbench) or [![JSR](https://jsr.io/badges/@workbench-codes/workbench)](https://jsr.io/@workbench-codes/workbench).
 
 For example:
 
 ```bash
-npm install -g @pap.dev/workbench
+npm install -g @workbench-codes/workbench
 ```
 
 #### 2.2 Install from the cloned repo
@@ -130,9 +130,9 @@ Under the hood, each slash command is powered by a dedicated sub-agent:
 
 # ONLY for GitHub Issues we also need to pass the {owner}/{repo}
 # Thisis needed because GitHub issues are unique in scope of a repository
-/implement 54 plan-and-publish/workbench
+/implement 54 workbench-codes/workbench
 # or up to a stage
-/implement 54 plan plan-and-publish/workbench
+/implement 54 plan workbench-codes/workbench
 
 # Orchestrated flow with optional stop-step bound
 /implement PAP-1234 research
diff --git a/SECURITY.md b/SECURITY.md
index eeba064..93c8f55 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,7 +10,7 @@
 
 **Please do not report security vulnerabilities through public GitHub issues.**
 
-To report a vulnerability, open a [GitHub Security Advisory](https://github.com/plan-and-publish/workbench/security/advisories/new) on this repository. You can expect an acknowledgement within 48 hours and a resolution timeline within 7 days depending on severity.
+To report a vulnerability, open a [GitHub Security Advisory](https://github.com/workbench-codes/workbench/security/advisories/new) on this repository. You can expect an acknowledgement within 48 hours and a resolution timeline within 7 days depending on severity.
 
 Please include as much of the following as possible:
 
diff --git a/packages/workbench-cli/README.md b/packages/workbench-cli/README.md
index 86b92e1..5d3562a 100644
--- a/packages/workbench-cli/README.md
+++ b/packages/workbench-cli/README.md
@@ -1,8 +1,8 @@
 # workbench CLI
 
-[![CI](https://github.com/plan-and-publish/workbench/actions/workflows/ci-workbench-cli.yml/badge.svg)](https://github.com/plan-and-publish/workbench/actions/workflows/ci-workbench-cli.yml)
-[![npm](https://img.shields.io/npm/v/@pap.dev/workbench)](https://www.npmjs.com/package/@pap.dev/workbench)
-[![JSR](https://jsr.io/badges/@pap/workbench)](https://jsr.io/@pap/workbench)
+[![CI](https://github.com/workbench-codes/workbench/actions/workflows/ci-workbench-cli.yml/badge.svg)](https://github.com/workbench-codes/workbench/actions/workflows/ci-workbench-cli.yml)
+[![npm](https://img.shields.io/npm/v/@workbench-codes/workbench)](https://www.npmjs.com/package/@workbench-codes/workbench)
+[![JSR](https://jsr.io/badges/@workbench-codes/workbench)](https://jsr.io/@workbench-codes/workbench)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](../../LICENSE)
 
 A terminal UI for initializing a workbench repository — clone and wire up git submodules interactively or non-interactively.
@@ -64,7 +64,7 @@ workbench --tui
 |------|-------------|---------|
 | `--init` | Initialize a new workbench (clone) | `false` |
 | `--name <name>` | Name for the local folder | `workbench` |
-| `--source <repo>` | Source repository to clone from | `plan-and-publish/workbench` |
+| `--source <repo>` | Source repository to clone from | `workbench-codes/workbench` |
 | `--remote` | Create a private GitHub repo and set as origin | `false` |
 | `--no-tui` | Skip TUI, use defaults or provided values | `false` |
 
@@ -172,7 +172,7 @@ npm run release:minor   # 0.x.0
 npm run release:major   # x.0.0
 ```
 
-See [GitHub Releases](https://github.com/plan-and-publish/workbench/releases) for the version history.
+See [GitHub Releases](https://github.com/workbench-codes/workbench/releases) for the version history.
 
 ## Contributing
 
diff --git a/packages/workbench-cli/jsr.json b/packages/workbench-cli/jsr.json
index 4cd0015..dd097db 100644
--- a/packages/workbench-cli/jsr.json
+++ b/packages/workbench-cli/jsr.json
@@ -1,5 +1,5 @@
 {
-  "name": "@pap/workbench",
+  "name": "@workbench-codes/workbench",
   "version": "0.1.19",
   "license": "MIT",
   "exports": "./src/index.ts"
diff --git a/packages/workbench-cli/package.json b/packages/workbench-cli/package.json
index 36ddac0..a94f2c6 100644
--- a/packages/workbench-cli/package.json
+++ b/packages/workbench-cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@pap.dev/workbench",
+  "name": "@workbench-codes/workbench",
   "version": "0.1.19",
   "type": "module",
   "bin": {
@@ -27,9 +27,10 @@
     "typescript": "^5.0.0"
   },
   "license": "MIT",
+  "homepage": "https://workbench.codes",
   "repository": {
     "type": "git",
-    "url": "https://github.com/plan-and-publish/workbench",
+    "url": "https://github.com/workbench-codes/workbench",
     "directory": "packages/workbench-cli"
   }
 }
diff --git a/packages/workbench-cli/src/args.ts b/packages/workbench-cli/src/args.ts
index 8fc9b89..fee6846 100644
--- a/packages/workbench-cli/src/args.ts
+++ b/packages/workbench-cli/src/args.ts
@@ -29,7 +29,7 @@ export function parseCliArgs(): CliArgs {
       "resource-branch": { type: "string", default: "main" },
       index: { type: "string", default: "on" },
       init: { type: "boolean", default: false },
-      source: { type: "string", default: "plan-and-publish/workbench" },
+      source: { type: "string", default: "workbench-codes/workbench" },
       remote: { type: "boolean", default: false },
       name: { type: "string", default: "workbench" },
       "no-tui": { type: "boolean", default: false },
@@ -71,7 +71,7 @@ USAGE:
 OPTIONS:
   --init                          Initialize a new workbench (clone)
   --name <name>                   Name for the local folder (default: workbench)
-  --source <repo>                 Source repository to clone from (default: plan-and-publish/workbench)
+  --source <repo>                 Source repository to clone from (default: workbench-codes/workbench)
   --remote                        Create a private GitHub repo and set as origin
   --no-tui                        Skip TUI, use defaults or provided values
   --org <name>                    GitHub organization name
diff --git a/packages/workbench-cli/src/utils/config.ts b/packages/workbench-cli/src/utils/config.ts
index f4f1087..9c5932b 100644
--- a/packages/workbench-cli/src/utils/config.ts
+++ b/packages/workbench-cli/src/utils/config.ts
@@ -4,7 +4,7 @@ import type { Repo } from "../screens/repoSelect.ts"
 
 export interface WorkbenchConfig {
   source: {
-    repository: string   // e.g., "plan-and-publish/workbench"
+    repository: string   // e.g., "workbench-codes/workbench"
     branch: string       // e.g., "main"
   }
   github: { org: string }