diff --git a/share/completions/invoke-rc.d.fish b/share/completions/invoke-rc.d.fish
index 7af2420d8..f00121a96 100644
--- a/share/completions/invoke-rc.d.fish
+++ b/share/completions/invoke-rc.d.fish
@@ -1,9 +1,5 @@
 function __fish_print_debian_services --description 'Prints services installed'
-    for service in /etc/init.d/*
-        if test -x $service
-            basename $service
-        end
-    end
+    path filter -fxZ /etc/init.d/* | path basename
 end
 
 function __fish_invoke_rcd_has_service
diff --git a/share/functions/__fish_man_page.fish b/share/functions/__fish_man_page.fish
index 5c8e17ec7..288f84e07 100644
--- a/share/functions/__fish_man_page.fish
+++ b/share/functions/__fish_man_page.fish
@@ -16,7 +16,7 @@ function __fish_man_page
 
     # If there are at least two tokens not starting with "-", the second one might be a subcommand.
     # Try "man first-second" and fall back to "man first" if that doesn't work out.
-    set -l maincmd (basename $args[1])
+    set -l maincmd (path basename $args[1])
     # HACK: If stderr is not attached to a terminal `less` (the default pager)
     # wouldn't use the alternate screen.
     # But since we don't know what pager it is, and because `man` is totally underspecified,
diff --git a/share/functions/funced.fish b/share/functions/funced.fish
index 1cba34efa..eca33a3dc 100644
--- a/share/functions/funced.fish
+++ b/share/functions/funced.fish
@@ -157,7 +157,7 @@ function funced --description 'Edit function definition'
                         source "$writepath"
                     else
                         echo (_ "Saving to original location failed; saving to user configuration instead.")
-                        set writepath $__fish_config_dir/functions/(basename "$writepath")
+                        set writepath $__fish_config_dir/functions/(path basename "$writepath")
                         if cp $tmpname "$writepath"
                             printf (_ "Function saved to %s") "$writepath"
                             echo
diff --git a/share/tools/web_config/sample_prompts/arrow.fish b/share/tools/web_config/sample_prompts/arrow.fish
index 3d99f1adc..099b079d2 100644
--- a/share/tools/web_config/sample_prompts/arrow.fish
+++ b/share/tools/web_config/sample_prompts/arrow.fish
@@ -76,7 +76,7 @@ function fish_prompt
         set arrow "$arrow_color# "
     end
 
-    set -l cwd $cyan(basename (prompt_pwd))
+    set -l cwd $cyan(prompt_pwd | path basename)
 
     set -l repo_info
     if set -l repo_type (_repo_type)
diff --git a/share/tools/web_config/sample_prompts/minimalist.fish b/share/tools/web_config/sample_prompts/minimalist.fish
index 70fb357f6..dc06ec38a 100644
--- a/share/tools/web_config/sample_prompts/minimalist.fish
+++ b/share/tools/web_config/sample_prompts/minimalist.fish
@@ -3,7 +3,7 @@
 
 function fish_prompt
     set_color $fish_color_cwd
-    echo -n (basename $PWD)
+    echo -n (path basename $PWD)
     set_color normal
     echo -n ' ) '
 end
diff --git a/share/tools/web_config/sample_prompts/nim.fish b/share/tools/web_config/sample_prompts/nim.fish
index 8e7a59fb4..641751f42 100644
--- a/share/tools/web_config/sample_prompts/nim.fish
+++ b/share/tools/web_config/sample_prompts/nim.fish
@@ -109,7 +109,7 @@ function fish_prompt
     set -q VIRTUAL_ENV_DISABLE_PROMPT
     or set -g VIRTUAL_ENV_DISABLE_PROMPT true
     set -q VIRTUAL_ENV
-    and _nim_prompt_wrapper $retc V (basename "$VIRTUAL_ENV")
+    and _nim_prompt_wrapper $retc V (path basename "$VIRTUAL_ENV")
 
     # git
     set -l prompt_git (fish_git_prompt '%s')
diff --git a/share/tools/web_config/sample_prompts/pythonista.fish b/share/tools/web_config/sample_prompts/pythonista.fish
index 401f1d04f..c754d61c2 100644
--- a/share/tools/web_config/sample_prompts/pythonista.fish
+++ b/share/tools/web_config/sample_prompts/pythonista.fish
@@ -23,7 +23,7 @@ function fish_prompt
     # Line 2
     echo
     if test -n "$VIRTUAL_ENV"
-        printf "(%s) " (set_color blue)(basename $VIRTUAL_ENV)(set_color normal)
+        printf "(%s) " (set_color blue)(path basename $VIRTUAL_ENV)(set_color normal)
     end
     printf '↪ '
     set_color normal