diff --git a/po/de.po b/po/de.po
index 0412a36d1..9ca72d55f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3506,8 +3506,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Willkommen zu fish, der freundlichen interaktiven Shell"
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index ba67ee0a9..d2a4ef46b 100644
--- a/po/en.po
+++ b/po/en.po
@@ -3497,8 +3497,8 @@ msgstr "SELinux context for the root inode of the filesystem"
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Welcome to fish, the friendly interactive shell"
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr "%s: Too many arguments %s\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 1d4368a09..ae4005e7e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3711,8 +3711,8 @@ msgstr "Contexte SELinux pour l’i-nœud racine du système de fichiers"
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Bienvenue dans fish, le shell amical et interactif"
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr "%s: Trop d'arguments %s\\n"
 
diff --git a/po/nb.po b/po/nb.po
index a8a029b4c..43fdfc712 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3472,8 +3472,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/nn.po b/po/nn.po
index bf097c764..39318a31d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3472,8 +3472,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index f4ca5da56..3d37b4fea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3495,8 +3495,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bfc7b3c5f..23042b5fb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3501,8 +3501,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Bem-vindo ao fish, o friendly interactive shell"
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index f74d3ca67..dce80697d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3459,8 +3459,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr "Välkommen till fish, det vänliga interaktiva skalet"
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1dde54a15..d7d45037a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3471,8 +3471,8 @@ msgstr ""
 msgid "Welcome to fish, the friendly interactive shell"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:1
-#: /tmp/fish/explicit/share/functions/fish_md5.fish:2
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:1
+#: /tmp/fish/explicit/share/functions/__fish_md5.fish:2
 msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
diff --git a/share/completions/ant.fish b/share/completions/ant.fish
index e31b6b04f..1cdfdd2bf 100644
--- a/share/completions/ant.fish
+++ b/share/completions/ant.fish
@@ -38,7 +38,7 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
         set -l cache_dir "$XDG_CACHE_HOME/fish/ant_completions"
         mkdir -p $cache_dir
 
-        set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
+        set -l cache_file $cache_dir/(__fish_md5 -s $buildfile)
         if [ ! -s "$cache_file" ]
             # generate cache file if empty
             __parse_ant_targets_from_projecthelp $buildfile >$cache_file
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index 97a7e4756..7181bd916 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -45,7 +45,7 @@ function __cache_or_get_gradle_completion
     end
     mkdir -m 700 -p $XDG_CACHE_HOME/gradle-completions
 
-    set -l hashed_pwd (fish_md5 -s $PWD)
+    set -l hashed_pwd (__fish_md5 -s $PWD)
     set -l gradle_cache_file $XDG_CACHE_HOME/gradle-completions/$hashed_pwd
     if not test -f $gradle_cache_file; or command test build.gradle -nt $gradle_cache_file
         command gradle -q tasks 2>/dev/null | string match -r '^[[:alnum:]]+ - .*' | string replace ' - ' \t >$gradle_cache_file
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 01cf46086..422e8848b 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -4,7 +4,7 @@
 # see also Fish's large set of completions for examples:
 # https://github.com/fish-shell/fish-shell/tree/master/share/completions
 
-source $__fish_data_dir/functions/fish_npm_helper.fish
+source $__fish_data_dir/functions/__fish_npm_helper.fish
 set -l npm_install "npm install --global"
 
 function __fish_npm_needs_command
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index 7c9da9eb0..2223dd23c 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -1,4 +1,4 @@
-source $__fish_data_dir/functions/fish_npm_helper.fish
+source $__fish_data_dir/functions/__fish_npm_helper.fish
 set -l yarn_add "yarn global add"
 
 # Typically there is no need to check if (commandline -ct) begins with `--`
diff --git a/share/functions/fish_md5.fish b/share/functions/__fish_md5.fish
similarity index 97%
rename from share/functions/fish_md5.fish
rename to share/functions/__fish_md5.fish
index a157c7c11..f9f1d6c99 100644
--- a/share/functions/fish_md5.fish
+++ b/share/functions/__fish_md5.fish
@@ -1,4 +1,4 @@
-function fish_md5
+function __fish_md5
     if type -q md5sum
         # GNU systems
         if set -q argv[2]
diff --git a/share/functions/fish_npm_helper.fish b/share/functions/__fish_npm_helper.fish
similarity index 100%
rename from share/functions/fish_npm_helper.fish
rename to share/functions/__fish_npm_helper.fish