diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index 8537aed9f..2953d78f2 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -86,12 +86,12 @@
 
       # Function-based abbreviations
       cliproxyapi = "_cliproxyapi_function";
+      cltxe = "_cltxe_function";
+      cltxeh = "_cltxeh_function";
+      clwxe = "_clwxe_function";
+      clwxeh = "_clwxeh_function";
       clxe = "_clxe_function";
       clxeh = "_clxeh_function";
-      clxte = "_clxte_function";
-      clxteh = "_clxteh_function";
-      clxwe = "_clxwe_function";
-      clxweh = "_clxweh_function";
       coxe = "_coxe_function";
       coxeh = "_coxeh_function";
       coxel = "_coxel_function";
@@ -180,12 +180,12 @@
       })
       [
         "_cliproxyapi_function"
+        "_cltxe_function"
+        "_cltxeh_function"
+        "_clwxe_function"
+        "_clwxeh_function"
         "_clxe_function"
         "_clxeh_function"
-        "_clxte_function"
-        "_clxteh_function"
-        "_clxwe_function"
-        "_clxweh_function"
         "_coxe_function"
         "_coxeh_function"
         "_coxel_function"
diff --git a/home-manager/programs/fish/functions/_clxte_function.fish b/home-manager/programs/fish/functions/_cltxe_function.fish
similarity index 100%
rename from home-manager/programs/fish/functions/_clxte_function.fish
rename to home-manager/programs/fish/functions/_cltxe_function.fish
diff --git a/home-manager/programs/fish/functions/_clxteh_function.fish b/home-manager/programs/fish/functions/_cltxeh_function.fish
similarity index 77%
rename from home-manager/programs/fish/functions/_clxteh_function.fish
rename to home-manager/programs/fish/functions/_cltxeh_function.fish
index ffd6db372..a0fc446ef 100644
--- a/home-manager/programs/fish/functions/_clxteh_function.fish
+++ b/home-manager/programs/fish/functions/_cltxeh_function.fish
@@ -1,6 +1,6 @@
-function _clxteh_function --description "Run Claude Code headlessly with a prompted input with tmux integration"
+function _cltxeh_function --description "Run Claude Code headlessly with a prompted input with tmux integration"
   # Prompt for input and run Claude Code
-  # Usage: clxteh
+  # Usage: cltxeh
 
   read -P "Prompt: " prompt
   if test -z "$prompt"
diff --git a/home-manager/programs/fish/functions/_clxwe_function.fish b/home-manager/programs/fish/functions/_clwxe_function.fish
similarity index 79%
rename from home-manager/programs/fish/functions/_clxwe_function.fish
rename to home-manager/programs/fish/functions/_clwxe_function.fish
index 08ee90ff7..7ffea712b 100644
--- a/home-manager/programs/fish/functions/_clxwe_function.fish
+++ b/home-manager/programs/fish/functions/_clwxe_function.fish
@@ -1,6 +1,6 @@
-function _clxwe_function --description "Run Claude Code with a free-form prompt while skipping permissions with git worktree integration"
+function _clwxe_function --description "Run Claude Code with a free-form prompt while skipping permissions with git worktree integration"
   # Run Claude Code with a free-form prompt (spaces allowed) and bypass permission checks
-  # Usage: clxwe [<prompt words...>]
+  # Usage: clwxe [<prompt words...>]
 
   if test (count $argv) -eq 0
     claude --dangerously-skip-permissions --worktree
diff --git a/home-manager/programs/fish/functions/_clxweh_function.fish b/home-manager/programs/fish/functions/_clwxeh_function.fish
similarity index 78%
rename from home-manager/programs/fish/functions/_clxweh_function.fish
rename to home-manager/programs/fish/functions/_clwxeh_function.fish
index aab7f8621..8e20c38cb 100644
--- a/home-manager/programs/fish/functions/_clxweh_function.fish
+++ b/home-manager/programs/fish/functions/_clwxeh_function.fish
@@ -1,6 +1,6 @@
-function _clxweh_function --description "Run Claude Code headlessly with a prompted input with git worktree integration"
+function _clwxeh_function --description "Run Claude Code headlessly with a prompted input with git worktree integration"
   # Prompt for input and run Claude Code
-  # Usage: clxweh
+  # Usage: clwxeh
 
   read -P "Prompt: " prompt
   if test -z "$prompt"