diff --git a/modules/home/programs/terminal/pi/config/extensions/replace-pi-with-claude-code.ts b/modules/home/programs/terminal/pi/config/extensions/replace-pi-with-claude-code.ts
index 82787c5..f3e980f 100644
--- a/modules/home/programs/terminal/pi/config/extensions/replace-pi-with-claude-code.ts
+++ b/modules/home/programs/terminal/pi/config/extensions/replace-pi-with-claude-code.ts
@@ -8,11 +8,10 @@ export default function replacePiWithClaudeCodeExtension(pi: ExtensionAPI) {
       return undefined;
     }
 
-    // Replace "pi" With "claude code" - Exclude Literal ".pi" (e.g. Paths)
-    // And "pi-coding-agent" (Package Name)
+    // Replace "pi" With "claude code"
     const transformedSystemPrompt = event.systemPrompt.replace(
-      /(?<!\.)pi(?!-coding-agent)/gi,
-      "claude code",
+      /(^|\s)pi(?![\w-])/gi,
+      "$1claude code",
     );
 
     if (transformedSystemPrompt === event.systemPrompt) {