diff --git a/context-restore/SKILL.md.tmpl b/context-restore/SKILL.md.tmpl
index 9c5fef1fa..bfcdb13d7 100644
--- a/context-restore/SKILL.md.tmpl
+++ b/context-restore/SKILL.md.tmpl
@@ -7,9 +7,7 @@ description: |
   saved state (preferring the current branch, falling back across branches) so
   you can pick up where you left off — even across Conductor workspace handoffs.
   Use when asked to "resume", "restore context", "where was I", or
-  "pick up where I left off". Pair with /context-save.
-  Formerly /checkpoint resume — renamed because Claude Code treats /checkpoint
-  as a native rewind alias in current environments. (gstack)
+  "pick up where I left off". Pair with /context-save. (gstack)
 allowed-tools:
   - Bash
   - Read
@@ -55,7 +53,7 @@ branch.)
 
 Parse the user's input:
 
-- `/context-restore` → load the most recent saved context (any branch)
+- `/context-restore` → load the most recent saved context (current branch first, then any branch)
 - `/context-restore <title-fragment-or-number>` → load a specific saved context
 - `/context-restore list` → tell the user "Use `/context-save list` — listing
   lives on the save side" and exit. No mode detection here.
@@ -234,9 +232,9 @@ in the old bucket until the user copies them with `gstack-slug --adopt-legacy`.
 
 - **Never modify code.** This skill only reads saved files and presents them.
 - **Prefer the current branch's own checkpoint, but keep all branches in the
-  fallback set.** Cross-branch resume (Conductor handoff) still works when the
-  current branch has no checkpoint; it just no longer lets a sibling worktree's
-  newer save shadow this branch's own.
+  fallback set.** Cross-branch resume (Conductor handoff) works when the
+  current branch has no checkpoint, and a sibling worktree's newer save never
+  shadows this branch's own.
 - **Never present another project's checkpoint as "latest".** Identity is the
   canonical remote (the root only when there is no remote); a mismatch is
   reported before any summary.
diff --git a/context-save/SKILL.md.tmpl b/context-save/SKILL.md.tmpl
index b0d3a1a52..cb9e4d9f8 100644
--- a/context-save/SKILL.md.tmpl
+++ b/context-save/SKILL.md.tmpl
@@ -7,8 +7,6 @@ description: |
   so any future session can pick up without losing a beat.
   Use when asked to "save progress", "save state", "context save", or
   "save my work". Pair with /context-restore to resume later.
-  Formerly /checkpoint — renamed because Claude Code treats /checkpoint as a
-  native rewind alias in current environments, which was shadowing this skill.
   (gstack)
 allowed-tools:
   - Bash
@@ -48,7 +46,7 @@ If the user provides a title after the command (e.g., `/context-save auth refact
 use it as the title. Otherwise, infer a title from the current work.
 
 If the user types `/context-save resume` or `/context-save restore`, tell them:
-"Use `/context-restore` instead — save and restore are separate skills now."
+"Use `/context-restore` to resume — restoring is a separate skill."
 
 ---
 
@@ -184,8 +182,7 @@ modified files). Use relative paths from the repo root. Do not write `remote:` o
 `project_root:` yourself; the stamp step below adds them.
 
 Then stamp the project identity. Several projects can share one checkpoints
-directory (GitLab nested groups did before #3003), so `/context-restore` needs to
-know which project wrote each file. The helper adds `remote:` (canonical origin:
+directory, so `/context-restore` needs to know which project wrote each file. The helper adds `remote:` (canonical origin:
 lowercased host, no credentials, port or `.git`) and `project_root:` to the
 frontmatter:
 
@@ -281,5 +278,4 @@ If there are no saved contexts, tell the user: "No saved contexts yet. Run
 - **Infer, don't interrogate.** Use git state and conversation context to fill in
   the file. Only use AskUserQuestion if the title genuinely cannot be inferred.
 - **This is a gstack skill, not a Claude Code built-in.** When the user types
-  `/context-save`, invoke this skill via the Skill tool. The old `/checkpoint`
-  name collided with Claude Code's native `/rewind` alias — the rename fixed that.
+  `/context-save`, invoke this skill via the Skill tool.