diff --git a/bindery-core/test/templates.test.ts b/bindery-core/test/templates.test.ts
index f0cc168..38505ef 100644
--- a/bindery-core/test/templates.test.ts
+++ b/bindery-core/test/templates.test.ts
@@ -414,9 +414,9 @@ describe('renderTemplate — translation-review skill', () => {
     const result = renderTemplate('translation-review', makeCtx());
     expect(result).toContain('recent conversation');
     expect(result).toContain('ask the user if ambiguous');
-    expect(result).toContain('search(query, targetLanguage)');
-    expect(result).toContain('add_translation');
-    expect(result).toContain('call `add_translation` before moving on');
+    expect(result).toContain('bindery_search(query, targetLanguage)');
+    expect(result).toContain('bindery_add_translation');
+    expect(result).toContain('call `bindery_add_translation` before moving on');
   });
 
   it('mentions review markers and the two-section response shape', () => {
@@ -437,10 +437,10 @@ describe('renderTemplate — status skill', () => {
     expect(result).toContain('## Steps');
   });
 
-  it('references get_overview and session_focus_get tools', () => {
+  it('references bindery_get_overview and bindery_session_focus_get tools', () => {
     const result = renderTemplate('status', makeCtx());
-    expect(result).toContain('session_focus_get');
-    expect(result).toContain('get_overview');
+    expect(result).toContain('bindery_session_focus_get');
+    expect(result).toContain('bindery_get_overview');
   });
 });
 
@@ -495,10 +495,10 @@ describe('renderTemplate — read-in skill', () => {
     expect(result).toContain('## Rules');
   });
 
-  it('references memory_list and get_overview tools', () => {
+  it('references bindery_memory_list and bindery_get_overview tools', () => {
     const result = renderTemplate('read-in', makeCtx());
-    expect(result).toContain('memory_list');
-    expect(result).toContain('get_overview');
+    expect(result).toContain('bindery_memory_list');
+    expect(result).toContain('bindery_get_overview');
   });
 
   it('references the memories folder', () => {
@@ -525,25 +525,25 @@ describe('renderTemplate — bindery-readme', () => {
     const result = renderTemplate('bindery-readme', makeCtx());
     expect(result).toContain('SESSION.md');
     expect(result).toContain('PREFERENCES.md');
-    expect(result).toContain('session_focus_update');
+    expect(result).toContain('bindery_session_focus_update');
     expect(result).toContain('Arc/index.md');
     expect(result).toContain('Arc/Overall.md');
     expect(result).toContain('Notes/Characters/index.md');
-    expect(result).toContain('init_workspace');
-    expect(result).toContain('setup_ai_files');
+    expect(result).toContain('bindery_init_workspace');
+    expect(result).toContain('bindery_setup_ai_files');
     expect(result).toContain('/plan-beats');
     expect(result).toContain('/character-setup');
-    expect(result).toContain('note_list');
-    expect(result).toContain('note_append');
-    expect(result).toContain('character_list');
-    expect(result).toContain('arc_create');
+    expect(result).toContain('bindery_note_list');
+    expect(result).toContain('bindery_note_append');
+    expect(result).toContain('bindery_character_list');
+    expect(result).toContain('bindery_arc_create');
     expect(result).toContain('List/Create/Append Notes');
     expect(result).toContain('List/Create/Update Character Profile');
     expect(result).toContain('List/Create/Update Arc File');
     expect(result).toContain('Show/Update Session Focus');
-    expect(result).toContain('session_focus_get');
-    expect(result).toContain('inbox_process');
-    expect(result).toContain('inbox_resolve');
+    expect(result).toContain('bindery_session_focus_get');
+    expect(result).toContain('bindery_inbox_process');
+    expect(result).toContain('bindery_inbox_resolve');
     expect(result).toContain('never edits it');
     expect(result).not.toContain('session-focus/COWORK tools are not available yet');
   });
diff --git a/mcp-ts/src/tools.ts b/mcp-ts/src/tools.ts
index c94de5e..0250112 100644
--- a/mcp-ts/src/tools.ts
+++ b/mcp-ts/src/tools.ts
@@ -2897,14 +2897,14 @@ export function toolInboxProcess(root: string): string {
     lines.push(
         '## How to triage',
         'Propose a destination for each item, confirm with the user, then route confirmed items with the matching tool:',
-        '- Story note → `note_create` / `note_append` (World, Scenes, Research, or a custom category)',
-        '- Character → `character_create` / `character_update`',
-        '- Arc / structure → `arc_create` / `arc_update`',
-        '- Durable cross-session decision → `memory_append`',
-        '- Current focus / next action / handoff → `session_focus_update`',
+        '- Story note → `bindery_note_create` / `bindery_note_append` (World, Scenes, Research, or a custom category)',
+        '- Character → `bindery_character_create` / `bindery_character_update`',
+        '- Arc / structure → `bindery_arc_create` / `bindery_arc_update`',
+        '- Durable cross-session decision → `bindery_memory_append`',
+        '- Current focus / next action / handoff → `bindery_session_focus_update`',
         '',
         'Do not move, delete, or categorize anything without the user\'s confirmation. ' +
-        'After confirmed items are routed, call `inbox_resolve` with their item numbers to remove them from the inbox. ' +
+        'After confirmed items are routed, call `bindery_inbox_resolve` with their item numbers to remove them from the inbox. ' +
         'Items left unconfirmed stay in the inbox.',
     );
     return lines.join('\n');