diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh
index 7727df4..ad55011 100755
--- a/scripts.d/10-mingw-std-threads.sh
+++ b/scripts.d/10-mingw-std-threads.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MINGW_STD_THREADS_REPO="https://github.com/meganz/mingw-std-threads.git"
-MINGW_STD_THREADS_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
+SCRIPT_REPO="https://github.com/meganz/mingw-std-threads.git"
+SCRIPT_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$MINGW_STD_THREADS_REPO" "$MINGW_STD_THREADS_COMMIT" mingw-std-threads
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads
     cd mingw-std-threads
 
     mkdir -p "$FFBUILD_PREFIX"/include
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 99eee3a..7651b5f 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MINGW_REPO="https://github.com/mirror/mingw-w64.git"
-MINGW_COMMIT="826706cbf2b01e799f495bf57d5e681da74dad37"
+SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
+SCRIPT_COMMIT="826706cbf2b01e799f495bf57d5e681da74dad37"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1
@@ -18,7 +18,7 @@ ffbuild_dockerfinal() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$MINGW_REPO" "$MINGW_COMMIT" mingw
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw
     cd mingw
 
     cd mingw-w64-headers
diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh
index e378e3b..0de4dd6 100755
--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-XORGMACROS_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
-XORGMACROS_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
+SCRIPT_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -14,7 +14,7 @@ ffbuild_dockerlayer() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$XORGMACROS_REPO" "$XORGMACROS_COMMIT" xorg-macros
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros
     cd xorg-macros
 
     autoreconf -i
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index dfb78b7..d175e78 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-LIBXML2_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
+SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
+SCRIPT_COMMIT="a6df42e649acacb55be832222d1f3f50c66720ff"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXML2_REPO" "$LIBXML2_COMMIT" libxml2
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
     cd libxml2
 
     local myconf=(
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 52252d2..bfc1375 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-FRIBIDI_REPO="https://github.com/fribidi/fribidi.git"
-FRIBIDI_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
+SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
+SCRIPT_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi
     cd fribidi
 
     mkdir build && cd build
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index aee3dfc..aeeb914 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OGG_REPO="https://github.com/xiph/ogg.git"
-OGG_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"
+SCRIPT_REPO="https://github.com/xiph/ogg.git"
+SCRIPT_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$OGG_REPO" "$OGG_COMMIT" ogg
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg
     cd ogg
 
     ./autogen.sh
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index ff189e4..5303b93 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OPENSSL_REPO="https://github.com/openssl/openssl.git"
-OPENSSL_COMMIT="OpenSSL_1_1_1q"
+SCRIPT_REPO="https://github.com/openssl/openssl.git"
+SCRIPT_COMMIT="OpenSSL_1_1_1q"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$OPENSSL_REPO" "$OPENSSL_COMMIT" openssl
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl
     cd openssl
 
     local myconf=(
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 833f5a0..eadb997 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git"
-HARFBUZZ_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
+SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
+SCRIPT_COMMIT="17c80035adc61c52a9e9600664496e3e4b837e37"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$HARFBUZZ_REPO" "$HARFBUZZ_COMMIT" harfbuzz
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz
     cd harfbuzz
 
     local myconf=(
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 0fa2ecf..e0858e0 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBSR_REPO="https://github.com/libsndfile/libsamplerate.git"
-LIBSR_COMMIT="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
+SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
+SCRIPT_COMMIT="9cccc50b0e850cb1d5fed6c36e9a3b6f07a13711"
 
 ffbuild_enabled() {
     # Dependency of GPL-Only librubberband
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBSR_REPO" "$LIBSR_COMMIT" libsr
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr
     cd libsr
 
     mkdir build
diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh
index 346a4b0..e46ea84 100755
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBUDFREAD_REPO="https://code.videolan.org/videolan/libudfread.git"
-LIBUDFREAD_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1"
+SCRIPT_REPO="https://code.videolan.org/videolan/libudfread.git"
+SCRIPT_COMMIT="b3e6936a23f8af30a0be63d88f4695bdc0ea26e1"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBUDFREAD_REPO" "$LIBUDFREAD_COMMIT" libudfread
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libudfread
     cd libudfread
 
     ./bootstrap
diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh
index d40b622..1499431 100755
--- a/scripts.d/45-libvorbis.sh
+++ b/scripts.d/45-libvorbis.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-VORBIS_REPO="https://github.com/xiph/vorbis.git"
-VORBIS_COMMIT="84c023699cdf023a32fa4ded32019f194afcdad0"
+SCRIPT_REPO="https://github.com/xiph/vorbis.git"
+SCRIPT_COMMIT="84c023699cdf023a32fa4ded32019f194afcdad0"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$VORBIS_REPO" "$VORBIS_COMMIT" vorbis
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis
     cd vorbis
 
     ./autogen.sh
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index faaf98d..7bc5ea3 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-HEADERS_COMMIT="def8be9d35fda35492b72f54a94515f7df8d1e9f"
+SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
+SCRIPT_COMMIT="def8be9d35fda35492b72f54a94515f7df8d1e9f"
 
-LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-LOADER_COMMIT="5b280f69e8312c41310a72c28c66cf24830ee85a"
+SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
+SCRIPT_COMMIT2="5b280f69e8312c41310a72c28c66cf24830ee85a"
 
 ffbuild_enabled() {
     return 0
@@ -13,11 +13,11 @@ ffbuild_enabled() {
 ffbuild_dockerbuild() {
     mkdir opencl && cd opencl
 
-    git-mini-clone "$HEADERS_REPO" "$HEADERS_COMMIT" headers
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers
     mkdir -p "$FFBUILD_PREFIX"/include/CL
     cp -r headers/CL/* "$FFBUILD_PREFIX"/include/CL/.
 
-    git-mini-clone "$LOADER_REPO" "$LOADER_COMMIT" loader
+    git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader
     cd loader
 
     mkdir build && cd build
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index b796e3f..9728a6d 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PULSEAUDIO_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-PULSEAUDIO_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
+SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
+SCRIPT_COMMIT="05c06afa58e30b7958e96766d1e917099c8a4041"
 
 ffbuild_enabled() {
     [[ $TARGET == linux* ]] || return 1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone --filter=blob:none "$PULSEAUDIO_REPO" pa
+    git clone --filter=blob:none "$SCRIPT_REPO" pa
     cd pa
-    git checkout "$PULSEAUDIO_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
 
     # Kill build of utils and their sndfile dep
     echo > src/utils/meson.build
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 5d5a7c3..8a3c51c 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-VMAF_REPO="https://github.com/Netflix/vmaf.git"
-VMAF_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
+SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
+SCRIPT_COMMIT="ebc457e98fec3400af87382fcae2b963a9152d91"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf
     cd vmaf
 
     # Kill build of unused and broken tools
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index b3c438c..5ac34d1 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-XCBPROTO_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
+SCRIPT_COMMIT="b69b997c11d863d63ee053a0ff4d62957d8ab389"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$XCBPROTO_REPO" "$XCBPROTO_COMMIT" xcbproto
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto
     cd xcbproto
 
     autoreconf -i
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 981014f..a70fb6d 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-XPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-XPROTO_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
+SCRIPT_COMMIT="74255ccfd895e70156c45a2c51174c852b64bc71"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$XPROTO_REPO" "$XPROTO_COMMIT" xproto
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto
     cd xproto
 
     autoreconf -i
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index 9d4c85a..9351bbc 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXTRANS_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-LIBXTRANS_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
+SCRIPT_COMMIT="3309c75906a56de86607f59481304b3a2812162f"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXTRANS_REPO" "$LIBXTRANS_COMMIT" libxtrans
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans
     cd libxtrans
 
     autoreconf -i
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 17c2acc..6268f81 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXAU_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-LIBXAU_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
+SCRIPT_COMMIT="d9443b2c57b512cfb250b35707378654d86c7dea"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXAU_REPO" "$LIBXAU_COMMIT" libxau
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau
     cd libxau
 
     autoreconf -i
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index 264a8ce..9fabe30 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXCB_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-LIBXCB_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
+SCRIPT_COMMIT="c2c4a2cd1947e559718acdba19ef6e7db731dbeb"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXCB_REPO" "$LIBXCB_COMMIT" libxcb
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb
     cd libxcb
 
     autoreconf -i
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 23016dc..82765bf 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-LIBX11_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
+SCRIPT_COMMIT="3a30ada60c5217ada37b143b541c8e6f6284c7fa"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBX11_REPO" "$LIBX11_COMMIT" libx11
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11
     cd libx11
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index 721c255..b41eba0 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXEXT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-LIBXEXT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
+SCRIPT_COMMIT="47904063048fa6ef6e8e16219ddef4d14d5d9a4b"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXEXT_REPO" "$LIBXEXT_COMMIT" libxext
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext
     cd libxext
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index 693f3dd..4afe973 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXFIXES_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-LIBXFIXES_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
+SCRIPT_COMMIT="6fe3bd64dd82f704ed91478acb4c99ab5c00be16"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXFIXES_REPO" "$LIBXFIXES_COMMIT" libxfixes
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes
     cd libxfixes
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index d4a205c..1ce92f1 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXI_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-LIBXI_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
+SCRIPT_COMMIT="f24d7f43ab4d97203e60677a3d42e11dbc80c8b4"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXI_REPO" "$LIBXI_COMMIT" libxi
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi
     cd libxi
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 50b72fd..8c70f1c 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXINERAMA_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-LIBXINERAMA_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
+SCRIPT_COMMIT="c5187f076d16601c15c59c5a2f05c0513d9f042b"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXINERAMA_REPO" "$LIBXINERAMA_COMMIT" libxinerama
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama
     cd libxinerama
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 7e3f6bf..108e819 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXRENDER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-LIBXRENDER_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
+SCRIPT_COMMIT="bce0618839fc33f44edd8b5498b8e33d167806ff"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXRENDER_REPO" "$LIBXRENDER_COMMIT" libxrender
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender
     cd libxrender
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index e07aa3f..c12be3a 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXSCRNSAVER_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-LIBXSCRNSAVER_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
+SCRIPT_COMMIT="aa9fd5061d0a8832480ad0c1acc9d2e864e807f4"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXSCRNSAVER_REPO" "$LIBXSCRNSAVER_COMMIT" libxscrnsaver
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver
     cd libxscrnsaver
 
     autoreconf -i
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index b03ac76..f5faca8 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXXF86VM_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-LIBXXF86VM_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
+SCRIPT_COMMIT="7f43cd2a905e7b93b83c9ce81dabb768f6fa2bc7"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXXF86VM_REPO" "$LIBXXF86VM_COMMIT" libxxf86vm
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm
     cd libxxf86vm
 
     autoreconf -i
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index dbf1e62..1560869 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-GLVND_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-GLVND_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
+SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+SCRIPT_COMMIT="8e5f0f16467cc8ce870789d9a5b6a2c3f58921c9"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$GLVND_REPO" "$GLVND_COMMIT" glvnd
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd
     cd glvnd
 
     mkdir build && cd build
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 4a11470..1cbaa1d 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXCURSOR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-LIBXCURSOR_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
+SCRIPT_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXCURSOR_REPO" "$LIBXCURSOR_COMMIT" libxcursor
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor
     cd libxcursor
 
     autoreconf -i
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 43b727f..5708416 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXRANDR_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-LIBXRANDR_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
+SCRIPT_COMMIT="55dcda4518eda8ae03ef25ea29d3c994ad71eb0a"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXRANDR_REPO" "$LIBXRANDR_COMMIT" libxrandr
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr
     cd libxrandr
 
     autoreconf -i
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 8b9b00f..c83add9 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBXV_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-LIBXV_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
+SCRIPT_COMMIT="03a6f599d060591a9a7cd8558bd2143a1c7c70d7"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBXV_REPO" "$LIBXV_COMMIT" libxv
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
     cd libxv
 
     autoreconf -i
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 2e248df..ed20f08 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-AMF_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
+SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
+SCRIPT_COMMIT="9c36583841b01c23b3972005ff6db6fd4aaac1a0"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$AMF_REPO" "$AMF_COMMIT" amf
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf
     cd amf
 
     mkdir -p "$FFBUILD_PREFIX"/include
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index b0bad49..86d5cf5 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-AOM_REPO="https://aomedia.googlesource.com/aom"
-AOM_COMMIT="67c37914286ace423a9de7fbd9f6272871061db3"
+SCRIPT_REPO="https://aomedia.googlesource.com/aom"
+SCRIPT_COMMIT="67c37914286ace423a9de7fbd9f6272871061db3"
 
 ffbuild_enabled() {
     return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom
     cd aom
 
     for patch in /patches/*.patch; do
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 72e7b36..ce3d386 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBPNG_REPO="https://github.com/glennrp/libpng.git"
-LIBPNG_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
+SCRIPT_REPO="https://github.com/glennrp/libpng.git"
+SCRIPT_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBPNG_REPO" "$LIBPNG_COMMIT" libpng
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
     cd libpng
 
     autoreconf -i
diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh
index 9131ac4..30a7c05 100755
--- a/scripts.d/50-aribb24/50-libaribb24.sh
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-ARIBB24_REPO="https://github.com/nkoriyama/aribb24.git"
-ARIBB24_COMMIT="5e9be272f96e00f15a2f3c5f8ba7e124862aec38"
+SCRIPT_REPO="https://github.com/nkoriyama/aribb24.git"
+SCRIPT_COMMIT="5e9be272f96e00f15a2f3c5f8ba7e124862aec38"
 
 ffbuild_enabled() {
     return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$ARIBB24_REPO" "$ARIBB24_COMMIT" aribb24
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24
     cd aribb24
 
     for patch in /patches/*.patch; do
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index f200e27..5d44680 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-AVISYNTH_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-AVISYNTH_COMMIT="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
+SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
+SCRIPT_COMMIT="8ce63364a5105fbdf0eda6b564b67a5eb6a9cb9d"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$AVISYNTH_REPO" "$AVISYNTH_COMMIT" avisynth
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth
     cd avisynth
 
     mkdir build && cd build
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 21436c1..3fb8414 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git"
-DAV1D_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
+SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
+SCRIPT_COMMIT="7576cd572f3ab5f6543a70dcc606e131110dbcd8"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$DAV1D_REPO" "$DAV1D_COMMIT" dav1d
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d
     cd dav1d
 
     mkdir build && cd build
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index a95a370..47377db 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-DAVS2_REPO="https://github.com/pkuvcl/davs2.git"
-DAVS2_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
+SCRIPT_REPO="https://github.com/pkuvcl/davs2.git"
+SCRIPT_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -12,9 +12,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone "$DAVS2_REPO" davs2
+    git clone "$SCRIPT_REPO" davs2
     cd davs2
-    git checkout "$DAVS2_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
     cd build/linux
 
     local myconf=(
diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh
index 3c42065..9e6c9c3 100755
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-FDK_REPO="https://github.com/mstorsjo/fdk-aac.git"
-FDK_COMMIT="3f864cce9736cc8e9312835465fae18428d76295"
+SCRIPT_REPO="https://github.com/mstorsjo/fdk-aac.git"
+SCRIPT_COMMIT="3f864cce9736cc8e9312835465fae18428d76295"
 
 ffbuild_enabled() {
     [[ $VARIANT == nonfree* ]] || return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$FDK_REPO" "$FDK_COMMIT" fdk
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk
     cd fdk
 
     ./autogen.sh
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index dc037fc..999902f 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-FFNVCODEC_COMMIT="84483da70d903239d4536763fde8c7e6c4e80784"
+SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
+SCRIPT_COMMIT="84483da70d903239d4536763fde8c7e6c4e80784"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$FFNVCODEC_REPO" "$FFNVCODEC_COMMIT" ffnvcodec
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
     cd ffnvcodec
 
     make PREFIX="$FFBUILD_PREFIX" install
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index ae7c341..79d376b 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-FREI0R_REPO="https://github.com/dyne/frei0r.git"
-FREI0R_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
+SCRIPT_REPO="https://github.com/dyne/frei0r.git"
+SCRIPT_COMMIT="6a576f4538992bbbe88eba1e773d6144d22eb3ca"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$FREI0R_REPO" "$FREI0R_COMMIT" frei0r
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
     cd frei0r
 
     ./autogen.sh
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 72c2702..871b080 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-GME_REPO="https://bitbucket.org/mpyne/game-music-emu.git"
-GME_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
+SCRIPT_REPO="https://bitbucket.org/mpyne/game-music-emu.git"
+SCRIPT_COMMIT="d39b0bce47f66074c6aa85202b8cb4642fa77b78"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git clone "$GME_REPO" gme
+    git clone "$SCRIPT_REPO" gme
     cd gme
-    git checkout "$GME_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 2356a48..db6f643 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-ASS_REPO="https://github.com/libass/libass.git"
-ASS_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
+SCRIPT_REPO="https://github.com/libass/libass.git"
+SCRIPT_COMMIT="a2b39cde4ecb74d5e6fccab4a5f7d8ad52b2b1a4"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$ASS_REPO" "$ASS_COMMIT" ass
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
     cd ass
 
     ./autogen.sh
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 23e0c9f..60b3f66 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git"
-LIBBLURAY_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
+SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
+SCRIPT_COMMIT="8f26777b1ce124ff761f80ef52d6be10bcea323e"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBBLURAY_REPO" "$LIBBLURAY_COMMIT" libbluray
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray
     cd libbluray
 
     ./bootstrap
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index e9234ad..58a4602 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-BROTLI_REPO="https://github.com/google/brotli.git"
-BROTLI_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
+SCRIPT_REPO="https://github.com/google/brotli.git"
+SCRIPT_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$BROTLI_REPO" "$BROTLI_COMMIT" brotli
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli
     cd brotli
 
     mkdir build && cd build
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 2df7ccc..44fec6c 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-JXL_REPO="https://github.com/libjxl/libjxl.git"
-JXL_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
+SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
+SCRIPT_COMMIT="ec093557b0e8f76a48b0a68356d786c664a65660"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$JXL_REPO" "$JXL_COMMIT" jxl
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl
     cd jxl
     git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}
 
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index a7274bb..2d5c553 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OPUS_REPO="https://github.com/xiph/opus.git"
-OPUS_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
+SCRIPT_REPO="https://github.com/xiph/opus.git"
+SCRIPT_COMMIT="ccaaffa9a3ee427e9401c4dcf6462e378d9a4694"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$OPUS_REPO" "$OPUS_COMMIT" opus
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
     cd opus
 
     ./autogen.sh
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 2468361..7be215b 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
-MBEDTLS_COMMIT="v3.2.1"
+SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git"
+SCRIPT_COMMIT="v3.2.1"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$MBEDTLS_REPO" "$MBEDTLS_COMMIT" mbedtls
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls
     cd mbedtls
 
     mkdir build && cd build
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index df97141..a5ec29d 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBRIST_REPO="https://code.videolan.org/rist/librist.git"
-LIBRIST_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
+SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
+SCRIPT_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBRIST_REPO" "$LIBRIST_COMMIT" librist
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist
     cd librist
 
     mkdir build && cd build
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index d922288..11f5ac1 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-THEORA_REPO="https://github.com/xiph/theora.git"
-THEORA_COMMIT="7180717276af1ebc7da15c83162d6c5d6203aabf"
+SCRIPT_REPO="https://github.com/xiph/theora.git"
+SCRIPT_COMMIT="7180717276af1ebc7da15c83162d6c5d6203aabf"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$THEORA_REPO" "$THEORA_COMMIT" theora
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora
     cd theora
 
     ./autogen.sh
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index e47d41c..f317c8a 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx"
-LIBVPX_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
+SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
+SCRIPT_COMMIT="7b1b9f7cd23e085d97c26ed026d2c817d78a14d6"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBVPX_REPO" "$LIBVPX_COMMIT" libvpx
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
     cd libvpx
 
     local myconf=(
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 6981bbe..81d534f 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-WEBP_REPO="https://chromium.googlesource.com/webm/libwebp"
-WEBP_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
+SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
+SCRIPT_COMMIT="5ecee06f7a11b5b06d846196b362fb9fd39b25b2"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$WEBP_REPO" "$WEBP_COMMIT" webp
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
     cd webp
 
     ./autogen.sh
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index e521c27..b22775f 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LV2_REPO="https://github.com/lv2/lv2.git"
-LV2_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
+SCRIPT_REPO="https://github.com/lv2/lv2.git"
+SCRIPT_COMMIT="d97a1a4daff228bdd62c68859959d13077e47026"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LV2_REPO" "$LV2_COMMIT" lv2
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
     cd lv2
     git submodule update --init --recursive --depth 1
 
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 718b6de..db15d2c 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-SERD_REPO="https://github.com/drobilla/serd.git"
-SERD_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
+SCRIPT_REPO="https://github.com/drobilla/serd.git"
+SCRIPT_COMMIT="272d7081257dc6d50c06b1b62e8c4baa5bf3b4b2"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SERD_REPO" "$SERD_COMMIT" serd
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
     cd serd
     git submodule update --init --recursive --depth 1
 
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 9e3573f..4ceb3e5 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-SORD_REPO="https://github.com/drobilla/sord.git"
-SORD_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
+SCRIPT_REPO="https://github.com/drobilla/sord.git"
+SCRIPT_COMMIT="ee631481ba7cbe5f6afdf5dd00860eb9bbed57f4"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SORD_REPO" "$SORD_COMMIT" sord
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
     cd sord
     git submodule update --init --recursive --depth 1
 
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index a6746b1..c8936e9 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-SRATOM_REPO="https://github.com/lv2/sratom.git"
-SRATOM_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
+SCRIPT_REPO="https://github.com/lv2/sratom.git"
+SCRIPT_COMMIT="8cf09feee6895ba0760f8c24db6416dac9006dc3"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SRATOM_REPO" "$SRATOM_COMMIT" sratom
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
     cd sratom
     git submodule update --init --recursive --depth 1
 
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index b2c0680..e7f08a8 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-LILV_REPO="https://github.com/lv2/lilv.git"
-LILV_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
+SCRIPT_REPO="https://github.com/lv2/lilv.git"
+SCRIPT_COMMIT="c36d3451278555134de850fc548d743b6da2179a"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LILV_REPO" "$LILV_COMMIT" lilv
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
     cd lilv
     git submodule update --init --recursive --depth 1
 
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 18554aa..6ec2b96 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-MFX_REPO="https://github.com/lu-zero/mfx_dispatch.git"
-MFX_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
+SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
+SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
 
 ffbuild_enabled() {
     [[ $TARGET == linuxarm64 ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$MFX_REPO" "$MFX_COMMIT" mfx
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mfx
     cd mfx
 
     autoreconf -i
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index f207138..dc976ba 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OPENH264_REPO="https://github.com/cisco/openh264.git"
-OPENH264_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
+SCRIPT_REPO="https://github.com/cisco/openh264.git"
+SCRIPT_COMMIT="8fe55e3f4accac7fd1af4262bcd6eff5d008396d"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$OPENH264_REPO" "$OPENH264_COMMIT" openh264
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openh264
     cd openh264
 
     local myconf=(
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 2194b07..772b893 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git"
-OPENJPEG_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
+SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
+SCRIPT_COMMIT="0535bfc3b7d5cd6fc73a7d4a6749a338fc5d7703"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$OPENJPEG_REPO" "$OPENJPEG_COMMIT" openjpeg
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openjpeg
     cd openjpeg
 
     mkdir build && cd build
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 6a89783..d06442c 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-OPENMPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-OPENMPT_REV="17456"
+SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
+SCRIPT_REV="17456"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    svn checkout "${OPENMPT_REPO}@${OPENMPT_REV}" openmpt
+    svn checkout "${SCRIPT_REPO}@${SCRIPT}" openmpt
     cd openmpt
 
     local myconf=(
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index d0a604f..7bdbb32 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RAV1E_REPO="https://github.com/xiph/rav1e.git"
-RAV1E_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
+SCRIPT_REPO="https://github.com/xiph/rav1e.git"
+SCRIPT_COMMIT="a8d1e46e0dba460345e70a519d3becd079bb3acd"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$RAV1E_REPO" "$RAV1E_COMMIT" rav1e
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rav1e
     cd rav1e
 
     local myconf=(
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 05519c1..3dbea5a 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RUBBERBAND_REPO="https://github.com/breakfastquay/rubberband.git"
-RUBBERBAND_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
+SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
+SCRIPT_COMMIT="4cff1741664918791474da9a9d41f48cc3119229"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$RUBBERBAND_REPO" "$RUBBERBAND_COMMIT" rubberband
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rubberband
     cd rubberband
 
     mkdir build && cd build
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 642abf3..ef455db 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-SDL_REPO="https://github.com/libsdl-org/SDL.git"
-SDL_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
+SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
+SCRIPT_COMMIT="0a93ac129475ab3ce11af95969f767d60e98233a"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SDL_REPO" "$SDL_COMMIT" sdl
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl
     cd sdl
 
     mkdir build && cd build
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index 5df1fea..1fb2cac 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 # https://sourceforge.net/p/soxr/code/ci/master/tree/
-SOXR_REPO="https://git.code.sf.net/p/soxr/code"
-SOXR_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0"
+SCRIPT_REPO="https://git.code.sf.net/p/soxr/code"
+SCRIPT_COMMIT="945b592b70470e29f917f4de89b4281fbbd540c0"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SOXR_REPO" "$SOXR_COMMIT" soxr
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" soxr
     cd soxr
 
     mkdir build && cd build
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 8a93092..f4a2f88 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-SRT_REPO="https://github.com/Haivision/srt.git"
-SRT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
+SCRIPT_REPO="https://github.com/Haivision/srt.git"
+SCRIPT_COMMIT="e8b713e954345291e8d6e2314d1e5094a6a14179"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SRT_REPO" "$SRT_COMMIT" srt
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" srt
     cd srt
 
     mkdir build && cd build
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index d57e6cc..bb30bd8 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SVTAV1_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SVTAV1_COMMIT="1a656a3dd30499f1c548d10b03b022e4983ee53e"
+SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
+SCRIPT_COMMIT="1a656a3dd30499f1c548d10b03b022e4983ee53e"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone "$SVTAV1_REPO" svtav1
+    git clone "$SCRIPT_REPO" svtav1
     cd svtav1
-    git checkout "$SVTAV1_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index ba0adc4..2ac1728 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
-UAVS3D_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
+SCRIPT_REPO="https://github.com/uavs3/uavs3d.git"
+SCRIPT_COMMIT="7b1dd734c926a23f8134b42dbfaac4d22cd6ba1d"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone "$UAVS3D_REPO" uavs3d
+    git clone "$SCRIPT_REPO" uavs3d
     cd uavs3d
-    git checkout "$UAVS3D_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
 
     mkdir build/linux
     cd build/linux
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index cedd449..684754d 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBPCIACCESS_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-LIBPCIACCESS_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
+SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
+SCRIPT_COMMIT="22a93f8b9b4a79eefbdd0b2c412526f6141ac7a8"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBPCIACCESS_REPO" "$LIBPCIACCESS_COMMIT" libpciaccess
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpciaccess
     cd libpciaccess
 
     autoreconf -fi
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 0c66f14..87c5e74 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-LIBDRM_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
+SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
+SCRIPT_COMMIT="f7828dc180ba3427b5e405fab25e9846c07322bc"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBDRM_REPO" "$LIBDRM_COMMIT" libdrm
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libdrm
     cd libdrm
 
     mkdir build && cd build
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 367e114..14c3c7c 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBVA_REPO="https://github.com/intel/libva.git"
-LIBVA_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
+SCRIPT_REPO="https://github.com/intel/libva.git"
+SCRIPT_COMMIT="395e502d162fe04ccec7700bd1a58dca40328605"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$LIBVA_REPO" "$LIBVA_COMMIT" libva
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libva
     cd libva
 
     autoreconf -i
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 27e4955..0763fc8 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-VIDSTAB_REPO="https://github.com/georgmartius/vid.stab.git"
+SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
 # TODO: clamp to e7715fc until georgmartius/vid.stab#104 get fixed
-VIDSTAB_COMMIT="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
+SCRIPT_COMMIT="e7715fcf329573cdcff5c57d0e4a25f4c3a0cb7f"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$VIDSTAB_REPO" "$VIDSTAB_COMMIT" vidstab
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab
     cd vidstab
 
     mkdir build && cd build
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index dea8b6a..757753f 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-HEADERS_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-HEADERS_VERSION="1.3.217"
+SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
+SCRIPT_COMMIT="v1.3.217"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$HEADERS_REPO" "v$HEADERS_VERSION" vkheaders
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vkheaders
     cd vkheaders
 
     mkdir build && cd build
@@ -23,7 +23,7 @@ prefix=$FFBUILD_PREFIX
 includedir=\${prefix}/include
 
 Name: vulkan
-Version: $HEADERS_VERSION
+Version: ${SCRIPT_COMMIT:1}
 Description: Vulkan (Headers Only)
 Cflags: -I\${includedir}
 EOF
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index ca38859..4e7001e 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SHADERC_REPO="https://github.com/google/shaderc.git"
-SHADERC_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
+SCRIPT_REPO="https://github.com/google/shaderc.git"
+SCRIPT_COMMIT="7e2cfcf2b75c245fa3ceaf2e276180cbf8f107ea"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SHADERC_REPO" "$SHADERC_COMMIT" shaderc
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc
     cd shaderc
 
     ./utils/git-sync-deps
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 6e48771..8578b10 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SPIRV_CROSS_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SPIRV_CROSS_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
+SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
+SCRIPT_COMMIT="a97bbc24c5bae15d3d2eaa2865c122e8d3be1b67"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SPIRV_CROSS_REPO" "$SPIRV_CROSS_COMMIT" spirv-cross
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" spirv-cross
     cd spirv-cross
 
     VER_MAJ="$(grep 'set(spirv-cross-abi-major' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index b472223..ada1af4 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PLACEBO_REPO="https://code.videolan.org/videolan/libplacebo.git"
-PLACEBO_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
+SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
+SCRIPT_COMMIT="db794a2fcc8214624c950752b04f6c23f8fc567d"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$PLACEBO_REPO" "$PLACEBO_COMMIT" placebo
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo
     cd placebo
 
     mkdir build && cd build
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index aecea16..7a08518 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-X264_REPO="https://github.com/mirror/x264.git"
-X264_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
+SCRIPT_REPO="https://github.com/mirror/x264.git"
+SCRIPT_COMMIT="baee400fa9ced6f5481a728138fed6e867b0ff7f"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$X264_REPO" "$X264_COMMIT" x264
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" x264
     cd x264
 
     local myconf=(
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 525eca6..c6031a9 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-X265_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-X265_COMMIT="9b59d45549f460e41a852cfd276f9b89eed2112a"
+SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
+SCRIPT_COMMIT="9b59d45549f460e41a852cfd276f9b89eed2112a"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,9 +9,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone "$X265_REPO" x265
+    git clone "$SCRIPT_REPO" x265
     cd x265
-    git checkout "$X265_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
 
     local common_config=(
         -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 3c37a8c..108693c 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-XAVS2_REPO="https://github.com/pkuvcl/xavs2.git"
-XAVS2_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8"
+SCRIPT_REPO="https://github.com/pkuvcl/xavs2.git"
+SCRIPT_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -12,9 +12,9 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git clone "$XAVS2_REPO" xavs2
+    git clone "$SCRIPT_REPO" xavs2
     cd xavs2
-    git checkout "$XAVS2_COMMIT"
+    git checkout "$SCRIPT_COMMIT"
     cd build/linux
 
     local myconf=(
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 495efd3..83b55af 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-ZIMG_REPO="https://github.com/sekrit-twc/zimg.git"
-ZIMG_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
+SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
+SCRIPT_COMMIT="51c3c7f750c2af61955377faad56e3ba1b03589f"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$ZIMG_REPO" "$ZIMG_COMMIT" zimg
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg
     cd zimg
 
     ./autogen.sh
diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh
index f3670ce..20f3586 100755
--- a/scripts.d/50-zvbi.sh
+++ b/scripts.d/50-zvbi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-ZVBI_REPO="https://svn.code.sf.net/p/zapping/svn/trunk/vbi"
-ZVBI_REV="4270"
+SCRIPT_REPO="https://svn.code.sf.net/p/zapping/svn/trunk/vbi"
+SCRIPT_REV="4270"
 
 ffbuild_enabled() {
     return 0
@@ -12,7 +12,7 @@ ffbuild_dockerstage() {
 }
 
 ffbuild_dockerbuild() {
-    svn checkout "${ZVBI_REPO}@${ZVBI_REV}" zvbi
+    svn checkout "${SCRIPT_REPO}@${SCRIPT_REV}" zvbi
     cd zvbi
 
     for patch in /patches/*.patch; do