diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index b078bf6d1..8ae9edf13 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -645,7 +645,7 @@ in
           # Support completion for `man` by building a cache for `apropos`.
           programs.man.generateCaches = lib.mkDefault true;
 
-          xdg.dataFile."fish/home-manager_generated_completions".source =
+          xdg.dataFile."fish/home-manager/generated_completions".source =
             let
               # Paths later in the list will overwrite those already linked
               destructiveSymlinkJoin =
@@ -696,7 +696,7 @@ in
               set -l post_joined (string replace $prev_joined "" $joined)
               set -l prev (string split " " (string trim $prev_joined))
               set -l post (string split " " (string trim $post_joined))
-              set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager_generated_completions" $post
+              set fish_complete_path $prev "${config.xdg.dataHome}/fish/home-manager/generated_completions" $post
             end
           '';
         }
diff --git a/tests/modules/programs/atuin/fish.nix b/tests/modules/programs/atuin/fish.nix
index 98e5ac26a..0c9339038 100644
--- a/tests/modules/programs/atuin/fish.nix
+++ b/tests/modules/programs/atuin/fish.nix
@@ -7,7 +7,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/atuin/no-shell.nix b/tests/modules/programs/atuin/no-shell.nix
index 5c09493e3..5972f9088 100644
--- a/tests/modules/programs/atuin/no-shell.nix
+++ b/tests/modules/programs/atuin/no-shell.nix
@@ -14,7 +14,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/atuin/nushell.nix b/tests/modules/programs/atuin/nushell.nix
index 6c1d88cf4..61f6a3c40 100644
--- a/tests/modules/programs/atuin/nushell.nix
+++ b/tests/modules/programs/atuin/nushell.nix
@@ -15,7 +15,7 @@
   _module.args.pkgs = lib.mkForce realPkgs;
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/atuin/set-flags.nix b/tests/modules/programs/atuin/set-flags.nix
index 558717c4a..0815799c1 100644
--- a/tests/modules/programs/atuin/set-flags.nix
+++ b/tests/modules/programs/atuin/set-flags.nix
@@ -16,7 +16,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/fish/binds.nix b/tests/modules/programs/fish/binds.nix
index 99c93e74b..6992bf9bf 100644
--- a/tests/modules/programs/fish/binds.nix
+++ b/tests/modules/programs/fish/binds.nix
@@ -29,7 +29,7 @@
     };
 
     # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+    xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
       builtins.toFile "empty" ""
     );
 
diff --git a/tests/modules/programs/fish/completions.nix b/tests/modules/programs/fish/completions.nix
index 069255d27..905f8bb1f 100644
--- a/tests/modules/programs/fish/completions.nix
+++ b/tests/modules/programs/fish/completions.nix
@@ -25,7 +25,7 @@ in
       };
     };
 
-    xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+    xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
       builtins.toFile "empty" ""
     );
 
diff --git a/tests/modules/programs/fish/functions.nix b/tests/modules/programs/fish/functions.nix
index 4953246a2..82d8048ee 100644
--- a/tests/modules/programs/fish/functions.nix
+++ b/tests/modules/programs/fish/functions.nix
@@ -29,7 +29,7 @@ in
     };
 
     # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+    xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
       builtins.toFile "empty" ""
     );
 
diff --git a/tests/modules/programs/fish/no-functions.nix b/tests/modules/programs/fish/no-functions.nix
index f42c677fc..b2f85114e 100644
--- a/tests/modules/programs/fish/no-functions.nix
+++ b/tests/modules/programs/fish/no-functions.nix
@@ -8,7 +8,7 @@
     };
 
     # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+    xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
       builtins.toFile "empty" ""
     );
 
diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix
index a5d75842f..e9e3f0097 100644
--- a/tests/modules/programs/fish/plugins.nix
+++ b/tests/modules/programs/fish/plugins.nix
@@ -47,7 +47,7 @@ in
     };
 
     # Needed to avoid error with dummy fish package.
-    xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+    xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
       builtins.toFile "empty" ""
     );
 
diff --git a/tests/modules/programs/nix-index/assert-on-command-not-found.nix b/tests/modules/programs/nix-index/assert-on-command-not-found.nix
index 7c6ff5e7e..daef8464d 100644
--- a/tests/modules/programs/nix-index/assert-on-command-not-found.nix
+++ b/tests/modules/programs/nix-index/assert-on-command-not-found.nix
@@ -8,7 +8,7 @@
   programs.command-not-found.enable = true;
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/nix-index/integrations.nix b/tests/modules/programs/nix-index/integrations.nix
index d8211e283..1f4bf0914 100644
--- a/tests/modules/programs/nix-index/integrations.nix
+++ b/tests/modules/programs/nix-index/integrations.nix
@@ -14,7 +14,7 @@ in
   programs.nushell.enable = true;
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/oh-my-posh/fish.nix b/tests/modules/programs/oh-my-posh/fish.nix
index 973e0589d..5f7e8afa9 100644
--- a/tests/modules/programs/oh-my-posh/fish.nix
+++ b/tests/modules/programs/oh-my-posh/fish.nix
@@ -11,7 +11,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/pls/fish.nix b/tests/modules/programs/pls/fish.nix
index 9a11772c8..0069bd131 100644
--- a/tests/modules/programs/pls/fish.nix
+++ b/tests/modules/programs/pls/fish.nix
@@ -12,7 +12,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/powerline-go/fish.nix b/tests/modules/programs/powerline-go/fish.nix
index b8670f6ec..3e66c02f6 100644
--- a/tests/modules/programs/powerline-go/fish.nix
+++ b/tests/modules/programs/powerline-go/fish.nix
@@ -21,7 +21,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/scmpuff/fish.nix b/tests/modules/programs/scmpuff/fish.nix
index 7f432d28c..eedaf8d5f 100644
--- a/tests/modules/programs/scmpuff/fish.nix
+++ b/tests/modules/programs/scmpuff/fish.nix
@@ -7,7 +7,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/scmpuff/no-aliases.nix b/tests/modules/programs/scmpuff/no-aliases.nix
index 688337f9f..af784da41 100644
--- a/tests/modules/programs/scmpuff/no-aliases.nix
+++ b/tests/modules/programs/scmpuff/no-aliases.nix
@@ -10,7 +10,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/scmpuff/no-fish.nix b/tests/modules/programs/scmpuff/no-fish.nix
index b9e8494af..969708367 100644
--- a/tests/modules/programs/scmpuff/no-fish.nix
+++ b/tests/modules/programs/scmpuff/no-fish.nix
@@ -10,7 +10,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );
 
diff --git a/tests/modules/programs/zellij/enable-shells.nix b/tests/modules/programs/zellij/enable-shells.nix
index cba42e2ae..124e44eac 100644
--- a/tests/modules/programs/zellij/enable-shells.nix
+++ b/tests/modules/programs/zellij/enable-shells.nix
@@ -18,7 +18,7 @@
   };
 
   # Needed to avoid error with dummy fish package.
-  xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (
+  xdg.dataFile."fish/home-manager/generated_completions".source = lib.mkForce (
     builtins.toFile "empty" ""
   );