diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index bfac627385..cb49ad4f42 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -108,7 +108,7 @@ static bool open_source(struct timeline *tl, char *filename)
     // are renamed.
 
     struct bstr cuefile =
-        bstr_strip_ext(bstr0(mp_basename(tl->demuxer->filename)));
+        mp_strip_ext(bstr0(mp_basename(tl->demuxer->filename)));
 
     DIR *d = opendir(bstrdup0(ctx, dirname));
     if (!d)
diff --git a/misc/language.c b/misc/language.c
index 02cc00b99d..dc76555208 100644
--- a/misc/language.c
+++ b/misc/language.c
@@ -300,7 +300,7 @@ done:
 
 bstr mp_guess_lang_from_filename(bstr name, int *lang_start, enum track_flags *flags)
 {
-    name = bstr_strip(bstr_strip_ext(name));
+    name = bstr_strip(mp_strip_ext(name));
 
     if (lang_start)
         *lang_start = -1;
diff --git a/misc/path_utils.c b/misc/path_utils.c
index 43bbf4f608..6d89b90b1e 100644
--- a/misc/path_utils.c
+++ b/misc/path_utils.c
@@ -110,7 +110,7 @@ static bstr split_ext(bstr path, bstr *root)
     return ext;
 }
 
-bstr bstr_strip_ext(bstr path)
+bstr mp_strip_ext(bstr path)
 {
     bstr root = {0};
     split_ext(path, &root);
diff --git a/misc/path_utils.h b/misc/path_utils.h
index 0e5b5f313a..e5b1329aba 100644
--- a/misc/path_utils.h
+++ b/misc/path_utils.h
@@ -27,7 +27,7 @@
 const char *mp_basename(const char *path);
 bstr mp_basename_bstr(bstr path);
 
-bstr bstr_strip_ext(bstr path);
+bstr mp_strip_ext(bstr path);
 bstr mp_get_ext(bstr path);
 
 /* Return struct bstr referencing directory part of path, or if that
diff --git a/player/command.c b/player/command.c
index 94105ed11e..be8e885797 100644
--- a/player/command.c
+++ b/player/command.c
@@ -536,7 +536,7 @@ static int mp_property_filename(void *ctx, struct m_property *prop,
         if (strcmp(ka->key, "no-ext") == 0) {
             action = ka->action;
             arg = ka->arg;
-            f = bstrto0(filename, bstr_strip_ext(bstr0(f)));
+            f = bstrto0(filename, mp_strip_ext(bstr0(f)));
         }
     }
     int r = m_property_strdup_ro(action, arg, f);
diff --git a/player/external_files.c b/player/external_files.c
index b1bceba9b4..4626c76578 100644
--- a/player/external_files.c
+++ b/player/external_files.c
@@ -79,7 +79,7 @@ static void append_dir_external_files(struct mpv_global *global, struct MPOpts *
     struct bstr f_fbname = bstr0(mp_basename(fname));
     struct bstr f_fname = mp_iconv_to_utf8(log, f_fbname,
                                            "UTF-8-MAC", MP_NO_LATIN1_FALLBACK);
-    struct bstr f_fname_noext = bstrdup(tmpmem, bstr_strip_ext(f_fname));
+    struct bstr f_fname_noext = bstrdup(tmpmem, mp_strip_ext(f_fname));
     struct bstr f_fname_trim = bstr_strip(f_fname_noext);
 
     if (f_fbname.start != f_fname.start)
@@ -101,7 +101,7 @@ static void append_dir_external_files(struct mpv_global *global, struct MPOpts *
         struct bstr dename = mp_iconv_to_utf8(log, den,
                                               "UTF-8-MAC", MP_NO_LATIN1_FALLBACK);
         // retrieve various parts of the filename
-        struct bstr tmp_fname_noext = bstrdup(tmpmem2, bstr_strip_ext(dename));
+        struct bstr tmp_fname_noext = bstrdup(tmpmem2, mp_strip_ext(dename));
         struct bstr tmp_fname_ext = mp_get_ext(dename);
         struct bstr tmp_fname_trim = bstr_strip(tmp_fname_noext);
 
diff --git a/player/loadfile.c b/player/loadfile.c
index c42b03c76f..02b30b1e36 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -988,7 +988,7 @@ int mp_add_external_file(struct MPContext *mpctx, char *filename,
         } else {
             bstr parent = {0};
             if (mpctx->filename)
-                parent = bstr_strip_ext(bstr0(mp_basename(mpctx->filename)));
+                parent = mp_strip_ext(bstr0(mp_basename(mpctx->filename)));
             bstr title = bstr0(mp_basename(disp_filename));
             bstr_eatstart(&title, parent);
             bstr_eatstart(&title, bstr0("."));
diff --git a/player/screenshot.c b/player/screenshot.c
index d0127dcf72..d21a53abdc 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -181,7 +181,7 @@ static char *create_fname(struct MPContext *mpctx, char *template,
                 name = mp_url_unescape(res, name);
 
             if (fmt == 'F')
-                name = bstrto0(res, bstr_strip_ext(bstr0(name)));
+                name = bstrto0(res, mp_strip_ext(bstr0(name)));
             append_filename(&res, name);
             break;
         }
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index c0d5ae9925..054e58cc9a 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -2156,7 +2156,7 @@ static void update_user_shader_opts(struct gl_video *p, const char *path,
         return;
 
     const char *basename = mp_basename(path);
-    struct bstr shadername = bstr_strip_ext(bstr0(basename));
+    struct bstr shadername = mp_strip_ext(bstr0(basename));
 
     for (int n = 0; p->opts.user_shader_opts[n * 2]; n++) {
         struct bstr key = bstr0(p->opts.user_shader_opts[n * 2 + 0]);
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index c818bf25e0..155e194d3b 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -2493,7 +2493,7 @@ static void update_hook_opts(struct priv *p, char **opts, const char *shaderpath
         return;
 
     const char *basename = mp_basename(shaderpath);
-    struct bstr shadername = bstr_strip_ext(bstr0(basename));
+    struct bstr shadername = mp_strip_ext(bstr0(basename));
 
     for (int n = 0; opts[n * 2]; n++) {
         struct bstr k = bstr0(opts[n * 2 + 0]);