diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 777ded7..f394573 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,7 +1,7 @@
 name: Deploy
 
 # Push to main → deploy this app to bitbaum. All the logic lives in one
-# place: maonakamoto/fleetcrown/.github/workflows/selfhost-deploy.yml
+# place: bitbaum/fleetcrown/.github/workflows/selfhost-deploy.yml
 # (docs: docs/infrastructure/self-host-cd.md there). It waits for this
 # commit's own CI to go green before anything reaches the box.
 
@@ -12,7 +12,7 @@ on:
 
 jobs:
   deploy:
-    uses: maonakamoto/fleetcrown/.github/workflows/selfhost-deploy.yml@main
+    uses: bitbaum/fleetcrown/.github/workflows/selfhost-deploy.yml@main
     with:
       app: petvity
     secrets: inherit
diff --git a/.mailmap b/.mailmap
index fc2e473..64baa93 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
-Mao Nakamoto <41178744+maonakamoto@users.noreply.github.com> <41178744+g-but@users.noreply.github.com>
-Mao Nakamoto <41178744+maonakamoto@users.noreply.github.com> g-but <41178744+g-but@users.noreply.github.com>
+Mao Nakamoto <41178744+catomean@users.noreply.github.com> <41178744+g-but@users.noreply.github.com>
+Mao Nakamoto <41178744+catomean@users.noreply.github.com> g-but <41178744+g-but@users.noreply.github.com>
+Mao Nakamoto <41178744+catomean@users.noreply.github.com> <41178744+maonakamoto@users.noreply.github.com>
diff --git a/scripts/ci/auto-merge-sweep.sh b/scripts/ci/auto-merge-sweep.sh
index 6fbeb63..4a9334e 100644
--- a/scripts/ci/auto-merge-sweep.sh
+++ b/scripts/ci/auto-merge-sweep.sh
@@ -93,7 +93,7 @@ else
   # base quietly collecting more of them and getting harder to diagnose. But
   # when the PR *is* the repair, the same rule deadlocks the repo — the fix
   # cannot travel the path its own redness blocks, and only a human can move
-  # it. Seen in maonakamoto/aoz-housing on 2026-08-07: E2E red on the base, the
+  # it. Seen in bitbaum/aoz-housing on 2026-08-07: E2E red on the base, the
   # fix sitting green in a PR, every sweep refusing politely.
   #
   # So identify WHICH jobs are red and let a PR through only if its own checks
@@ -128,7 +128,7 @@ merged_any=0
 
 # OLDEST FIRST. `gh pr list` returns newest-first, and this loop merges the
 # first eligible PR and stops — so the newest green PR wins every sweep and an
-# older one can wait indefinitely. Observed in maonakamoto/fleetcrown on
+# older one can wait indefinitely. Observed in bitbaum/fleetcrown on
 # 2026-08-06: two consecutive sweeps merged the two newest PRs while three
 # older green ones were never even evaluated. With several agent sessions
 # opening PRs continuously, "newest wins" is starvation, and it starves the PR