diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 751ebd0c0d..8dfdab5ec3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,5 +21,5 @@ If you need help, consider asking for advice on the [discussion board].
 [CHANGELOG]: ../CHANGELOG.md
 [CLA]: https://cla.developers.google.com/
 [Contributors Guide]: ../CONTRIBUTING.md
-[discussion board]: https://github.com/google/A2UI/discussions
+[discussion board]: https://github.com/a2ui-project/a2ui/discussions
 [Style Guide]: ../CONTRIBUTING.md#coding-style
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 76802562db..c7cb62e2fd 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -39,7 +39,7 @@ jobs:
       contents: write
       actions: read
 
-    if: github.repository == 'google/A2UI'
+    if: github.repository == 'a2ui-project/a2ui'
 
     steps:
       - name: Checkout Code
diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml
index a8bed42dd6..ef77883677 100644
--- a/.github/workflows/e2e_test.yaml
+++ b/.github/workflows/e2e_test.yaml
@@ -15,7 +15,7 @@ jobs:
   e2e_test:
     # Do not run on forked branches,
     # because the test does not have access to secrets in forks.
-    if: github.repository == 'google/a2ui'
+    if: github.repository == 'a2ui-project/a2ui'
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/README.md b/README.md
index cc6b87980d..1475d6382a 100644
--- a/README.md
+++ b/README.md
@@ -114,8 +114,8 @@ Pick the path that matches where you want to start:
 Prerequisites: Node.js 18+, [uv](https://docs.astral.sh/uv/), and a [Gemini API key](https://aistudio.google.com/apikey).
 
 ```bash
-git clone https://github.com/google/A2UI.git
-cd A2UI
+git clone https://github.com/a2ui-project/a2ui.git
+cd a2ui
 export GEMINI_API_KEY="your_gemini_api_key"
 cd samples/client/lit
 npm run demo:restaurant
diff --git a/agent_sdks/agent_sdk_guide.md b/agent_sdks/agent_sdk_guide.md
index 22e94d68dc..80b16d3696 100644
--- a/agent_sdks/agent_sdk_guide.md
+++ b/agent_sdks/agent_sdk_guide.md
@@ -262,7 +262,7 @@ Create the helper utilities to wrap JSON in transport Parts (if needed for your
 
 ### Step 5: Sample Applications
 
-Create a simple sample (like a command-line agent or local server) to verify that the SDK works end-to-end. Refer to the reference Python samples (e.g., `samples/agent/adk/contact_lookup`) for inspiration.
+Create a simple sample (like a command-line agent or local server) to verify that the SDK works end-to-end. Refer to the reference Python samples (e.g., `samples/agent/adk/restaurant_finder`) for inspiration.
 
 > [!IMPORTANT]
 > Keep the SDK idiomatic to your language. Don't force Python-isms if it doesn't make sense (e.g., use builder patterns in Java/Kotlin or macros in C++ if they are more ergonomic).
diff --git a/docs/ecosystem/a2ui-in-the-world.md b/docs/ecosystem/a2ui-in-the-world.md
index 234301c47d..d8e41f80c5 100644
--- a/docs/ecosystem/a2ui-in-the-world.md
+++ b/docs/ecosystem/a2ui-in-the-world.md
@@ -80,7 +80,7 @@ ADK integrated the A2UI v0.8 basic catalog to automatically render spec-complian
 
 - **Built-in rendering**: ADK Web renders A2UI components natively in the dev UI.
 - **A2A integration**: A2UI messages are converted between A2A DataPart metadata and ADK events.
-- **Agent SDK**: The [A2UI Python agent SDK](https://github.com/google/A2UI/tree/main/agent_sdks/python) provides an ADK extension for generating A2UI from agents.
+- **Agent SDK**: The [A2UI Python agent SDK](https://github.com/a2ui-project/a2ui/tree/main/agent_sdks/python) provides an ADK extension for generating A2UI from agents.
 
 **Try it:**
 
@@ -165,17 +165,12 @@ The A2UI community is building exciting projects:
 
 ### Open Source Examples
 
-- **Restaurant Finder** ([samples/agent/adk/restaurant_finder](https://github.com/google/A2UI/tree/main/samples/agent/adk/restaurant_finder))
+- **Restaurant Finder** ([samples/agent/adk/restaurant_finder](https://github.com/a2ui-project/a2ui/tree/main/samples/agent/adk/restaurant_finder))
     - Table reservation with dynamic forms
     - Gemini-powered agent
     - Full source code available
 
-- **Contact Lookup** ([samples/agent/adk/contact_lookup](https://github.com/google/A2UI/tree/main/samples/agent/adk/contact_lookup))
-    - Search interface with results list
-    - A2A agent example
-    - Demonstrates data binding
-
-- **Component Gallery** ([samples/client/angular - gallery mode](https://github.com/google/A2UI/tree/main/samples/client/angular))
+- **Component Gallery** ([samples/client/angular - gallery mode](https://github.com/a2ui-project/a2ui/tree/main/samples/client/angular))
     - Interactive showcase of all components
     - Live examples with code
     - Great for learning
@@ -202,4 +197,4 @@ For more information, see the following resources:
 
 ---
 
-**Using A2UI in production?** Share your story on [GitHub Discussions](https://github.com/google/A2UI/discussions).
+**Using A2UI in production?** Share your story on [GitHub Discussions](https://github.com/a2ui-project/a2ui/discussions).
diff --git a/docs/ecosystem/community.md b/docs/ecosystem/community.md
index d904381c3f..db2d3556fc 100644
--- a/docs/ecosystem/community.md
+++ b/docs/ecosystem/community.md
@@ -10,16 +10,15 @@ A2UI is an open-source project licensed under Apache 2.0. Contributions are welc
 
 Built something with A2UI? Show it off!
 
-The best way to share your work is to **post in [GitHub Discussions](https://github.com/google/A2UI/discussions)** with a short description, a link to your code, and a demo video (4 minutes or less). Notable projects are featured in the docs and release notes.
+The best way to share your work is to **post in [GitHub Discussions](https://github.com/a2ui-project/a2ui/discussions)** with a short description, a link to your code, and a demo video (4 minutes or less). Notable projects are featured in the docs and release notes.
 
 **Community-built renderers** are listed on the [Ecosystem Renderers](renderers.md) page — check there for community implementations and instructions for adding your own.
 
 **Official samples** in the repo are a great reference for what good A2UI projects look like:
 
-- [Restaurant Finder](https://github.com/google/A2UI/tree/main/samples/agent/adk/restaurant_finder) — ADK agent with dynamic forms.
-- [Contact Lookup](https://github.com/google/A2UI/tree/main/samples/agent/adk/contact_lookup) — search UI with data binding.
-- [Angular client](https://github.com/google/A2UI/tree/main/samples/client/angular) — gallery + restaurant client.
-- [Lit shell](https://github.com/google/A2UI/tree/main/samples/client/lit/shell) — minimal web component client.
+- [Restaurant Finder](https://github.com/a2ui-project/a2ui/tree/main/samples/agent/adk/restaurant_finder) — ADK agent with dynamic forms.
+- [Angular client](https://github.com/a2ui-project/a2ui/tree/main/samples/client/angular) — gallery + restaurant client.
+- [Lit shell](https://github.com/a2ui-project/a2ui/tree/main/samples/client/lit/shell) — minimal web component client.
 
 ## Project Partners
 
@@ -58,11 +57,11 @@ To stay informed about project updates:
 
 ## Ways to Contribute
 
-**[github.com/google/A2UI](https://github.com/google/A2UI)**
+**[github.com/a2ui-project/a2ui](https://github.com/a2ui-project/a2ui)**
 
-- **Report Issues**: Found a bug? [Open an issue](https://github.com/google/A2UI/issues).
+- **Report Issues**: Found a bug? [Open an issue](https://github.com/a2ui-project/a2ui/issues).
 - **Build Renderers**: See the [roadmap](../roadmap.md) for planned frameworks.
-- **Share Examples**: Post with `#A2UI` on X/LinkedIn, start a [discussion](https://github.com/google/A2UI/discussions).
+- **Share Examples**: Post with `#A2UI` on X/LinkedIn, start a [discussion](https://github.com/a2ui-project/a2ui/discussions).
 - **Improve Docs**: PRs welcome in the `docs/` directory.
 
 ## Questions?
@@ -70,7 +69,7 @@ To stay informed about project updates:
 If you have questions:
 
 - Check the [documentation](../introduction/what-is-a2ui.md).
-- Search [GitHub Discussions](https://github.com/google/A2UI/discussions).
-- Ask in [GitHub Issues](https://github.com/google/A2UI/issues).
+- Search [GitHub Discussions](https://github.com/a2ui-project/a2ui/discussions).
+- Ask in [GitHub Issues](https://github.com/a2ui-project/a2ui/issues).
 
 Thank you for being part of the A2UI community!
diff --git a/docs/ecosystem/renderers.md b/docs/ecosystem/renderers.md
index c3433f4971..b0342d2649 100644
--- a/docs/ecosystem/renderers.md
+++ b/docs/ecosystem/renderers.md
@@ -43,7 +43,7 @@ These projects are not directly A2UI renderers but are closely related and do su
 
 ### Highlights
 
-**easyops-cn/a2ui-sdk** (`@a2ui-sdk/react`) is the most fully-featured community React renderer, with 11 published versions, Radix UI primitives, Tailwind CSS styling, and a dedicated docs site. It was [announced on the A2UI discussions](https://github.com/google/A2UI/discussions/489). For the official A2UI React renderer, see [`@a2ui/react`](https://www.npmjs.com/package/@a2ui/react).
+**easyops-cn/a2ui-sdk** (`@a2ui-sdk/react`) is the most fully-featured community React renderer, with 11 published versions, Radix UI primitives, Tailwind CSS styling, and a dedicated docs site. It was [announced on the A2UI discussions](https://github.com/a2ui-project/a2ui/discussions/489). For the official A2UI React renderer, see [`@a2ui/react`](https://www.npmjs.com/package/@a2ui/react).
 
 **lmee/A2UI-Android** fills an important gap — it's currently the only Jetpack Compose renderer, covering Android 5.0+ with 20+ components, data binding, and accessibility support.
 
@@ -61,12 +61,12 @@ If you have built an A2UI renderer, submit it to be listed here.
 
 To submit a renderer, follow these steps:
 
-1. **Fork** the [google/A2UI](https://github.com/google/A2UI) repository
+1. **Fork** the [a2ui-project/a2ui](https://github.com/a2ui-project/a2ui) repository
 2. **Edit** this file (`docs/ecosystem/renderers.md`) — add a row to the Community Renderers table with your renderer's name, platform, npm package (if any), version support, and a link to the source
-3. **Open a PR** against `google/A2UI` with a short description of your renderer
-4. **Post in [GitHub Discussions](https://github.com/google/A2UI/discussions)** — let the community know what you built! A short demo video goes a long way.
+3. **Open a PR** against `a2ui-project/a2ui` with a short description of your renderer
+4. **Post in [GitHub Discussions](https://github.com/a2ui-project/a2ui/discussions)** — let the community know what you built! A short demo video goes a long way.
 
-Need inspiration? Browse the **[community samples](https://github.com/google/A2UI/tree/main/samples)** in the repo — these cover Angular, Lit, and ADK-based agents and are a good starting point.
+Need inspiration? Browse the **[community samples](https://github.com/a2ui-project/a2ui/tree/main/samples)** in the repo — these cover Angular, Lit, and ADK-based agents and are a good starting point.
 
 ### What makes a good community renderer?
 
diff --git a/docs/guides/a2ui-in-mcp-apps.md b/docs/guides/a2ui-in-mcp-apps.md
index d453d56151..50d19157ca 100644
--- a/docs/guides/a2ui-in-mcp-apps.md
+++ b/docs/guides/a2ui-in-mcp-apps.md
@@ -12,7 +12,7 @@ This guide shows you how to serve rich, interactive A2UI interfaces within [MCP
 
 ## Quick Start: Run the Sample
 
-For detailed instructions on how to run this sample, please refer to the [README.md](https://github.com/google/A2UI/blob/main/samples/mcp/a2ui-in-mcpapps/README.md).
+For detailed instructions on how to run this sample, please refer to the [README.md](https://github.com/a2ui-project/a2ui/blob/main/samples/mcp/a2ui-in-mcpapps/README.md).
 
 ## Architecture Overview
 
@@ -153,7 +153,7 @@ To build your own MCP App with A2UI capabilities, follow these steps:
 MCP Apps are typically delivered as a single HTML resource from the MCP Server. To achieve this with a modern framework like Angular or React:
 
 1.  Build your application normally to produce static assets (`index.html`, `.js`, `.css`).
-2.  Use a post-build script (like the [`inline.js`](https://github.com/google/A2UI/blob/main/samples/mcp/a2ui-in-mcpapps/server/apps/src/inline.js) script in the sample) to read the `index.html` and replace external `<script src="...">` and `<link rel="stylesheet" href="...">` tags with inline `<script>` and `<style>` tags containing the actual file contents.
+2.  Use a post-build script (like the [`inline.js`](https://github.com/a2ui-project/a2ui/blob/main/samples/mcp/a2ui-in-mcpapps/server/apps/src/inline.js) script in the sample) to read the `index.html` and replace external `<script src="...">` and `<link rel="stylesheet" href="...">` tags with inline `<script>` and `<style>` tags containing the actual file contents.
 3.  This produces a self-contained HTML file that can be safely loaded via `srcdoc` in the restricted iframe.
 
 > [!TIP]
@@ -189,7 +189,7 @@ Your inlined app is now running in the sandbox. To leverage A2UI:
 1.  **Include the A2UI Angular/Lit libraries** in your app's bundle.
 2.  **Define a communication contract** with your Host to interact with the MCP Server.
 3.  When you receive the response from the Host, look for the `application/a2ui+json` mimeType in the content.
-4.  Parse the JSON text and pass it to the A2UI [`MessageProcessor`](https://github.com/google/A2UI/blob/main/renderers/angular/src/v0_8/data/processor.ts).
+4.  Parse the JSON text and pass it to the A2UI [`MessageProcessor`](https://github.com/a2ui-project/a2ui/blob/main/renderers/angular/src/v0_8/data/processor.ts).
 
 **Example: Fetching and Rendering A2UI**
 
@@ -245,7 +245,7 @@ To handle interactivity within the rendered A2UI surface, your MCP App must capt
 **Example: Handling User Actions**
 
 ```typescript
-// Subscribing to A2UI events in the MCP App ([main.ts](https://github.com/google/A2UI/blob/main/samples/mcp/a2ui-in-mcpapps/server/apps/src/src/main.ts))
+// Subscribing to A2UI events in the MCP App ([main.ts](https://github.com/a2ui-project/a2ui/blob/main/samples/mcp/a2ui-in-mcpapps/server/apps/src/src/main.ts))
 this.processor.events.subscribe(async event => {
   if (!event.message.userAction) return;
 
diff --git a/docs/guides/a2ui_over_mcp.md b/docs/guides/a2ui_over_mcp.md
index 9d21fda80d..e9a8c7b9c1 100644
--- a/docs/guides/a2ui_over_mcp.md
+++ b/docs/guides/a2ui_over_mcp.md
@@ -3,7 +3,7 @@
 This guide shows you how to serve **rich, interactive A2UI interfaces** from an **MCP server** using Tools and Embedded Resources. By the end, you'll have a working MCP server that returns A2UI components to any MCP-compatible client.
 
 <video width="100%" height="auto" controls playsinline style="display: block; aspect-ratio: 16/9; object-fit: cover; border-radius: 8px; margin-bottom: 24px;">
-  <source src="https://raw.githubusercontent.com/google/A2UI/main/docs/assets/guides-a2ui-over-mcp-tour.mp4" type="video/mp4">
+  <source src="https://raw.githubusercontent.com/a2ui-project/a2ui/main/docs/assets/guides-a2ui-over-mcp-tour.mp4" type="video/mp4">
   Your browser does not support the video tag.
 </video>
 
@@ -21,8 +21,8 @@ Before diving into the protocol details, let's get a working example running. Th
 
 ```bash
 # Clone the repo (if you haven't already)
-git clone https://github.com/google/A2UI.git
-cd A2UI/samples/mcp/a2ui-over-mcp-recipe
+git clone https://github.com/a2ui-project/a2ui.git
+cd a2ui/samples/mcp/a2ui-over-mcp-recipe
 
 # Start the MCP server (SSE transport on port 8000)
 uv run .
@@ -75,7 +75,7 @@ You will see a premium, responsive dual-column interface where the left column r
 
 ![Dynamic Recipe Studio demo showing selection form on the left and dynamic recipe card generation on the right](../assets/recipe_sample.gif)
 
-See all samples at [`samples/mcp/`](https://github.com/google/A2UI/tree/main/samples/mcp).
+See all samples at [`samples/mcp/`](https://github.com/a2ui-project/a2ui/tree/main/samples/mcp).
 
 ## How It Works
 
diff --git a/docs/guides/client-setup.md b/docs/guides/client-setup.md
index 7302ef2e3b..22c220a214 100644
--- a/docs/guides/client-setup.md
+++ b/docs/guides/client-setup.md
@@ -4,13 +4,13 @@ Integrate A2UI into your application using the renderer for your platform.
 
 ## Renderers
 
-| Renderer                                                                           | Platform           | v0.8 | v0.9 | Status             |
-| ---------------------------------------------------------------------------------- | ------------------ | ---- | ---- | ------------------ |
-| **[React](https://github.com/google/A2UI/tree/main/renderers/react)**              | Web                | ✅   | ✅   | ✅ Stable          |
-| **[Lit (Web Components)](https://github.com/google/A2UI/tree/main/renderers/lit)** | Web                | ✅   | ✅   | ✅ Stable          |
-| **[Angular](https://github.com/google/A2UI/tree/main/renderers/angular)**          | Web                | ✅   | ✅   | ✅ Stable          |
-| **[Flutter (GenUI SDK)](https://docs.flutter.dev/ai/genui)**                       | Mobile/Desktop/Web | ✅   | ✅   | ✅ Stable          |
-| **Jetpack Compose**                                                                | Android            | —    | —    | 🚧 Planned Q2 2026 |
+| Renderer                                                                                 | Platform           | v0.8 | v0.9 | Status             |
+| ---------------------------------------------------------------------------------------- | ------------------ | ---- | ---- | ------------------ |
+| **[React](https://github.com/a2ui-project/a2ui/tree/main/renderers/react)**              | Web                | ✅   | ✅   | ✅ Stable          |
+| **[Lit (Web Components)](https://github.com/a2ui-project/a2ui/tree/main/renderers/lit)** | Web                | ✅   | ✅   | ✅ Stable          |
+| **[Angular](https://github.com/a2ui-project/a2ui/tree/main/renderers/angular)**          | Web                | ✅   | ✅   | ✅ Stable          |
+| **[Flutter (GenUI SDK)](https://docs.flutter.dev/ai/genui)**                             | Mobile/Desktop/Web | ✅   | ✅   | ✅ Stable          |
+| **Jetpack Compose**                                                                      | Android            | —    | —    | 🚧 Planned Q2 2026 |
 
 For more see all [A2UI Renderers](../reference/renderers.md) and [Community A2UI Renderers](../ecosystem/renderers.md).
 
@@ -44,7 +44,7 @@ Once installed, you can use the renderer in your app. The Lit renderer uses:
 - **`<a2ui-surface>` component**: Renders surfaces in your app.
 - **Lit Signals**: Provides reactive state management for automatic UI updates.
 
-**See working example:** [Lit shell sample](https://github.com/google/a2ui/tree/main/samples/client/lit/shell) — Check its README for detailed run instructions.
+**See working example:** [Lit shell sample](https://github.com/a2ui-project/a2ui/tree/main/samples/client/lit/shell) — Check its README for detailed run instructions.
 
 ## Angular
 
@@ -82,7 +82,7 @@ export const appConfig: ApplicationConfig = {
 };
 ```
 
-**See working example:** [Angular samples](https://github.com/google/a2ui/tree/main/samples/client/angular)
+**See working example:** [Angular samples](https://github.com/a2ui-project/a2ui/tree/main/samples/client/angular)
 
 ### Streaming
 
@@ -105,7 +105,7 @@ The React renderer provides:
 - **`<A2UISurface>` component**: Renders A2UI surfaces in your React app
 - **`useA2UI()` hook**: Accesses the message processor from any component
 
-**See working example:** [React shell](https://github.com/google/A2UI/tree/main/samples/client/react/shell)
+**See working example:** [React shell](https://github.com/a2ui-project/a2ui/tree/main/samples/client/react/shell)
 
 ## Flutter (GenUI SDK)
 
@@ -131,7 +131,7 @@ Common transport options:
 - **WebSockets**: Bidirectional real-time communication
 - **A2A Protocol**: Standardized agent-to-agent communication with A2UI support
 
-See [samples/client/lit/shell/client.ts](https://github.com/google/a2ui/tree/main/samples/client/lit/shell/client.ts) for an example of using the A2A protocol client.
+See [samples/client/lit/shell/client.ts](https://github.com/a2ui-project/a2ui/tree/main/samples/client/lit/shell/client.ts) for an example of using the A2A protocol client.
 
 **See:** [Transports guide](../concepts/transports.md)
 
@@ -144,7 +144,7 @@ When users interact with A2UI components (clicking buttons, submitting forms, et
 3. Sends the action to the agent
 4. Processes the agent's response messages
 
-See the `@a2uiaction` event handler in `#maybeRenderData` in [samples/client/lit/shell/app.ts](https://github.com/google/a2ui/tree/main/samples/client/lit/shell/app.ts) for an example of handling button clicks and form submissions.
+See the `@a2uiaction` event handler in `#maybeRenderData` in [samples/client/lit/shell/app.ts](https://github.com/a2ui-project/a2ui/tree/main/samples/client/lit/shell/app.ts) for an example of handling button clicks and form submissions.
 
 ## Error Handling
 
@@ -155,7 +155,7 @@ Common errors to handle:
 - **Invalid Data Path**: Check data model structure and JSON Pointer syntax.
 - **Schema Validation Failed**: Verify message format matches A2UI specification.
 
-See `try...catch` blocks in `#sendMessage` in [samples/client/lit/shell/app.ts](https://github.com/google/a2ui/tree/main/samples/client/lit/shell/app.ts) for examples of handling communication errors.
+See `try...catch` blocks in `#sendMessage` in [samples/client/lit/shell/app.ts](https://github.com/a2ui-project/a2ui/tree/main/samples/client/lit/shell/app.ts) for examples of handling communication errors.
 
 ## Next Steps
 
diff --git a/docs/guides/mcp-apps-in-a2ui.md b/docs/guides/mcp-apps-in-a2ui.md
index 7ec007c0cd..c7034ed506 100644
--- a/docs/guides/mcp-apps-in-a2ui.md
+++ b/docs/guides/mcp-apps-in-a2ui.md
@@ -22,8 +22,8 @@ To prevent this, A2UI strictly excludes `allow-same-origin` for the inner iframe
 
 ### The Architecture
 
-1.  **[Sandbox Proxy (`sandbox.html`)](https://github.com/google/A2UI/blob/main/samples/client/shared/mcp_apps_inner_iframe/sandbox.html)**: An intermediate `iframe` served from the same origin. It isolates raw DOM injection from the main app while maintaining a structured JSON-RPC channel.
-    - Permissions: **Do not sandbox** in the host template (e.g., [`mcp-app.ts`](https://github.com/google/A2UI/blob/main/samples/client/angular/projects/mcp_calculator/src/a2ui-catalog/mcp-app.ts) or [`mcp-apps-component.ts`](https://github.com/google/A2UI/blob/main/samples/client/lit/custom-components-example/ui/custom-components/mcp-apps-component.ts)).
+1.  **[Sandbox Proxy (`sandbox.html`)](https://github.com/a2ui-project/a2ui/blob/main/samples/client/shared/mcp_apps_inner_iframe/sandbox.html)**: An intermediate `iframe` served from the same origin. It isolates raw DOM injection from the main app while maintaining a structured JSON-RPC channel.
+    - Permissions: **Do not sandbox** in the host template (e.g., [`mcp-app.ts`](https://github.com/a2ui-project/a2ui/blob/main/samples/client/angular/projects/mcp_calculator/src/a2ui-catalog/mcp-app.ts) or [`mcp-apps-component.ts`](https://github.com/a2ui-project/a2ui/blob/main/samples/client/lit/custom-components-example/ui/custom-components/mcp-apps-component.ts)).
     - Host origin validation: Validates that messages come from the expected host origin.
 2.  **Embedded App (Inner Iframe)**: The innermost `iframe`. Injected dynamically via `srcdoc` with restricted permissions.
     - Permissions: `sandbox="allow-scripts allow-forms allow-popups allow-modals"` (**MUST NOT** include `allow-same-origin`).
@@ -297,13 +297,13 @@ http://localhost:4200/?disable_security_self_test=true
 
 ## Troubleshooting
 
-| Problem                                        | Solution                                                                                         |
-| ---------------------------------------------- | ------------------------------------------------------------------------------------------------ |
-| `GEMINI_API_KEY environment variable not set`  | Export the key or add a `.env` file in the agent directory                                       |
-| Python version error on `contact_lookup` agent | Install Python 3.13+ (required by that sample's `pyproject.toml`)                                |
-| `npm run build:renderer` fails                 | Make sure you ran `npm install` first in `samples/client/lit/`                                   |
-| Angular client shows blank page                | Ensure you ran `npm run build:sandbox` before `npm start`                                        |
-| MCP app iframe doesn't load                    | Check that both the MCP server (port 8000) and proxy agent (port 10006) are running              |
-| `ng serve` not found                           | Run `npm install --include=dev` to install dev dependencies including `@angular/cli`             |
-| "URL with hostname not allowed"                | Angular 21 restricts allowed hosts. Use `localhost` (the default) — do not pass `--host 0.0.0.0` |
-| Security self-test fails in dev                | Add `?disable_security_self_test=true` to the URL                                                |
+| Problem                                           | Solution                                                                                         |
+| ------------------------------------------------- | ------------------------------------------------------------------------------------------------ |
+| `GEMINI_API_KEY environment variable not set`     | Export the key or add a `.env` file in the agent directory                                       |
+| Python version error on `restaurant_finder` agent | Install Python 3.13+ (required by that sample's `pyproject.toml`)                                |
+| `npm run build:renderer` fails                    | Make sure you ran `npm install` first in `samples/client/lit/`                                   |
+| Angular client shows blank page                   | Ensure you ran `npm run build:sandbox` before `npm start`                                        |
+| MCP app iframe doesn't load                       | Check that both the MCP server (port 8000) and proxy agent (port 10006) are running              |
+| `ng serve` not found                              | Run `npm install --include=dev` to install dev dependencies including `@angular/cli`             |
+| "URL with hostname not allowed"                   | Angular 21 restricts allowed hosts. Use `localhost` (the default) — do not pass `--host 0.0.0.0` |
+| Security self-test fails in dev                   | Add `?disable_security_self_test=true` to the URL                                                |
diff --git a/docs/guides/renderer-development.md b/docs/guides/renderer-development.md
index 470b9171ca..6fd1cf763a 100644
--- a/docs/guides/renderer-development.md
+++ b/docs/guides/renderer-development.md
@@ -8,7 +8,7 @@ This document outlines the required features for a new renderer implementation o
 
 ## Web Renderers: Use `@a2ui/web_core` (`web_core`)
 
-If you're building a renderer for the web (React, Vue, Svelte, etc.), you don't need to implement message processing, state management, or schema validation from scratch. The **[`@a2ui/web_core`](https://github.com/google/A2UI/tree/main/renderers/web_core)** package (`web_core`) provides all the framework-agnostic logic that the maintained Lit, Angular, and React renderers share.
+If you're building a renderer for the web (React, Vue, Svelte, etc.), you don't need to implement message processing, state management, or schema validation from scratch. The **[`@a2ui/web_core`](https://github.com/a2ui-project/a2ui/tree/main/renderers/web_core)** package (`web_core`) provides all the framework-agnostic logic that the maintained Lit, Angular, and React renderers share.
 
 ### What `web_core` provides
 
@@ -47,7 +47,7 @@ Your renderer only needs to:
 2. **Subscribe to state changes** from `web_core` and re-render
 3. **Forward user actions** back through the `MessageProcessor`
 
-See the [React renderer](https://github.com/google/A2UI/tree/main/renderers/react), [Lit renderer](https://github.com/google/A2UI/tree/main/renderers/lit), and [Angular renderer](https://github.com/google/A2UI/tree/main/renderers/angular) for working examples of this pattern.
+See the [React renderer](https://github.com/a2ui-project/a2ui/tree/main/renderers/react), [Lit renderer](https://github.com/a2ui-project/a2ui/tree/main/renderers/lit), and [Angular renderer](https://github.com/a2ui-project/a2ui/tree/main/renderers/angular) for working examples of this pattern.
 
 ### Version support
 
diff --git a/docs/guides/theming.md b/docs/guides/theming.md
index 33a5873bcf..aa7b70a396 100644
--- a/docs/guides/theming.md
+++ b/docs/guides/theming.md
@@ -61,7 +61,7 @@ renderer and catalog understand.
 
 **Note:** The _basic catalog_ components are not wired to use the `theme` coming from the agent.
 
-_Want to influence this design? Chime in here: [#1118](https://github.com/google/A2UI/issues/1118)._
+_Want to influence this design? Chime in here: [#1118](https://github.com/a2ui-project/a2ui/issues/1118)._
 
 ## Catalog theming
 
diff --git a/docs/index.md b/docs/index.md
index c2fc506f00..c081a42b42 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -29,7 +29,7 @@ A2UI enables AI agents to generate rich, interactive user interfaces that render
 
 A2UI is Apache 2.0 licensed,
 created by Google with contributions from CopilotKit and the open source community,
-and is in active development [on GitHub](https://github.com/google/A2UI).
+and is in active development [on GitHub](https://github.com/a2ui-project/a2ui).
 
 A2UI solves the following problem: **how can AI agents safely send rich UIs across trust boundaries?**
 
diff --git a/docs/quickstart.md b/docs/quickstart.md
index e06bd58758..1f0db9dc04 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -26,7 +26,7 @@ This demo runs an A2A agent that uses Gemini to generate A2UI responses. The age
 ## Step 1: Clone the Repository
 
 ```bash
-git clone https://github.com/google/a2ui.git
+git clone https://github.com/a2ui-project/a2ui.git
 cd a2ui
 ```
 
@@ -241,7 +241,7 @@ If you see errors about missing API keys:
 
 ### Connection Errors on Startup
 
-If you see `ERR_CONNECTION_REFUSED` errors when the browser opens, **don't worry** — this is a known race condition ([#587](https://github.com/google/A2UI/issues/587)). The web app starts faster than the Python agent backend. Just wait a few seconds and refresh the page.
+If you see `ERR_CONNECTION_REFUSED` errors when the browser opens, **don't worry** — this is a known race condition ([#587](https://github.com/a2ui-project/a2ui/issues/587)). The web app starts faster than the Python agent backend. Just wait a few seconds and refresh the page.
 
 ### Python / uv Issues
 
@@ -268,7 +268,7 @@ uv run .
 
 ### Still Having Issues?
 
-- Check the [GitHub Issues](https://github.com/google/a2ui/issues)
+- Check the [GitHub Issues](https://github.com/a2ui-project/a2ui/issues)
 - Review the [samples/client/lit/README.md](../samples/client/lit)
 - Join the community discussions
 
diff --git a/docs/reference/agents.md b/docs/reference/agents.md
index 3c753df3ef..f8601752a2 100644
--- a/docs/reference/agents.md
+++ b/docs/reference/agents.md
@@ -21,16 +21,13 @@ User interactions from the client can be treated as new user input.
 
 The A2UI repository includes sample agents you can learn from:
 
-- [Restaurant Finder](https://github.com/google/A2UI/tree/main/samples/agent/adk/restaurant_finder)
+- [Restaurant Finder](https://github.com/a2ui-project/a2ui/tree/main/samples/agent/adk/restaurant_finder)
     - Table reservations with forms.
     - Written with the ADK.
-- [Contact Lookup](https://github.com/google/A2UI/tree/main/samples/agent/adk/contact_lookup)
-    - Search with result lists.
-    - Written with the ADK.
-- [Rizzcharts](https://github.com/google/A2UI/tree/main/samples/agent/adk/rizzcharts/python)
+- [Rizzcharts](https://github.com/a2ui-project/a2ui/tree/main/samples/agent/adk/rizzcharts/python)
     - A2UI Custom components demo.
     - Written with the ADK.
-- [Orchestrator](https://github.com/google/A2UI/tree/main/samples/agent/adk/orchestrator)
+- [Orchestrator](https://github.com/a2ui-project/a2ui/tree/main/samples/agent/adk/orchestrator)
     - Passes A2UI messages from remote subagents.
     - Written with the ADK.
 
diff --git a/docs/reference/renderers.md b/docs/reference/renderers.md
index c138d3c753..8ecc3e0a77 100644
--- a/docs/reference/renderers.md
+++ b/docs/reference/renderers.md
@@ -16,9 +16,9 @@ You have a lot of flexibility, to bring custom components to a renderer, or buil
 
 | Renderer                 | Platform           | v0.8      | v0.9      | Links                                                                                |
 | ------------------------ | ------------------ | --------- | --------- | ------------------------------------------------------------------------------------ |
-| **React**                | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/google/A2UI/tree/main/renderers/react)                     |
-| **Lit (Web Components)** | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/google/A2UI/tree/main/renderers/lit)                       |
-| **Angular**              | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/google/A2UI/tree/main/renderers/angular)                   |
+| **React**                | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/a2ui-project/a2ui/tree/main/renderers/react)               |
+| **Lit (Web Components)** | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/a2ui-project/a2ui/tree/main/renderers/lit)                 |
+| **Angular**              | Web                | ✅ Stable | ✅ Stable | [Code](https://github.com/a2ui-project/a2ui/tree/main/renderers/angular)             |
 | **Flutter (GenUI SDK)**  | Mobile/Desktop/Web | ✅ Stable | ✅ Stable | [Docs](https://docs.flutter.dev/ai/genui) · [Code](https://github.com/flutter/genui) |
 
 ### Mobile
diff --git a/docs/roadmap.md b/docs/roadmap.md
index dd50803378..0e927ed872 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -180,7 +180,7 @@ A2UI follows [Semantic Versioning](https://semver.org/):
 
 ## Stay Updated
 
-- Watch the [GitHub repository](https://github.com/google/A2UI) for updates
+- Watch the [GitHub repository](https://github.com/a2ui-project/a2ui) for updates
 - Star the repo to show your support
 - Follow releases to get notified of new versions
 
@@ -188,4 +188,4 @@ A2UI follows [Semantic Versioning](https://semver.org/):
 
 **Last Updated:** March 2026
 
-Have questions about the roadmap? [Start a discussion on GitHub](https://github.com/google/A2UI/discussions).
+Have questions about the roadmap? [Start a discussion on GitHub](https://github.com/a2ui-project/a2ui/discussions).
diff --git a/eval/DESIGN.md b/eval/DESIGN.md
index 3081b36051..c5375599ba 100644
--- a/eval/DESIGN.md
+++ b/eval/DESIGN.md
@@ -151,7 +151,7 @@ The A2UI evaluation framework is integrated into the development process using a
 By implementing these strategies, the A2UI project ensures that its evaluation data remains resistant to model memorization while providing a transparent and accessible framework for contributors to measure model performance accurately across the LLM landscape.
 **References**
 
-- [A2UI Repository](https://github.com/google/A2UI)
+- [A2UI Repository](https://github.com/a2ui-project/a2ui)
 - [AI Evaluation: 7 Core Components Enterprises Must Get Right \- Innodata](https://innodata.com/ai-evaluation-7-core-components-enterprises-must-get-right/)
 - [AI Testing 101: A Practical Guide to Skills, Basics & Getting Started \- GSD Council](https://www.gsdcouncil.org/blogs/ai-testing-101-a-practical-guide-to-skills-basics-getting-started)
 - [An Open-Source Data Contamination Report for Large Language Models \- ACL Anthology](https://aclanthology.org/2024.findings-emnlp.30.pdf)
diff --git a/hooks.py b/hooks.py
index 47d3d0db05..653d074896 100644
--- a/hooks.py
+++ b/hooks.py
@@ -15,7 +15,7 @@
 import re
 
 def on_page_markdown(markdown, page, config, files):
-    github_base_url = "https://github.com/google/A2UI/blob/main"
+    github_base_url = "https://github.com/a2ui-project/a2ui/blob/main"
     
     def link_replacer(match):
         if match.group("code"):
diff --git a/mkdocs.yaml b/mkdocs.yaml
index dd4b413baf..8c49839cbe 100644
--- a/mkdocs.yaml
+++ b/mkdocs.yaml
@@ -82,8 +82,8 @@ exclude_docs: |
   scripts/**
 
 # Repository
-repo_name: google/A2UI
-repo_url: https://github.com/google/A2UI
+repo_name: a2ui-project/a2ui
+repo_url: https://github.com/a2ui-project/a2ui
 edit_uri: raw/main/docs/
 
 # Copyright
diff --git a/renderers/angular/CHANGELOG.md b/renderers/angular/CHANGELOG.md
index 31bdff869d..0f771ca265 100644
--- a/renderers/angular/CHANGELOG.md
+++ b/renderers/angular/CHANGELOG.md
@@ -1,26 +1,26 @@
 ## Unreleased
 
-- (v0_9) Fix null de-referencing TypeError in `ComponentBinder` when `children` property is null or undefined. [#1472](https://github.com/google/A2UI/pull/1472)
+- (v0_9) Fix null de-referencing TypeError in `ComponentBinder` when `children` property is null or undefined. [#1472](https://github.com/a2ui-project/a2ui/pull/1472)
 - (v0_8) Fix Icon component to handle camelCase and TitleCase names by converting them to snake_case for `g-icon`.
 - (v0_8) Fix Modal component styling and position fixed for overlay.
-- (v0_9) Remove `placeholder` prop support from the `TextField` component, since it was not part of the v0_9 basic catalog schema. [#1372](https://github.com/google/A2UI/pull/1372)
-- (v0_9) Preserve `checks` property in `ExtendedProps` type. [#1523](https://github.com/google/A2UI/pull/1523)
+- (v0_9) Remove `placeholder` prop support from the `TextField` component, since it was not part of the v0_9 basic catalog schema. [#1372](https://github.com/a2ui-project/a2ui/pull/1372)
+- (v0_9) Preserve `checks` property in `ExtendedProps` type. [#1523](https://github.com/a2ui-project/a2ui/pull/1523)
 
 ## 0.10.0
 
 - **BREAKING CHANGE**: (v0_9) Rename Icon `path` property to `svgPath` to fix type collision and avoid forced casts.
-- **BREAKING CHANGE**: `BoundProperty.raw` is now `unknown` instead of `any`. Recommended migration: replace `raw` access with typed sibling fields where available (e.g. use the new `template` field instead of `raw.componentId`/`raw.path`). [#1312](https://github.com/google/A2UI/pull/1312)
-- **BREAKING CHANGE**: `BoundProperty<T = unknown>`: the default generic is now `unknown` instead of `any`. Recommended migration: provide explicit type arguments (e.g. `BoundProperty<string>`) at usage sites that previously relied on the default. Code typed via `ComponentApiToProps<Api>` is unaffected. [#1312](https://github.com/google/A2UI/pull/1312)
-- `props()['children']?.value()` is now typed `Child[]` (was `Child`, despite runtime always returning an array). [#1312](https://github.com/google/A2UI/pull/1312)
+- **BREAKING CHANGE**: `BoundProperty.raw` is now `unknown` instead of `any`. Recommended migration: replace `raw` access with typed sibling fields where available (e.g. use the new `template` field instead of `raw.componentId`/`raw.path`). [#1312](https://github.com/a2ui-project/a2ui/pull/1312)
+- **BREAKING CHANGE**: `BoundProperty<T = unknown>`: the default generic is now `unknown` instead of `any`. Recommended migration: provide explicit type arguments (e.g. `BoundProperty<string>`) at usage sites that previously relied on the default. Code typed via `ComponentApiToProps<Api>` is unaffected. [#1312](https://github.com/a2ui-project/a2ui/pull/1312)
+- `props()['children']?.value()` is now typed `Child[]` (was `Child`, despite runtime always returning an array). [#1312](https://github.com/a2ui-project/a2ui/pull/1312)
 - (v0_9) Improve type safety of `props()` in Catalog components. Custom catalog
   components should extend the base class `CatalogComponent` from
   `import {CatalogComponent} from '@a2ui/web_core/v0_9/'` or implement the
-  interface `CatalogComponentInstance`. [#1320](https://github.com/google/A2UI/pull/1320)
+  interface `CatalogComponentInstance`. [#1320](https://github.com/a2ui-project/a2ui/pull/1320)
 
 ## 0.9.1
 
 - (v0_9) Re-style the v0_9 catalog components using the default theme from
-  `web_core`. [#1166](https://github.com/google/A2UI/pull/1166)
+  `web_core`. [#1166](https://github.com/a2ui-project/a2ui/pull/1166)
 
 ## 0.8.5
 
diff --git a/renderers/angular/package.json b/renderers/angular/package.json
index 8f37f0733d..0fee84fa3a 100644
--- a/renderers/angular/package.json
+++ b/renderers/angular/package.json
@@ -6,10 +6,10 @@
   "repository": {
     "directory": "renderers/angular",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
   "keywords": [
     "a2ui",
diff --git a/renderers/angular/src/v0_9/catalog/types.ts b/renderers/angular/src/v0_9/catalog/types.ts
index b26ade151e..99f43dc3de 100644
--- a/renderers/angular/src/v0_9/catalog/types.ts
+++ b/renderers/angular/src/v0_9/catalog/types.ts
@@ -23,7 +23,7 @@ import {CatalogComponentInstance} from '../core/catalog_component_instance';
  *
  * To be removed once all properties implemented in Angular basic catalog components conform
  * to the basic catalog schema.
- * @see https://github.com/google/A2UI/issues/1303
+ * @see https://github.com/a2ui-project/a2ui/issues/1303
  */
 export type AnyDuringSchemaAlignment = any;
 
diff --git a/renderers/lit/CHANGELOG.md b/renderers/lit/CHANGELOG.md
index 2feef90fcb..0c8cce098b 100644
--- a/renderers/lit/CHANGELOG.md
+++ b/renderers/lit/CHANGELOG.md
@@ -8,8 +8,8 @@
 ## 0.9.1
 
 - (v0_9) Re-style the v0_9 catalog components using the default theme from
-  `web_core`. [#1079](https://github.com/google/A2UI/pull/1079)
-- (v0_9) Add missing features to ChoicePicker and CheckBox. [#1145](https://github.com/google/A2UI/pull/1145)
+  `web_core`. [#1079](https://github.com/a2ui-project/a2ui/pull/1079)
+- (v0_9) Add missing features to ChoicePicker and CheckBox. [#1145](https://github.com/a2ui-project/a2ui/pull/1145)
 
 ## 0.9.0
 
diff --git a/renderers/lit/README.md b/renderers/lit/README.md
index c9ed2e6fe9..e73f86511e 100644
--- a/renderers/lit/README.md
+++ b/renderers/lit/README.md
@@ -164,17 +164,17 @@ const processor = new MessageProcessor([basicCatalog, myCatalog]);
 ## Basic Catalog Components
 
 The `@a2ui/lit/v0_9` package includes a `basicCatalog` with standard components.
-You can find the full specification of the basic catalog in the [GitHub repository](https://github.com/google/A2UI/blob/main/specification/v0_9/json/catalogs/basic/catalog.json).
+You can find the full specification of the basic catalog in the [GitHub repository](https://github.com/a2ui-project/a2ui/blob/main/specification/v0_9/json/catalogs/basic/catalog.json).
 
 - **Layout**: `Row`, `Column`, `List`, `Card`, `Tabs`, `Modal`, `Divider`
 - **Content**: `Text`, `Image`, `Icon`, `Video`
 - **Input**: `Button`, `TextField`, `CheckBox`, `ChoicePicker`, `Slider`, `DateTimeInput`
 
-You can find the source code for these components in the [GitHub repository](https://github.com/google/A2UI/tree/main/renderers/lit/src/v0_9/catalogs/basic/components).
+You can find the source code for these components in the [GitHub repository](https://github.com/a2ui-project/a2ui/tree/main/renderers/lit/src/v0_9/catalogs/basic/components).
 
 ## Migration from v0.8
 
-If you are migrating an existing application from v0.8 to v0.9, you can reference the migration of the shell sample in [Pull Request #1105](https://github.com/google/A2UI/pull/1105) (commit `a5ad0c328628df6fd8f53aef86f5b3db452ba3a8`).
+If you are migrating an existing application from v0.8 to v0.9, you can reference the migration of the shell sample in [Pull Request #1105](https://github.com/a2ui-project/a2ui/pull/1105) (commit `a5ad0c328628df6fd8f53aef86f5b3db452ba3a8`).
 
 Key changes in that migration included:
 
diff --git a/renderers/lit/package.json b/renderers/lit/package.json
index 43db241134..fbdaae1393 100644
--- a/renderers/lit/package.json
+++ b/renderers/lit/package.json
@@ -8,10 +8,10 @@
   "repository": {
     "directory": "renderers/lit",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
   "keywords": [
     "a2ui",
diff --git a/renderers/markdown/markdown-it/package.json b/renderers/markdown/markdown-it/package.json
index f2137aeb1b..781ca2e72f 100644
--- a/renderers/markdown/markdown-it/package.json
+++ b/renderers/markdown/markdown-it/package.json
@@ -5,10 +5,10 @@
   "repository": {
     "directory": "renderers/markdown/markdown-it",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
   "keywords": [
     "a2ui",
diff --git a/renderers/react/CHANGELOG.md b/renderers/react/CHANGELOG.md
index 77ed7b682a..38ddba09cb 100644
--- a/renderers/react/CHANGELOG.md
+++ b/renderers/react/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 0.10.0
 
 - **BREAKING CHANGE**: (v0_9) Rename Icon `path` property to `svgPath` and update component to correctly render SVG elements.
-- (v0_8) Exclude SVG elements and descendants from CSS reset to restore SVG rendering. [#1252](https://github.com/google/A2UI/pull/1252)
+- (v0_8) Exclude SVG elements and descendants from CSS reset to restore SVG rendering. [#1252](https://github.com/a2ui-project/a2ui/pull/1252)
 - Added license.
 
 ## 0.9.1
@@ -12,7 +12,7 @@
 - **BREAKING CHANGE**: Renamed `createBinderlessComponent` to `createBinderlessComponentImplementation`.
 - **BREAKING CHANGE**: Removed `minimalCatalog`.
 - (v0_9) Re-style the v0_9 catalog components using the default theme from
-  `web_core`. [#1205](https://github.com/google/A2UI/pull/1205)
+  `web_core`. [#1205](https://github.com/a2ui-project/a2ui/pull/1205)
 
 ## 0.8.1
 
diff --git a/renderers/react/package.json b/renderers/react/package.json
index 0ad7597fb7..ce75ef2904 100644
--- a/renderers/react/package.json
+++ b/renderers/react/package.json
@@ -7,10 +7,10 @@
   "repository": {
     "directory": "renderers/react",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
   "keywords": [
     "a2ui",
diff --git a/renderers/web_core/package.json b/renderers/web_core/package.json
index 7364012921..1fb107a6fb 100644
--- a/renderers/web_core/package.json
+++ b/renderers/web_core/package.json
@@ -6,10 +6,10 @@
   "repository": {
     "directory": "renderers/web_core",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
   "keywords": [
     "a2ui",
diff --git a/samples/agent/adk/rizzcharts/catalog_schemas/0.8/rizzcharts_catalog_definition.json b/samples/agent/adk/rizzcharts/catalog_schemas/0.8/rizzcharts_catalog_definition.json
index 0f1c0b6357..b2d035ccc0 100644
--- a/samples/agent/adk/rizzcharts/catalog_schemas/0.8/rizzcharts_catalog_definition.json
+++ b/samples/agent/adk/rizzcharts/catalog_schemas/0.8/rizzcharts_catalog_definition.json
@@ -1,5 +1,5 @@
 {
-  "catalogId": "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
+  "catalogId": "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
   "components": {
     "Text": {
       "type": "object",
diff --git a/samples/agent/adk/rizzcharts/catalog_schemas/0.9/rizzcharts_catalog_definition.json b/samples/agent/adk/rizzcharts/catalog_schemas/0.9/rizzcharts_catalog_definition.json
index 9024b59357..c25303af58 100644
--- a/samples/agent/adk/rizzcharts/catalog_schemas/0.9/rizzcharts_catalog_definition.json
+++ b/samples/agent/adk/rizzcharts/catalog_schemas/0.9/rizzcharts_catalog_definition.json
@@ -1,5 +1,5 @@
 {
-  "catalogId": "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
+  "catalogId": "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
   "components": {
     "Text": {
       "type": "object",
diff --git a/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/chart.json b/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/chart.json
index 454ae97101..2e20e3c743 100644
--- a/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/chart.json
+++ b/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/chart.json
@@ -3,7 +3,7 @@
     "version": "v0.9",
     "createSurface": {
       "surfaceId": "sales-dashboard",
-      "catalogId": "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
+      "catalogId": "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
     }
   },
   {
diff --git a/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/map.json b/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/map.json
index ed94a01081..7374121d8e 100644
--- a/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/map.json
+++ b/samples/agent/adk/rizzcharts/examples/rizzcharts_catalog/0.9/map.json
@@ -3,7 +3,7 @@
     "version": "v0.9",
     "createSurface": {
       "surfaceId": "la-map-view",
-      "catalogId": "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
+      "catalogId": "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
     }
   },
   {
diff --git a/samples/agent/adk/rizzcharts/java/src/main/java/com/google/a2ui/samples/rizzcharts/RizzchartsMain.java b/samples/agent/adk/rizzcharts/java/src/main/java/com/google/a2ui/samples/rizzcharts/RizzchartsMain.java
index 4b6da974e6..85b46dbd07 100644
--- a/samples/agent/adk/rizzcharts/java/src/main/java/com/google/a2ui/samples/rizzcharts/RizzchartsMain.java
+++ b/samples/agent/adk/rizzcharts/java/src/main/java/com/google/a2ui/samples/rizzcharts/RizzchartsMain.java
@@ -67,7 +67,7 @@ public Map<String, Object> handleAgentCardGet() {
         "http://localhost:10002",
         List.of(
             "https://a2ui.org/specification/v0_8/standard_catalog_definition.json",
-            "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"));
+            "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"));
   }
 
   @PostMapping(value = "/", produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/samples/agent/adk/rizzcharts/java/src/main/resources/rizzcharts_catalog_definition.json b/samples/agent/adk/rizzcharts/java/src/main/resources/rizzcharts_catalog_definition.json
index 0f1c0b6357..b2d035ccc0 100644
--- a/samples/agent/adk/rizzcharts/java/src/main/resources/rizzcharts_catalog_definition.json
+++ b/samples/agent/adk/rizzcharts/java/src/main/resources/rizzcharts_catalog_definition.json
@@ -1,5 +1,5 @@
 {
-  "catalogId": "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
+  "catalogId": "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
   "components": {
     "Text": {
       "type": "object",
diff --git a/samples/agent/adk/rizzcharts/kotlin/src/main/kotlin/com/google/a2ui/samples/rizzcharts/RizzchartsMain.kt b/samples/agent/adk/rizzcharts/kotlin/src/main/kotlin/com/google/a2ui/samples/rizzcharts/RizzchartsMain.kt
index 0322468ce1..5a48ff58cb 100644
--- a/samples/agent/adk/rizzcharts/kotlin/src/main/kotlin/com/google/a2ui/samples/rizzcharts/RizzchartsMain.kt
+++ b/samples/agent/adk/rizzcharts/kotlin/src/main/kotlin/com/google/a2ui/samples/rizzcharts/RizzchartsMain.kt
@@ -128,7 +128,7 @@ fun main(args: Array<String>) {
               "http://localhost:10002",
               listOf(
                 "https://a2ui.org/specification/v0_8/standard_catalog_definition.json",
-                "https://raw.githubusercontent.com/google/A2UI/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
+                "https://raw.githubusercontent.com/a2ui-project/a2ui/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json",
               ),
             )
           call.respond(response)
diff --git a/samples/agent/adk/rizzcharts/python/agent.py b/samples/agent/adk/rizzcharts/python/agent.py
index ddc26c12df..5cfd9b1a90 100644
--- a/samples/agent/adk/rizzcharts/python/agent.py
+++ b/samples/agent/adk/rizzcharts/python/agent.py
@@ -41,7 +41,7 @@
 
 logger = logging.getLogger(__name__)
 
-RIZZCHARTS_CATALOG_URI = "https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
+RIZZCHARTS_CATALOG_URI = "https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json"
 
 ROLE_DESCRIPTION = """
 You are an expert A2UI Ecommerce Dashboard analyst. Your primary function is to translate user requests for ecommerce data into A2UI JSON payloads to display charts and visualizations. You MUST use the `send_a2ui_json_to_client` tool with the `a2ui_json` argument set to the A2UI JSON payload to send to the client.
diff --git a/samples/client/angular/projects/gallery/src/app/app.html b/samples/client/angular/projects/gallery/src/app/app.html
index 503a3f576f..5a1852dc1e 100644
--- a/samples/client/angular/projects/gallery/src/app/app.html
+++ b/samples/client/angular/projects/gallery/src/app/app.html
@@ -20,7 +20,7 @@
     <ul>
       <li><a (click)="setView('library')">Library</a></li>
       <li><a (click)="setView('gallery')">Gallery</a></li>
-      <li><a href="https://github.com/google/A2UI">GitHub</a></li>
+      <li><a href="https://github.com/a2ui-project/a2ui">GitHub</a></li>
     </ul>
   </nav>
 </header>
diff --git a/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts b/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
index bd2d0cbb6b..bbf4e1032a 100644
--- a/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
+++ b/samples/client/angular/projects/rizzcharts/src/components/toolbar/toolbar.ts
@@ -51,7 +51,7 @@ export class Toolbar {
     },
     {
       value:
-        'https://github.com/google/A2UI/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json',
+        'https://github.com/a2ui-project/a2ui/blob/main/samples/agent/adk/rizzcharts/rizzcharts_catalog_definition.json',
       viewValue: 'Rizzcharts Custom',
     },
   ];
diff --git a/samples/client/lit/custom-components-example/package.json b/samples/client/lit/custom-components-example/package.json
index d63afd4cfa..a9ed35876b 100644
--- a/samples/client/lit/custom-components-example/package.json
+++ b/samples/client/lit/custom-components-example/package.json
@@ -55,7 +55,7 @@
   "repository": {
     "directory": "samples/client/lit/custom-components-example",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "files": [
     "dist"
@@ -64,9 +64,9 @@
   "author": "Google",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
-  "homepage": "https://github.com/google/A2UI/tree/main/web#readme",
+  "homepage": "https://github.com/a2ui-project/a2ui/tree/main/web#readme",
   "devDependencies": {
     "dotenv": "^17.2.3",
     "typescript": "^5.8.3",
diff --git a/samples/client/lit/mcp-apps-in-a2ui-sample/package.json b/samples/client/lit/mcp-apps-in-a2ui-sample/package.json
index bc7f1809e9..74d5777db4 100644
--- a/samples/client/lit/mcp-apps-in-a2ui-sample/package.json
+++ b/samples/client/lit/mcp-apps-in-a2ui-sample/package.json
@@ -55,7 +55,7 @@
   "repository": {
     "directory": "samples/client/lit/mcp-apps-in-a2ui-sample",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "files": [
     "dist"
@@ -64,9 +64,9 @@
   "author": "Google",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
-  "homepage": "https://github.com/google/A2UI/tree/main/web#readme",
+  "homepage": "https://github.com/a2ui-project/a2ui/tree/main/web#readme",
   "devDependencies": {
     "dotenv": "^17.2.3",
     "typescript": "^5.8.3",
diff --git a/samples/client/lit/shell/package.json b/samples/client/lit/shell/package.json
index 3aa0acea8d..304f546dc1 100644
--- a/samples/client/lit/shell/package.json
+++ b/samples/client/lit/shell/package.json
@@ -56,7 +56,7 @@
   "repository": {
     "directory": "samples/client/lit/shell",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "files": [
     "dist"
@@ -65,9 +65,9 @@
   "author": "Google",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
-  "homepage": "https://github.com/google/A2UI/tree/main/web#readme",
+  "homepage": "https://github.com/a2ui-project/a2ui/tree/main/web#readme",
   "devDependencies": {
     "dotenv": "^17.2.3",
     "typescript": "^5.8.3",
diff --git a/specification/v0_10/README.md b/specification/v0_10/README.md
index f7926d039f..a4dc92136d 100644
--- a/specification/v0_10/README.md
+++ b/specification/v0_10/README.md
@@ -4,7 +4,7 @@ This directory contains the specification for version 0.10 of A2UI.
 
 **This specification is currently under development.**
 
-If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/google/A2UI).
+If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/a2ui-project/a2ui).
 
 ## Documentation
 
diff --git a/specification/v0_10/docs/a2ui_protocol.md b/specification/v0_10/docs/a2ui_protocol.md
index d84e3b65f2..856144187e 100644
--- a/specification/v0_10/docs/a2ui_protocol.md
+++ b/specification/v0_10/docs/a2ui_protocol.md
@@ -28,7 +28,7 @@ Communication occurs via a stream of JSON objects. The renderer parses each obje
 - `updateDataModel`: Provides new data to be inserted into or to replace a surface's data model.
 - `deleteSurface`: Explicitly removes a surface and its contents from the UI.
 
-End of agent turn is signaled by [transport layer](https://github.com/google/A2UI/tree/main/docs/concepts/transports.md).
+End of agent turn is signaled by [transport layer](https://github.com/a2ui-project/a2ui/tree/main/docs/concepts/transports.md).
 
 ## Changes from previous versions
 
diff --git a/specification/v0_8/README.md b/specification/v0_8/README.md
index 96e0f865b1..c16612cd67 100644
--- a/specification/v0_8/README.md
+++ b/specification/v0_8/README.md
@@ -4,7 +4,7 @@ This directory contains the specification for version 0.8.2 of A2UI, a previous
 
 **This specification is closed.**
 
-Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/google/A2UI) for the specification currently in development.
+Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/a2ui-project/a2ui) for the specification currently in development.
 
 ## v0.8.2 Documentation
 
diff --git a/specification/v0_9/README.md b/specification/v0_9/README.md
index 72f9b7c86d..597ce54022 100644
--- a/specification/v0_9/README.md
+++ b/specification/v0_9/README.md
@@ -4,7 +4,7 @@ This directory contains the specification for version 0.9 of A2UI, is the curren
 
 **This specification is closed.**
 
-Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/google/A2UI) for the [v0.10 specification](../v0_10).
+Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/a2ui-project/a2ui) for the [v0.10 specification](../v0_10).
 
 ## v0.9 Documentation
 
diff --git a/specification/v0_9_1/README.md b/specification/v0_9_1/README.md
index c5438ffae8..7f33f74659 100644
--- a/specification/v0_9_1/README.md
+++ b/specification/v0_9_1/README.md
@@ -4,7 +4,7 @@ This directory contains the specification for version 0.9 of A2UI, is the curren
 
 **This specification is closed.**
 
-Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/google/A2UI) for the [v0.10 specification](../v0_10).
+Please do not propose changes here. If you have proposed changes or new features, please open an issue or submit a pull request to the [A2UI repository](https://github.com/a2ui-project/a2ui) for the [v0.10 specification](../v0_10).
 
 ## v0.9 Documentation
 
diff --git a/tools/build_catalog/assemble_catalog.py b/tools/build_catalog/assemble_catalog.py
index 4f27829c19..e34729f0bb 100644
--- a/tools/build_catalog/assemble_catalog.py
+++ b/tools/build_catalog/assemble_catalog.py
@@ -51,14 +51,14 @@ def is_remote_uri(uri: str) -> bool:
 
 
 BASIC_CATALOG_URLS = {
-    "0.8": "https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_8/json/standard_catalog_definition.json",
-    "0.9": "https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_9/catalogs/basic/catalog.json",
-    "0.10": "https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_10/catalogs/basic/catalog.json"
+    "0.8": "https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_8/json/standard_catalog_definition.json",
+    "0.9": "https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_9/catalogs/basic/catalog.json",
+    "0.10": "https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_10/catalogs/basic/catalog.json"
 }
 
 COMMON_TYPES_URLS = {
-    "0.9": "https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_9/json/common_types.json",
-    "0.10": "https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_10/json/common_types.json"
+    "0.9": "https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_9/json/common_types.json",
+    "0.10": "https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_10/json/common_types.json"
 }
 
 
diff --git a/tools/build_catalog/tests/test_assemble_catalog_v08.py b/tools/build_catalog/tests/test_assemble_catalog_v08.py
index 255b8afc1e..14ebfa7f00 100644
--- a/tools/build_catalog/tests/test_assemble_catalog_v08.py
+++ b/tools/build_catalog/tests/test_assemble_catalog_v08.py
@@ -74,7 +74,7 @@ def test_v08_remote_fallback(self, mock_urlopen):
         # Assert urlopen was called with the 0.8 URL
         called_req = mock_urlopen.call_args[0][0]
         self.assertEqual(called_req.full_url, BASIC_CATALOG_URLS["0.8"])
-        self.assertIn("https://raw.githubusercontent.com/google/A2UI/refs/heads/main/specification/v0_8/json/standard_catalog_definition.json", called_req.full_url)
+        self.assertIn("https://raw.githubusercontent.com/a2ui-project/a2ui/refs/heads/main/specification/v0_8/json/standard_catalog_definition.json", called_req.full_url)
 
         self.assertIn("$defs", result)
         self.assertIn("theme", result["$defs"])
diff --git a/tools/editor/package.json b/tools/editor/package.json
index f2fdf5dd92..4d4c3e41d4 100644
--- a/tools/editor/package.json
+++ b/tools/editor/package.json
@@ -48,7 +48,7 @@
   "repository": {
     "directory": "tools/editor",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "files": [
     "dist"
@@ -57,9 +57,9 @@
   "author": "Google",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
-  "homepage": "https://github.com/google/A2UI/tree/main/web#readme",
+  "homepage": "https://github.com/a2ui-project/a2ui/tree/main/web#readme",
   "devDependencies": {
     "dotenv": "^17.2.3",
     "typescript": "^5.8.3",
diff --git a/tools/inspector/package.json b/tools/inspector/package.json
index b24f7bec1d..9d09dd629e 100644
--- a/tools/inspector/package.json
+++ b/tools/inspector/package.json
@@ -55,7 +55,7 @@
   "repository": {
     "directory": "tools/inspector",
     "type": "git",
-    "url": "git+https://github.com/google/A2UI.git"
+    "url": "git+https://github.com/a2ui-project/a2ui.git"
   },
   "files": [
     "dist"
@@ -64,9 +64,9 @@
   "author": "Google",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/google/A2UI/issues"
+    "url": "https://github.com/a2ui-project/a2ui/issues"
   },
-  "homepage": "https://github.com/google/A2UI/tree/main/web#readme",
+  "homepage": "https://github.com/a2ui-project/a2ui/tree/main/web#readme",
   "devDependencies": {
     "dotenv": "^17.2.3",
     "typescript": "^5.8.3",