diff --git a/old-configure b/old-configure
index 5e3dfd52bf..22b8ed6956 100755
--- a/old-configure
+++ b/old-configure
@@ -950,7 +950,7 @@ cat > $TMPC << EOF
 
 #define CONFIGURATION "$configuration"
 
-#define MPLAYER_CONFDIR "$_confdir"
+#define MPV_CONFDIR "$_confdir"
 
 /* we didn't bother to add actual config checks for this, or they are
    for platforms not supported by this configure script */
diff --git a/options/path.c b/options/path.c
index 80c461cda8..5783e2e549 100644
--- a/options/path.c
+++ b/options/path.c
@@ -74,7 +74,7 @@ static int mp_add_xdg_config_dirs(struct mpv_global *global, char **dirs, int i)
     i = mp_add_macosx_bundle_dir(global, dirs, i);
 #endif
 
-    dirs[i++] = MPLAYER_CONFDIR;
+    dirs[i++] = MPV_CONFDIR;
 
     return i;
 }
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
index 30a4e365e4..0046cbf75d 100644
--- a/waftools/generators/headers.py
+++ b/waftools/generators/headers.py
@@ -39,13 +39,13 @@ def __write_version_h__(ctx):
 def __escape_c_string(s):
     return s.replace("\"", "\\\"").replace("\n", "\\n")
 
-def __add_mplayer_defines__(ctx):
+def __add_mpv_defines__(ctx):
     from sys import argv
     ctx.define("CONFIGURATION", " ".join(argv))
-    ctx.define("MPLAYER_CONFDIR", ctx.env.CONFDIR)
+    ctx.define("MPV_CONFDIR", ctx.env.CONFDIR)
     ctx.define("FULLCONFIG", "\\n" + __escape_c_string(ctx.get_config_header()) + "\\n")
 
 def configure(ctx):
-    __add_mplayer_defines__(ctx)
+    __add_mpv_defines__(ctx)
     __write_config_h__(ctx)
     __write_version_h__(ctx)