diff --git a/.github/workflows/reset-current-step.yml b/.github/workflows/reset-current-step.yml
index 66d9c15..a2a7115 100644
--- a/.github/workflows/reset-current-step.yml
+++ b/.github/workflows/reset-current-step.yml
@@ -1,7 +1,7 @@
 name: Reset current step
 
 # Re-lay the CURRENT step's clean starter files and re-render its README, without
-# moving to another step. This is the companion to "Sync template infra": sync
+# moving to another step. This is the companion to "Sync workshop machinery": sync
 # refreshes the workshop machinery (.workshop/ and .github/) while leaving your
 # step files and README untouched; this workflow then refreshes the delivery for
 # the step you are on. Your travel_assistant/ edits are backed up first, under
diff --git a/.github/workflows/sync-template.yml b/.github/workflows/sync-template.yml
index a059bce..65056d8 100644
--- a/.github/workflows/sync-template.yml
+++ b/.github/workflows/sync-template.yml
@@ -1,4 +1,4 @@
-name: Sync template infra
+name: Sync workshop machinery
 
 # Pull the latest workshop machinery (.workshop/ and .github/) from the upstream
 # template into this instance WITHOUT advancing the current step. Participant work
@@ -124,7 +124,7 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           # The [skip-advance] sentinel keeps advance-on-push.yml from advancing.
           # Keep it in sync with SKIP_ADVANCE_SENTINEL in sync_template.py.
-          git commit -q -m "workshop: sync template infra from upstream [skip-advance]"
+          git commit -q -m "workshop: sync machinery from upstream [skip-advance]"
           git push
 
       - name: Summarize
@@ -142,7 +142,7 @@ jobs:
             echo "" >> "$GITHUB_STEP_SUMMARY"
             echo "Re-run with **Dry run = false** to apply the changes above." >> "$GITHUB_STEP_SUMMARY"
           elif [[ "$CHANGED" == "true" ]]; then
-            echo "## ✅ Template infra synced" >> "$GITHUB_STEP_SUMMARY"
+            echo "## ✅ Workshop machinery synced" >> "$GITHUB_STEP_SUMMARY"
             echo "" >> "$GITHUB_STEP_SUMMARY"
             echo "Pulled the latest \`.workshop/\` and \`.github/\` (excluding \`.github/workflows/\`) from \`${UPSTREAM_REF}\` of \`${UPSTREAM_URL}\`." >> "$GITHUB_STEP_SUMMARY"
             echo "Your current step was preserved. Run \`git pull\` locally to refresh." >> "$GITHUB_STEP_SUMMARY"
diff --git a/.workshop/scripts/sync_template.py b/.workshop/scripts/sync_template.py
index f31d6fa..64bc582 100644
--- a/.workshop/scripts/sync_template.py
+++ b/.workshop/scripts/sync_template.py
@@ -1,4 +1,4 @@
-"""Sync workshop infrastructure from the upstream template into this instance.
+"""Sync workshop machinery from the upstream template into this instance.
 
 A workshop *instance* (a repo created from the template) sometimes needs the
 latest workshop machinery — the authoring material under ``.workshop/`` and the
@@ -82,7 +82,7 @@
 # moves the workshop to the next step. Keep it in sync with the check in
 # .github/workflows/advance-on-push.yml.
 SKIP_ADVANCE_SENTINEL = "[skip-advance]"
-COMMIT_MESSAGE = f"workshop: sync template infra from upstream {SKIP_ADVANCE_SENTINEL}"
+COMMIT_MESSAGE = f"workshop: sync machinery from upstream {SKIP_ADVANCE_SENTINEL}"
 
 # The workflow that enforces the "sync must not advance" contract. Before we
 # adopt a new .github/ tree we verify the upstream copy of this file still honors