diff --git a/configure b/configure
index f6cb0e2558c985b83f78b9f8bd840fb63c084124..b81394d3c2126d323782a25332cb604125d42be4 100755
--- a/configure
+++ b/configure
@@ -258,7 +258,7 @@ Developer options (useful when working on Libav itself):
   --disable-optimizations  disable compiler optimizations
   --enable-extra-warnings  enable more compiler warnings
   --samples=PATH           location of test samples for FATE, if not set use
-                           \$FATE_SAMPLES at make invocation time.
+                           \$LIBAV_SAMPLES at make invocation time.
   --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only;
                            should be used only for debugging purposes)
 
@@ -3374,7 +3374,7 @@ SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME}
 SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS}
 SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
 SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
-SAMPLES:=${samples:-\$(FATE_SAMPLES)}
+SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
 EOF
 
 get_version(){
diff --git a/doc/fate.texi b/doc/fate.texi
index 5489d951334886d27c2fbd4a7ecee2fa28b9c3f0..b69301ac842b7f0cbb545fb64291f2020f1ba759 100644
--- a/doc/fate.texi
+++ b/doc/fate.texi
@@ -26,7 +26,7 @@ that is provided separately from the actual source distribution.
 
 To inform the build system about the testsuite location, pass
 @option{--samples=<path to the samples>} to @command{configure} or set the
-@var{SAMPLES} Make variable or the @var{FATE_SAMPLES} environment variable
+@var{SAMPLES} Make variable or the @var{LIBAV_SAMPLES} environment variable
 to a suitable value.
 
 The dataset is available through @command{rsync}, is possible to fetch