diff --git a/.claude/skills/generate_and_merge/SKILL.md b/.claude/skills/generate_and_merge/SKILL.md
index 3b18fca2..ed443c47 100644
--- a/.claude/skills/generate_and_merge/SKILL.md
+++ b/.claude/skills/generate_and_merge/SKILL.md
@@ -19,7 +19,7 @@ Build notebooks for the autofit_workspace, then open and merge a PR into `main`,
 
    Run from the workspace root:
    ```bash
-   PYTHONPATH=../PyAutoHands/autobuild python3 ../PyAutoHands/autobuild/generate.py autofit
+   PYTHONPATH=../PyAutoHands/autohands python3 ../PyAutoHands/autohands/generate.py autofit
    ```
    This regenerates all notebooks in `notebooks/` from `scripts/`. It may take a few minutes.
    It also regenerates the LLM-facing catalogue (`llms-full.txt` and `workspace_index.json`)
diff --git a/.github/scripts/run_smoke.py b/.github/scripts/run_smoke.py
index 98ad946a..8806bcf4 100644
--- a/.github/scripts/run_smoke.py
+++ b/.github/scripts/run_smoke.py
@@ -139,7 +139,7 @@ def regenerate_notebook(nb_rel: str) -> Path:
     The regenerated copy lives in /tmp; the on-disk `notebooks/` tree is
     never modified, so a smoke run leaves the worktree clean.
     """
-    from build_util import py_to_notebook  # PyAutoHands/autobuild on PYTHONPATH
+    from build_util import py_to_notebook  # PyAutoHands/autohands on PYTHONPATH
 
     script_path = SCRIPTS_DIR / Path(nb_rel).with_suffix(".py")
     if not script_path.exists():
diff --git a/.github/workflows/navigator_check.yml b/.github/workflows/navigator_check.yml
index 90d172d7..1480a41c 100644
--- a/.github/workflows/navigator_check.yml
+++ b/.github/workflows/navigator_check.yml
@@ -2,7 +2,7 @@ name: Navigator Check
 
 # Thin caller for PyAutoHands's reusable navigator-catalogue check. The check
 # logic (path/banner lint + catalogue staleness) and its entrypoints live in
-# PyAutoHands/autobuild; this workspace only declares which generator project to
+# PyAutoHands/autohands; this workspace only declares which generator project to
 # run. See PyAutoLabs/PyAutoHands/.github/workflows/navigator_check.yml.
 
 on: [push, pull_request]
diff --git a/AGENTS.md b/AGENTS.md
index d76e7d6b..3a2ec4ec 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -100,7 +100,7 @@ root):
 ```bash
 pip install ipynb-py-convert
 git clone https://github.com/PyAutoLabs/PyAutoHands.git ../PyAutoHands
-PYTHONPATH=../PyAutoHands/autobuild python3 ../PyAutoHands/autobuild/generate.py autofit
+PYTHONPATH=../PyAutoHands/autohands python3 ../PyAutoHands/autohands/generate.py autofit
 ```
 
 Commit the regenerated notebooks alongside the script changes. The `/generate_and_merge` skill
diff --git a/config/build/visualise_notebooks.yaml b/config/build/visualise_notebooks.yaml
index 032daa12..52e59de5 100644
--- a/config/build/visualise_notebooks.yaml
+++ b/config/build/visualise_notebooks.yaml
@@ -4,7 +4,7 @@
 # Format: flat list of notebook stems (no extension, no path).
 # An empty list means no notebooks need re-visualisation in this workspace.
 #
-# This file overrides PyAutoHands/autobuild/config/visualise_notebooks.yaml
+# This file overrides PyAutoHands/autohands/config/visualise_notebooks.yaml
 # for this workspace. Add or remove entries here, not there.
 
 []