diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk
index c33f30a6..2bdd0997 100644
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 
 # download archives into download directory
-DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR)
+download = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR)
 
 # unpack archives into build directory
 UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR)
diff --git a/make/flash-images.mk b/make/flash-images.mk
index ce672e04..2bf3d8c5 100644
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@@ -264,13 +264,13 @@ HD6x_MULTI_DISK_VERSION = 1.0
 HD6x_MULTI_DISK_SITE = http://downloads.mutant-digital.net/$(BOXMODEL)
 
 $(DL_DIR)/$(HD6x_BOOTARGS_SOURCE):
-	$(DOWNLOAD) $(HD6x_MULTI_DISK_SITE)/$(HD6x_BOOTARGS_SOURCE)
+	$(download) $(HD6x_MULTI_DISK_SITE)/$(HD6x_BOOTARGS_SOURCE)
 
 $(DL_DIR)/$(HD6x_PARTITONS_SOURCE):
-	$(DOWNLOAD) $(HD6x_MULTI_DISK_SITE)/$(HD6x_PARTITONS_SOURCE)
+	$(download) $(HD6x_MULTI_DISK_SITE)/$(HD6x_PARTITONS_SOURCE)
 
 $(DL_DIR)/$(HD6x_RECOVERY_SOURCE):
-	$(DOWNLOAD) $(HD6x_MULTI_DISK_SITE)/$(HD6x_RECOVERY_SOURCE)
+	$(download) $(HD6x_MULTI_DISK_SITE)/$(HD6x_RECOVERY_SOURCE)
 
 flash-image-hd6x-multi-recovery: $(DL_DIR)/$(HD6x_BOOTARGS_SOURCE)
 flash-image-hd6x-multi-recovery: $(DL_DIR)/$(HD6x_PARTITONS_SOURCE)
diff --git a/make/host-tools.mk b/make/host-tools.mk
index a1f23294..248d9929 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -44,7 +44,7 @@ HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VERSION).tar.gz
 HOST_PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf
 
 $(DL_DIR)/$(HOST_PKGCONF_SOURCE):
-	$(DOWNLOAD) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE)
+	$(download) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE)
 
 host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs
 	$(REMOVE)/$(PKG_DIR)
@@ -73,7 +73,7 @@ HOST_MTD_UTILS_SOURCE = mtd-utils-$(HOST_MTD_UTILS_VERSION).tar.bz2
 HOST_MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 
 #$(DL_DIR)/$(HOST_MTD_UTILS_SOURCE):
-#	$(DOWNLOAD) $(HOST_MTD_UTILS_SITE)/$(HOST_MTD_UTILS_SOURCE)
+#	$(download) $(HOST_MTD_UTILS_SITE)/$(HOST_MTD_UTILS_SOURCE)
 
 HOST_MTD_UTILS_CONF_ENV = \
 	ZLIB_CFLAGS=" " \
@@ -104,7 +104,7 @@ HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VERSION).tar.bz2
 HOST_U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
 
 $(DL_DIR)/$(HOST_U_BOOT_SOURCE):
-	$(DOWNLOAD) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE)
+	$(download) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE)
 
 HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage
 
@@ -127,7 +127,7 @@ HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VERSION).tar.gz
 HOST_ZIC_SITE = ftp://ftp.iana.org/tz/releases
 
 $(DL_DIR)/$(HOST_ZIC_SOURCE):
-	$(DOWNLOAD) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE)
+	$(download) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE)
 
 HOST_ZIC = $(HOST_DIR)/sbin/zic
 
@@ -150,7 +150,7 @@ HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VERSION).tar.xz
 HOST_PARTED_SITE = $(GNU_MIRROR)/parted
 
 #$(DL_DIR)/$(HOST_PARTED_SOURCE):
-#	$(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE)
+#	$(download) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE)
 
 HOST_PARTED_AUTORECONF = YES
 
@@ -179,7 +179,7 @@ HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VERSION).tar.xz
 HOST_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VERSION)
 
 #$(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE):
-#	$(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE)
+#	$(download) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE)
 
 HOST_DOSFSTOOLS_CONF_OPTS = \
 	--without-udev
@@ -205,7 +205,7 @@ HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VERSION).tar.gz
 HOST_MTOOLS_SITE = $(GNU_MIRROR)/mtools
 
 $(DL_DIR)/$(HOST_MTOOLS_SOURCE):
-	$(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE)
+	$(download) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE)
 
 host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -225,7 +225,7 @@ HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VERSION).tar.gz
 HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VERSION)
 
 #$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE):
-#	$(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)
+#	$(download) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)
 
 HOST_E2FSPROGS_CONF_OPTS = \
 	--enable-symlink-install \
@@ -249,7 +249,7 @@ HOST_MESON_SOURCE = meson-$(HOST_MESON_VERSION).tar.gz
 HOST_MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)
 
 $(DL_DIR)/$(HOST_MESON_SOURCE):
-	$(DOWNLOAD) $(HOST_MESON_SITE)/$(HOST_MESON_SOURCE)
+	$(download) $(HOST_MESON_SITE)/$(HOST_MESON_SOURCE)
 
 HOST_MESON_DEPENDENCIES = host-ninja host-python3 host-python3-setuptools
 
@@ -273,7 +273,7 @@ HOST_NINJA_SOURCE = ninja-$(HOST_NINJA_VERSION).tar.gz
 HOST_NINJA_SITE = $(call github,ninja-build,ninja,v$(HOST_NINJA_VERSION))
 
 $(DL_DIR)/$(HOST_NINJA_SOURCE):
-	$(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE)
+	$(download) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE)
 
 HOST_NINJA = $(HOST_DIR)/bin/ninja
 
@@ -296,7 +296,7 @@ HOST_EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
 HOST_EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION)
 
 #$(DL_DIR)/$(HOST_EXPAT_SOURCE):
-#	$(DOWNLOAD) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE)
+#	$(download) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE)
 
 HOST_EXPAT_CONF_OPTS = \
 	--without-docbook
@@ -322,7 +322,7 @@ HOST_PYTHON3_BASE_DIR = lib/python$(basename $(HOST_PYTHON3_VERSION))
 HOST_PYTHON3_INCLUDE_DIR = include/python$(basename $(HOST_PYTHON3_VERSION))
 
 $(DL_DIR)/$(HOST_PYTHON3_SOURCE):
-	$(DOWNLOAD) $(HOST_PYTHON3_SITE)/$(HOST_PYTHON3_SOURCE)
+	$(download) $(HOST_PYTHON3_SITE)/$(HOST_PYTHON3_SOURCE)
 
 HOST_PYTHON3_DEPENDENCIES = host-expat host-libffi
 
@@ -363,7 +363,7 @@ HOST_PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VERSION).z
 HOST_PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
 
 $(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE):
-	$(DOWNLOAD) $(HOST_PYTHON3_SETUPTOOLS_SITE)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE)
+	$(download) $(HOST_PYTHON3_SETUPTOOLS_SITE)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE)
 
 HOST_PYTHON3_SETUPTOOLS_DEPENDENCIES = host-python3
 
@@ -385,7 +385,7 @@ HOST_LIBFFI_SOURCE = libffi-$(HOST_LIBFFI_VERSION).tar.gz
 HOST_LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION)
 
 #$(DL_DIR)/$(HOST_LIBFFI_SOURCE):
-#	$(DOWNLOAD) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE)
+#	$(download) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE)
 
 host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -406,7 +406,7 @@ HOST_LUA_SOURCE = lua-$(HOST_LUA_VERSION).tar.gz
 HOST_LUA_SITE = http://www.lua.org/ftp
 
 #$(DL_DIR)/$(HOST_LUA_SOURCE):
-#	$(DOWNLOAD) $(HOST_LUA_SITE)/$(HOST_LUA_SOURCE)
+#	$(download) $(HOST_LUA_SITE)/$(HOST_LUA_SOURCE)
 
 HOST_LUA_PATCH  = lua-01-fix-LUA_ROOT.patch
 HOST_LUA_PATCH += lua-01-remove-readline.patch
@@ -431,7 +431,7 @@ HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VERSION).tar.gz
 HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases
 
 $(DL_DIR)/$(HOST_LUAROCKS_SOURCE):
-	$(DOWNLOAD) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE)
+	$(download) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE)
 
 HOST_LUAROCKS_DEPENDENCIES = host-lua
 
diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk
index ab246d43..cde3e170 100644
--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@@ -27,7 +27,7 @@ RTL8812AU_SOURCE = rtl8812AU-driver-$(RTL8812AU_VERSION).zip
 RTL8812AU_SITE = http://source.mynonpublic.com
 
 $(DL_DIR)/$(RTL8812AU_SOURCE):
-	$(DOWNLOAD) $(RTL8812AU_SITE)/$(RTL8812AU_SOURCE)
+	$(download) $(RTL8812AU_SITE)/$(RTL8812AU_SOURCE)
 
 rtl8812au: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8812AU_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RTL8812AU_DIR)
@@ -48,7 +48,7 @@ RTL8822BU_SOURCE = rtl8822bu-driver-$(RTL8822BU_VERSION).zip
 RTL8822BU_SITE = http://source.mynonpublic.com
 
 $(DL_DIR)/$(RTL8822BU_SOURCE):
-	$(DOWNLOAD) $(RTL8822BU_SITE)/$(RTL8822BU_SOURCE)
+	$(download) $(RTL8822BU_SITE)/$(RTL8822BU_SOURCE)
 
 rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RTL8822BU_DIR)
@@ -69,7 +69,7 @@ HD6x_MALI_DRIVERS_SOURCE = $(HD6x_MALI_DRIVERS_VERSION).tgz
 HD6x_MALI_DRIVERS_SITE = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu
 
 $(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE):
-	$(DOWNLOAD) $(HD6x_MALI_DRIVERS_SITE)/$(HD6x_MALI_DRIVERS_SOURCE)
+	$(download) $(HD6x_MALI_DRIVERS_SITE)/$(HD6x_MALI_DRIVERS_SOURCE)
 
 HD6x_MALI_DRIVERS_MAKE_VARS = \
 	M=$(BUILD_DIR)/$(HD6x_MALI_DRIVERS_DIR)/driver/src/devicedrv/mali \
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index ba2ad2c2..42f69547 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -191,10 +191,10 @@ VUDUO_PATCH = \
 # -----------------------------------------------------------------------------
 
 $(DL_DIR)/$(KERNEL_SOURCE):
-	$(DOWNLOAD) $(KERNEL_SITE)/$(KERNEL_SOURCE)
+	$(download) $(KERNEL_SITE)/$(KERNEL_SOURCE)
 
 $(DL_DIR)/$(VMLINUZ_INITRD_SOURCE):
-	$(DOWNLOAD) $(VMLINUZ_INITRD_SITE)/$(VMLINUZ_INITRD_SOURCE)
+	$(download) $(VMLINUZ_INITRD_SITE)/$(VMLINUZ_INITRD_SOURCE)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/target-blobs.mk b/make/target-blobs.mk
index c3540f54..571c3be3 100644
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@@ -135,7 +135,7 @@ BOXMODEL_DRIVERS_SITE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SITE)
 
 ifneq ($(BOXMODEL_DRIVERS_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL_DRIVERS_SITE)/$(BOXMODEL_DRIVERS_SOURCE)
+	$(download) $(BOXMODEL_DRIVERS_SITE)/$(BOXMODEL_DRIVERS_SOURCE)
 endif
 
 nevis-drivers \
@@ -263,7 +263,7 @@ BOXMODEL_LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SITE)
 
 ifneq ($(BOXMODEL_LIBGLES_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL_LIBGLES_SITE)/$(BOXMODEL_LIBGLES_SOURCE)
+	$(download) $(BOXMODEL_LIBGLES_SITE)/$(BOXMODEL_LIBGLES_SOURCE)
 endif
 
 hd51-libgles \
@@ -275,7 +275,7 @@ h7-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
 	$(TOUCH)
 
 $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE):
-	$(DOWNLOAD) $(HD6x_LIBGLES_HEADERS_SITE)/$(HD6x_LIBGLES_HEADERS_SOURCE)
+	$(download) $(HD6x_LIBGLES_HEADERS_SITE)/$(HD6x_LIBGLES_HEADERS_SOURCE)
 
 hd6x-libgles-headers: $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) | $(TARGET_DIR)
 	unzip -o $(DL_DIR)/$(HD6x_LIBGLES_HEADERS_SOURCE) -d $(TARGET_includedir)
@@ -330,7 +330,7 @@ BOXMODEL_LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SITE)
 
 ifneq ($(BOXMODEL_LIBS_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL_LIBS_SITE)/$(BOXMODEL_LIBS_SOURCE)
+	$(download) $(BOXMODEL_LIBS_SITE)/$(BOXMODEL_LIBS_SOURCE)
 endif
 
 hd60-libs \
@@ -390,7 +390,7 @@ BOXMODEL_PLATFORM_UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SITE
 
 ifneq ($(BOXMODEL_PLATFORM_UTIL_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE):
-	$(DOWNLOAD) $(BOXMODEL_PLATFORM_UTIL_SITE)/$(BOXMODEL_PLATFORM_UTIL_SOURCE)
+	$(download) $(BOXMODEL_PLATFORM_UTIL_SITE)/$(BOXMODEL_PLATFORM_UTIL_SOURCE)
 endif
 
 vuplus-platform-util: $(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE) | $(TARGET_DIR)
diff --git a/make/target-development.mk b/make/target-development.mk
index bf49419b..0a9cb8c8 100644
--- a/make/target-development.mk
+++ b/make/target-development.mk
@@ -9,7 +9,7 @@ VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind
 
 $(DL_DIR)/$(VALGRIND_SOURCE):
-	$(DOWNLOAD) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
+	$(download) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
 
 VALGRIND_PATCH  = valgrind-fix-build-$(TARGET_CPU).patch
 
@@ -40,7 +40,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = https://strace.io/files/$(STRACE_VERSION)
 
 $(DL_DIR)/$(STRACE_SOURCE):
-	$(DOWNLOAD) $(STRACE_SITE)/$(STRACE_SOURCE)
+	$(download) $(STRACE_SITE)/$(STRACE_SOURCE)
 
 strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(STRACE_DIR)
@@ -61,7 +61,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz
 GDB_SITE = https://sourceware.org/pub/gdb/releases
 
 $(DL_DIR)/$(GDB_SOURCE):
-	$(DOWNLOAD) $(GDB_SITE)/$(GDB_SOURCE)
+	$(download) $(GDB_SITE)/$(GDB_SOURCE)
 
 GDB_DEPENDENCIES = zlib ncurses
 
diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk
index 314f90f7..3e5ca4dc 100644
--- a/make/target-ffmpeg.mk
+++ b/make/target-ffmpeg.mk
@@ -9,7 +9,7 @@ FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = http://www.ffmpeg.org/releases
 
 $(DL_DIR)/$(FFMPEG_SOURCE):
-	$(DOWNLOAD) $(FFMPEG_SITE)/$(FFMPEG_SOURCE)
+	$(download) $(FFMPEG_SITE)/$(FFMPEG_SOURCE)
 
 FFMPEG_DEPENDENCIES = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib
 
diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index 1b2929a5..40c599e6 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -9,7 +9,7 @@ LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBID3TAG_SITE = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VERSION)
 
 $(DL_DIR)/$(LIBID3TAG_SOURCE):
-	$(DOWNLOAD) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE)
+	$(download) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE)
 
 LIBID3TAG_DEPENDENCIES = zlib
 
@@ -38,7 +38,7 @@ FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
 FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release
 
 $(DL_DIR)/$(FONTCONFIG_SOURCE):
-	$(DOWNLOAD) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE)
+	$(download) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE)
 
 FONTCONFIG_DEPENDENCIES = freetype expat
 
@@ -68,7 +68,7 @@ PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
 PIXMAN_SITE = https://www.cairographics.org/releases
 
 $(DL_DIR)/$(PIXMAN_SOURCE):
-	$(DOWNLOAD) $(PIXMAN_SITE)/$(PIXMAN_SOURCE)
+	$(download) $(PIXMAN_SITE)/$(PIXMAN_SOURCE)
 
 PIXMAN_DEPENDENCIES = zlib libpng
 
@@ -98,7 +98,7 @@ CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
 CAIRO_SITE = https://www.cairographics.org/releases
 
 $(DL_DIR)/$(CAIRO_SOURCE):
-	$(DOWNLOAD) $(CAIRO_SITE)/$(CAIRO_SOURCE)
+	$(download) $(CAIRO_SITE)/$(CAIRO_SOURCE)
 
 CAIRO_DEPENDENCIES = fontconfig glib2 libpng pixman zlib
 
@@ -140,7 +140,7 @@ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release
 
 $(DL_DIR)/$(HARFBUZZ_SOURCE):
-	$(DOWNLOAD) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE)
+	$(download) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE)
 
 HARFBUZZ_DEPENDENCIES = fontconfig glib2 cairo freetype
 
diff --git a/make/target-libs.mk b/make/target-libs.mk
index 65bea99d..7c1313bd 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -9,7 +9,7 @@ ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
 ZLIB_SITE = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)
 
 $(DL_DIR)/$(ZLIB_SOURCE):
-	$(DOWNLOAD) $(ZLIB_SITE)/$(ZLIB_SOURCE)
+	$(download) $(ZLIB_SITE)/$(ZLIB_SOURCE)
 
 ZLIB_CONF_ENV = \
 	mandir=$(REMOVE_mandir)
@@ -39,7 +39,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
 
 $(DL_DIR)/$(LIBFUSE_SOURCE):
-	$(DOWNLOAD) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE)
+	$(download) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE)
 
 LIBFUSE_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir) \
@@ -64,7 +64,7 @@ LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 
 $(DL_DIR)/$(LIBUPNP_SOURCE):
-	$(DOWNLOAD) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE)
+	$(download) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE)
 
 LIBUPNP_CONV_OPTS = \
 	--enable-shared \
@@ -81,7 +81,7 @@ LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2
 LIBDVBSI_SITE = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VERSION)
 
 $(DL_DIR)/$(LIBDVBSI_SOURCE):
-	$(DOWNLOAD) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE)
+	$(download) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE)
 
 LIBDVBSI_CONV_OPTS = \
 	--enable-silent-rules \
@@ -120,7 +120,7 @@ GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.gz
 GIFLIB_SITE = https://sourceforge.net/projects/giflib/files
 
 $(DL_DIR)/$(GIFLIB_SOURCE):
-	$(DOWNLOAD) $(GIFLIB_SITE)/$(GIFLIB_SOURCE)
+	$(download) $(GIFLIB_SITE)/$(GIFLIB_SOURCE)
 
 giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -140,7 +140,7 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = https://curl.haxx.se/download
 
 $(DL_DIR)/$(LIBCURL_SOURCE):
-	$(DOWNLOAD) $(LIBCURL_SITE)/$(LIBCURL_SOURCE)
+	$(download) $(LIBCURL_SITE)/$(LIBCURL_SOURCE)
 
 LIBCURL_DEPENDENCIES = zlib openssl rtmpdump ca-bundle
 
@@ -182,7 +182,7 @@ LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VERSION)
 
 $(DL_DIR)/$(LIBPNG_SOURCE):
-	$(DOWNLOAD) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
+	$(download) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
 
 LIBPNG_DEPENDENCIES = zlib
 
@@ -205,7 +205,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz
 FREETYPE_SITE = https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VERSION)
 
 $(DL_DIR)/$(FREETYPE_SOURCE):
-	$(DOWNLOAD) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
+	$(download) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
 
 FREETYPE_DEPENDENCIES = zlib libpng
 
@@ -249,7 +249,7 @@ LIBJPEG_TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG_TURBO_VERSION).tar.gz
 LIBJPEG_TURBO_SITE = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG_TURBO_VERSION)
 
 $(DL_DIR)/$(LIBJPEG_TURBO_SOURCE):
-	$(DOWNLOAD) $(LIBJPEG_TURBO_SITE)/$(LIBJPEG_TURBO_SOURCE)
+	$(download) $(LIBJPEG_TURBO_SITE)/$(LIBJPEG_TURBO_SOURCE)
 
 LIBJPEG_TURBO_CONF_OPTS = \
 	-DWITH_SIMD=False \
@@ -267,7 +267,7 @@ OPENSSL_SOURCE = openssl-$(OPENSSL_VERSION).tar.gz
 OPENSSL_SITE = https://www.openssl.org/source
 
 $(DL_DIR)/$(OPENSSL_SOURCE):
-	$(DOWNLOAD) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
+	$(download) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
 
 ifeq ($(TARGET_ARCH),arm)
   OPENSSL_TARGET_ARCH = linux-armv4
@@ -334,7 +334,7 @@ NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_SITE = $(GNU_MIRROR)/ncurses
 
 $(DL_DIR)/$(NCURSES_SOURCE):
-	$(DOWNLOAD) $(NCURSES_SITE)/$(NCURSES_SOURCE)
+	$(download) $(NCURSES_SITE)/$(NCURSES_SOURCE)
 
 NCURSES_CONFIG_SCRIPTS = ncurses6-config
 
@@ -392,7 +392,7 @@ LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION)
 
 $(DL_DIR)/$(LIBUSB_SOURCE):
-	$(DOWNLOAD) $(LIBUSB_SITE)/$(LIBUSB_SOURCE)
+	$(download) $(LIBUSB_SITE)/$(LIBUSB_SOURCE)
 
 LIBUSB_CONF_OPTS = \
 	--disable-udev
@@ -408,7 +408,7 @@ LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
 LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION)
 
 $(DL_DIR)/$(LIBUSB_COMPAT_SOURCE):
-	$(DOWNLOAD) $(LIBUSB_COMPAT_SITE)/$(LIBUSB_COMPAT_SOURCE)
+	$(download) $(LIBUSB_COMPAT_SITE)/$(LIBUSB_COMPAT_SOURCE)
 
 LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config
 
@@ -425,7 +425,7 @@ LIBGD_SOURCE = libgd-$(LIBGD_VERSION).tar.xz
 LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VERSION)
 
 $(DL_DIR)/$(LIBGD_SOURCE):
-	$(DOWNLOAD) $(LIBGD_SITE)/$(LIBGD_SOURCE)
+	$(download) $(LIBGD_SITE)/$(LIBGD_SOURCE)
 
 LIBGD_DEPENDENCIES = zlib libpng libjpeg-turbo freetype
 
@@ -472,7 +472,7 @@ LZO_SOURCE = lzo-$(LZO_VERSION).tar.gz
 LZO_SITE = https://www.oberhumer.com/opensource/lzo/download
 
 $(DL_DIR)/$(LZO_SOURCE):
-	$(DOWNLOAD) $(LZO_SITE)/$(LZO_SOURCE)
+	$(download) $(LZO_SITE)/$(LZO_SOURCE)
 
 LZO_CONF_OPTS = \
 	--docdir=$(REMOVE_docdir)
@@ -488,7 +488,7 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
 LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSIGC_VERSION))
 
 $(DL_DIR)/$(LIBSIGC_SOURCE):
-	$(DOWNLOAD) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE)
+	$(download) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE)
 
 LIBSIGC_CONF_OPTS = \
 	--disable-benchmark \
@@ -517,7 +517,7 @@ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
 EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION)
 
 $(DL_DIR)/$(EXPAT_SOURCE):
-	$(DOWNLOAD) $(EXPAT_SITE)/$(EXPAT_SOURCE)
+	$(download) $(EXPAT_SITE)/$(EXPAT_SOURCE)
 
 EXPAT_AUTORECONF = YES
 
@@ -537,7 +537,7 @@ LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2
 LIBBLURAY_SITE = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION)
 
 $(DL_DIR)/$(LIBBLURAY_SOURCE):
-	$(DOWNLOAD) $(LIBBLURAY_SITE)/$(LIBBLURAY_SOURCE)
+	$(download) $(LIBBLURAY_SITE)/$(LIBBLURAY_SOURCE)
 
 LIBBLURAY_DEPENDENCIES = freetype
 ifeq ($(BOXSERIES),hd2)
@@ -579,7 +579,7 @@ LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
 LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSION)
 
 $(DL_DIR)/$(LIBASS_SOURCE):
-	$(DOWNLOAD) $(LIBASS_SITE)/$(LIBASS_SOURCE)
+	$(download) $(LIBASS_SITE)/$(LIBASS_SOURCE)
 
 LIBASS_DEPENDENCIES = freetype fribidi
 
@@ -601,7 +601,7 @@ LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 
 $(DL_DIR)/$(LIBGPG_ERROR_SOURCE):
-	$(DOWNLOAD) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE)
+	$(download) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE)
 
 LIBGPG_ERROR_AUTORECONF = YES
 
@@ -641,7 +641,7 @@ LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.gz
 LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 
 $(DL_DIR)/$(LIBGCRYPT_SOURCE):
-	$(DOWNLOAD) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE)
+	$(download) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE)
 
 LIBGCRYPT_DEPENDENCIES = libgpg-error
 
@@ -667,7 +667,7 @@ LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2
 LIBAACS_SITE = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION)
 
 $(DL_DIR)/$(LIBAACS_SOURCE):
-	$(DOWNLOAD) $(LIBAACS_SITE)/$(LIBAACS_SOURCE)
+	$(download) $(LIBAACS_SITE)/$(LIBAACS_SOURCE)
 
 LIBAACS_DEPENDENCIES = libgcrypt
 
@@ -699,7 +699,7 @@ LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2
 LIBBDPLUS_SITE = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION)
 
 $(DL_DIR)/$(LIBBDPLUS_SOURCE):
-	$(DOWNLOAD) $(LIBBDPLUS_SITE)/$(LIBBDPLUS_SOURCE)
+	$(download) $(LIBBDPLUS_SITE)/$(LIBBDPLUS_SOURCE)
 
 LIBBDPLUS_DEPENDENCIES = libaacs
 
@@ -731,7 +731,7 @@ LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.gz
 LIBXML2_SITE = http://xmlsoft.org/sources
 
 $(DL_DIR)/$(LIBXML2_SOURCE):
-	$(DOWNLOAD) $(LIBXML2_SITE)/$(LIBXML2_SOURCE)
+	$(download) $(LIBXML2_SITE)/$(LIBXML2_SOURCE)
 
 LIBXML2_CONFIG_SCRIPTS = xml2-config
 
@@ -762,7 +762,7 @@ PUGIXML_SOURCE = pugixml-$(PUGIXML_VERSION).tar.gz
 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION)
 
 $(DL_DIR)/$(PUGIXML_SOURCE):
-	$(DOWNLOAD) $(PUGIXML_SITE)/$(PUGIXML_SOURCE)
+	$(download) $(PUGIXML_SITE)/$(PUGIXML_SOURCE)
 
 pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
 	$(call cmake-package)
@@ -775,7 +775,7 @@ LIBROXML_SOURCE = libroxml-$(LIBROXML_VERSION).tar.gz
 LIBROXML_SITE = http://download.libroxml.net/pool/v3.x
 
 $(DL_DIR)/$(LIBROXML_SOURCE):
-	$(DOWNLOAD) $(LIBROXML_SITE)/$(LIBROXML_SOURCE)
+	$(download) $(LIBROXML_SITE)/$(LIBROXML_SOURCE)
 
 LIBROXML_CONF_OPTS = \
 	--disable-roxml
@@ -791,7 +791,7 @@ LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.gz
 LIBXSLT_SITE = ftp://xmlsoft.org/libxml2
 
 $(DL_DIR)/$(LIBXSLT_SOURCE):
-	$(DOWNLOAD) $(LIBXSLT_SITE)/$(LIBXSLT_SOURCE)
+	$(download) $(LIBXSLT_SITE)/$(LIBXSLT_SOURCE)
 
 LIBXSLT_DEPENDENCIES = libxml2
 
@@ -842,7 +842,7 @@ LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
 LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VERSION)
 
 $(DL_DIR)/$(LIBTIRPC_SOURCE):
-	$(DOWNLOAD) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE)
+	$(download) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE)
 
 LIBTIRPC_AUTORECONF = YES
 
@@ -864,7 +864,7 @@ CONFUSE_SOURCE = confuse-$(CONFUSE_VERSION).tar.xz
 CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VERSION)
 
 $(DL_DIR)/$(CONFUSE_SOURCE):
-	$(DOWNLOAD) $(CONFUSE_SITE)/$(CONFUSE_SOURCE)
+	$(download) $(CONFUSE_SITE)/$(CONFUSE_SOURCE)
 
 CONFUSE_CONF_OPTS = \
 	--docdir=$(REMOVE_docdir) \
@@ -883,7 +883,7 @@ LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz
 LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION)
 
 $(DL_DIR)/$(LIBITE_SOURCE):
-	$(DOWNLOAD) $(LIBITE_SITE)/$(LIBITE_SOURCE)
+	$(download) $(LIBITE_SITE)/$(LIBITE_SOURCE)
 
 LIBITE_CONF_OPTS = \
 	--docdir=$(REMOVE_docdir) \
@@ -902,7 +902,7 @@ LIBMAD_SOURCE = libmad-$(LIBMAD_VERSION).tar.gz
 LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VERSION)
 
 $(DL_DIR)/$(LIBMAD_SOURCE):
-	$(DOWNLOAD) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
+	$(download) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
 
 LIBMAD_AUTORECONF = YES
 
@@ -923,7 +923,7 @@ LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
 LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis
 
 $(DL_DIR)/$(LIBVORBIS_SOURCE):
-	$(DOWNLOAD) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE)
+	$(download) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE)
 
 LIBVORBIS_DEPENDENCIES = libogg
 
@@ -946,7 +946,7 @@ LIBVORBISIDEC_SOURCE = libvorbisidec_$(LIBVORBISIDEC_VERSION).orig.tar.gz
 LIBVORBISIDEC_SITE = https://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec
 
 $(DL_DIR)/$(LIBVORBISIDEC_SOURCE):
-	$(DOWNLOAD) $(LIBVORBISIDEC_SITE)/$(LIBVORBISIDEC_SOURCE)
+	$(download) $(LIBVORBISIDEC_SITE)/$(LIBVORBISIDEC_SOURCE)
 
 LIBVORBISIDEC_DEPENDENCIES = libogg
 
@@ -972,7 +972,7 @@ LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 
 $(DL_DIR)/$(LIBOGG_SOURCE):
-	$(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE)
+	$(download) $(LIBOGG_SITE)/$(LIBOGG_SOURCE)
 
 LIBOGG_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir) \
@@ -989,7 +989,7 @@ LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz
 LIBEXIF_SITE = https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VERSION))-release
 
 $(DL_DIR)/$(LIBEXIF_SOURCE):
-	$(DOWNLOAD) $(LIBEXIF_SITE)/$(LIBEXIF_SOURCE)
+	$(download) $(LIBEXIF_SITE)/$(LIBEXIF_SOURCE)
 
 LIBEXIF_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir) \
@@ -1006,7 +1006,7 @@ FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VERSION).tar.xz
 FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)
 
 $(DL_DIR)/$(FRIBIDI_SOURCE):
-	$(DOWNLOAD) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE)
+	$(download) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE)
 
 FRIBIDI_CONF_OPTS = \
 	--disable-debug \
@@ -1023,7 +1023,7 @@ LIBFFI_SOURCE = libffi-$(LIBFFI_VERSION).tar.gz
 LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION)
 
 $(DL_DIR)/$(LIBFFI_SOURCE):
-	$(DOWNLOAD) $(LIBFFI_SITE)/$(LIBFFI_SOURCE)
+	$(download) $(LIBFFI_SITE)/$(LIBFFI_SOURCE)
 
 LIBFFI_AUTORECONF = YES
 
@@ -1042,7 +1042,7 @@ GLIB2_SOURCE = glib-$(GLIB2_VERSION).tar.xz
 GLIB2_SITE = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_VERSION))
 
 $(DL_DIR)/$(GLIB2_SOURCE):
-	$(DOWNLOAD) $(GLIB2_SITE)/$(GLIB2_SOURCE)
+	$(download) $(GLIB2_SITE)/$(GLIB2_SOURCE)
 
 GLIB2_DEPENDENCIES = zlib libffi
 ifeq ($(BOXSERIES),hd2)
@@ -1098,7 +1098,7 @@ ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib
 
 $(DL_DIR)/$(ALSA_LIB_SOURCE):
-	$(DOWNLOAD) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE)
+	$(download) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE)
 
 ALSA_LIB_AUTORECONF = YES
 
@@ -1133,7 +1133,7 @@ POPT_SOURCE = popt-$(POPT_VERSION).tar.gz
 POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt
 
 $(DL_DIR)/$(POPT_SOURCE):
-	$(DOWNLOAD) $(POPT_SITE)/$(POPT_SOURCE)
+	$(download) $(POPT_SITE)/$(POPT_SOURCE)
 
 POPT_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir)
@@ -1149,7 +1149,7 @@ LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONV_SITE = $(GNU_MIRROR)/libiconv
 
 $(DL_DIR)/$(LIBICONV_SOURCE):
-	$(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE)
+	$(download) $(LIBICONV_SITE)/$(LIBICONV_SOURCE)
 
 LIBICONV_CONF_ENV = \
 	CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC"
diff --git a/make/target-lua.mk b/make/target-lua.mk
index e482e7bd..aabfaa5c 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -10,7 +10,7 @@ LUA_SOURCE = lua-$(LUA_VERSION).tar.gz
 LUA_SITE = https://www.lua.org
 
 $(DL_DIR)/$(LUA_SOURCE):
-	$(DOWNLOAD) $(LUA_SITE)/ftp/$(LUA_SOURCE)
+	$(download) $(LUA_SITE)/ftp/$(LUA_SOURCE)
 
 LUA_DEPENDENCIES = ncurses
 
@@ -39,7 +39,7 @@ LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VERSION).tar.gz
 LUAEXPAT_SITE = https://github.com/tomasguisasola/luaexpat/archive
 
 $(DL_DIR)/$(LUAEXPAT_SOURCE):
-	$(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VERSION).tar.gz -O $(@)
+	$(download) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VERSION).tar.gz -O $(@)
 
 LUAEXPAT_DEPENDENCIES = expat lua
 
@@ -70,7 +70,7 @@ LUA_FEEDPARSER_SOURCE = lua-feedparser-$(LUA_FEEDPARSER_VERSION).tar.gz
 LUA_FEEDPARSER_SITE = https://github.com/slact/lua-feedparser/archive
 
 $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE):
-	$(DOWNLOAD) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VERSION).tar.gz -O $(@)
+	$(download) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VERSION).tar.gz -O $(@)
 
 LUA_FEEDPARSER_DEPENDENCIES = luaexpat
 
@@ -90,7 +90,7 @@ LUAJSON_SOURCE = JSON.lua
 LUAJSON_SITE = http://regex.info/code
 
 $(DL_DIR)/$(LUAJSON_SOURCE):
-	$(DOWNLOAD) $(LUAJSON_SITE)/$(LUAJSON_SOURCE)
+	$(download) $(LUAJSON_SITE)/$(LUAJSON_SOURCE)
 
 luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 	$(CD) $(DL_DIR); \
@@ -135,7 +135,7 @@ LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VERSION).tar.gz
 LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive
 
 $(DL_DIR)/$(LUAPOSIX_SOURCE):
-	$(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VERSION).tar.gz -O $(@)
+	$(download) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VERSION).tar.gz -O $(@)
 
 LUAPOSIX_DEPENDENCIES = $(HOST_LUA) lua luaexpat
 
@@ -156,14 +156,14 @@ GNULIB_SOURCE = gnulib-$(GNULIB_VERSION)-stable.tar.gz
 GNULIB_SITE = http://erislabs.net/ianb/projects/gnulib
 
 $(DL_DIR)/$(GNULIB_SOURCE):
-	$(DOWNLOAD) $(GNULIB_SITE)/$(GNULIB_SOURCE)
+	$(download) $(GNULIB_SITE)/$(GNULIB_SOURCE)
 
 SLINGSHOT_VERSION = 6
 SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VERSION).tar.gz
 SLINGSHOT_SITE = https://github.com/gvvaughan/slingshot/archive
 
 $(DL_DIR)/$(SLINGSHOT_SOURCE):
-	$(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VERSION).tar.gz -O $(@)
+	$(download) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VERSION).tar.gz -O $(@)
 
 luaposix: $(LUAPOSIX_DEPENDENCIES) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk
index 900fc23b..0ae3d945 100644
--- a/make/target-neutrino-plugins.mk
+++ b/make/target-neutrino-plugins.mk
@@ -220,7 +220,7 @@ LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2
 LINKS_SITE = http://links.twibright.com/download
 
 $(DL_DIR)/$(LINKS_SOURCE):
-	$(DOWNLOAD) $(LINKS_SITE)/$(LINKS_SOURCE)
+	$(download) $(LINKS_SITE)/$(LINKS_SOURCE)
 
 LINKS_DEPENDENCIES = libpng libjpeg-turbo openssl
 
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index 82edc838..aa7d52ba 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -10,7 +10,7 @@ USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
 USBUTILS_SITE = $(KERNEL_MIRROR)/linux/utils/usb/usbutils
 
 $(DL_DIR)/$(USBUTILS_SOURCE):
-	$(DOWNLOAD) $(USBUTILS_SITE)/$(USBUTILS_SOURCE)
+	$(download) $(USBUTILS_SITE)/$(USBUTILS_SOURCE)
 
 USBUTILS_DEPENDENCIES = libusb-compat
 
@@ -38,7 +38,7 @@ BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_SITE = $(GNU_MIRROR)/binutils
 
 $(DL_DIR)/$(BINUTILS_SOURCE):
-	$(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
+	$(download) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
 
 BINUTILS_CONF_OPTS = \
 	--disable-multilib \
@@ -70,7 +70,7 @@ BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VERSION).tar.gz
 BASE_PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files
 
 $(DL_DIR)/$(BASE_PASSWD_SOURCE):
-	$(DOWNLOAD) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE)
+	$(download) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE)
 
 base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -93,7 +93,7 @@ SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
 
 $(DL_DIR)/$(SHADOW_SOURCE):
-	$(DOWNLOAD) $(SHADOW_SITE)/$(SHADOW_SOURCE)
+	$(download) $(SHADOW_SITE)/$(SHADOW_SOURCE)
 
 SHADOW_CONF_OPTS = \
 	--prefix=$(base_prefix) \
@@ -119,7 +119,7 @@ BZIP2_SOURCE = bzip2-$(BZIP2_VERSION).tar.gz
 BZIP2_SITE = https://sourceware.org/pub/bzip2
 
 $(DL_DIR)/$(BZIP2_SOURCE):
-	$(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE)
+	$(download) $(BZIP2_SITE)/$(BZIP2_SOURCE)
 
 bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -168,7 +168,7 @@ IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
 IOZONE_SITE = http://www.iozone.org/src/current
 
 $(DL_DIR)/$(IOZONE_SOURCE):
-	$(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE)
+	$(download) $(IOZONE_SITE)/$(IOZONE_SOURCE)
 
 iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -190,7 +190,7 @@ READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
 READLINE_SITE = $(GNU_MIRROR)/readline
 
 $(DL_DIR)/$(READLINE_SOURCE):
-	$(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE)
+	$(download) $(READLINE_SITE)/$(READLINE_SOURCE)
 
 READLINE_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir)
@@ -213,7 +213,7 @@ LIBZEN_SOURCE = libzen_$(LIBZEN_VERSION).tar.bz2
 LIBZEN_SITE = https://mediaarea.net/download/source/libzen/$(LIBZEN_VERSION)
 
 $(DL_DIR)/$(LIBZEN_SOURCE):
-	$(DOWNLOAD) $(LIBZEN_SITE)/$(LIBZEN_SOURCE)
+	$(download) $(LIBZEN_SITE)/$(LIBZEN_SOURCE)
 
 LIBZEN_DEPENDENCIES = zlib
 
@@ -238,7 +238,7 @@ LIBMEDIAINFO_SOURCE = libmediainfo_$(LIBMEDIAINFO_VERSION).tar.bz2
 LIBMEDIAINFO_SITE = https://mediaarea.net/download/source/libmediainfo/$(LIBMEDIAINFO_VERSION)
 
 $(DL_DIR)/$(LIBMEDIAINFO_SOURCE):
-	$(DOWNLOAD) $(LIBMEDIAINFO_SITE)/$(LIBMEDIAINFO_SOURCE)
+	$(download) $(LIBMEDIAINFO_SITE)/$(LIBMEDIAINFO_SOURCE)
 
 LIBMEDIAINFO_DEPENDENCIES = libzen
 
@@ -263,7 +263,7 @@ MEDIAINFO_SOURCE = mediainfo_$(MEDIAINFO_VERSION).tar.bz2
 MEDIAINFO_SITE = https://mediaarea.net/download/source/mediainfo/$(MEDIAINFO_VERSION)
 
 $(DL_DIR)/$(MEDIAINFO_SOURCE):
-	$(DOWNLOAD) $(MEDIAINFO_SITE)/$(MEDIAINFO_SOURCE)
+	$(download) $(MEDIAINFO_SITE)/$(MEDIAINFO_SOURCE)
 
 MEDIAINFO_DEPENDENCIES = libmediainfo
 
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 65b85ced..55019bfb 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -14,7 +14,7 @@ BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_SITE = https://busybox.net/downloads
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
-	$(DOWNLOAD) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
+	$(download) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
 
 BUSYBOX_DEPENDENCIES = libtirpc
 
@@ -170,7 +170,7 @@ BASH_SOURCE = bash-$(BASH_VERSION).tar.gz
 BASH_SITE = $(GNU_MIRROR)/bash
 
 $(DL_DIR)/$(BASH_SOURCE):
-	$(DOWNLOAD) $(BASH_SITE)/$(BASH_SOURCE)
+	$(download) $(BASH_SITE)/$(BASH_SOURCE)
 
 BASH_CONF_ENV += \
 	bash_cv_getcwd_malloc=yes \
@@ -211,7 +211,7 @@ SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz
 SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit
 
 $(DL_DIR)/$(SYSVINIT_SOURCE):
-	$(DOWNLOAD) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE)
+	$(download) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE)
 
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
   define SYSVINIT_INSTALL_RCS
@@ -256,7 +256,7 @@ COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
 COREUTILS_SITE = $(GNU_MIRROR)/coreutils
 
 $(DL_DIR)/$(COREUTILS_SOURCE):
-	$(DOWNLOAD) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
+	$(download) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
 
 COREUTILS_AUTORECONF = YES
 
@@ -293,7 +293,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
 PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production
 
 $(DL_DIR)/$(PROCPS_NG_SOURCE):
-	$(DOWNLOAD) $(PROCPS_NG_SITE)/$(PROCPS_NG_SOURCE)
+	$(download) $(PROCPS_NG_SITE)/$(PROCPS_NG_SOURCE)
 
 PROCPS_NG_DEPENDENCIES = ncurses
 
@@ -334,7 +334,7 @@ MTD_UTILS_SOURCE = mtd-utils-$(MTD_UTILS_VERSION).tar.bz2
 MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 
 $(DL_DIR)/$(MTD_UTILS_SOURCE):
-	$(DOWNLOAD) $(MTD_UTILS_SITE)/$(MTD_UTILS_SOURCE)
+	$(download) $(MTD_UTILS_SITE)/$(MTD_UTILS_SOURCE)
 
 MTD_UTILS_DEPENDENCIES =
 
@@ -378,7 +378,7 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
 
 $(DL_DIR)/$(DOSFSTOOLS_SOURCE):
-	$(DOWNLOAD) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE)
+	$(download) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE)
 
 DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer
 
@@ -403,7 +403,7 @@ NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = https://tuxera.com/opensource
 
 $(DL_DIR)/$(NTFS_3G_SOURCE):
-	$(DOWNLOAD) $(NTFS_3G_SITE)/$(NTFS_3G_SOURCE)
+	$(download) $(NTFS_3G_SITE)/$(NTFS_3G_SOURCE)
 
 NTFS_3G_DEPENDENCIES = libfuse
 
@@ -432,7 +432,7 @@ FUSE_EXFAT_SOURCE = fuse-exfat-$(FUSE_EXFAT_VERSION).tar.gz
 FUSE_EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VERSION)
 
 $(DL_DIR)/$(FUSE_EXFAT_SOURCE):
-	$(DOWNLOAD) $(FUSE_EXFAT_SITE)/$(FUSE_EXFAT_SOURCE)
+	$(download) $(FUSE_EXFAT_SITE)/$(FUSE_EXFAT_SOURCE)
 
 FUSE_EXFAT_DEPENDENCIES = libfuse
 
@@ -456,7 +456,7 @@ EXFAT_UTILS_SOURCE = exfat-utils-$(EXFAT_UTILS_VERSION).tar.gz
 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
 
 $(DL_DIR)/$(EXFAT_UTILS_SOURCE):
-	$(DOWNLOAD) $(EXFAT_UTILS_SITE)/$(EXFAT_UTILS_SOURCE)
+	$(download) $(EXFAT_UTILS_SITE)/$(EXFAT_UTILS_SOURCE)
 
 EXFAT_UTILS_DEPENDENCIES = fuse-exfat
 
@@ -480,7 +480,7 @@ XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
 XFSPROGS_SITE = $(KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
 
 $(DL_DIR)/$(XFSPROGS_SOURCE):
-	$(DOWNLOAD) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)
+	$(download) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)
 
 XFSPROGS_DEPENDENCIES = util-linux
 
@@ -519,7 +519,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
 E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VERSION)
 
 $(DL_DIR)/$(E2FSPROGS_SOURCE):
-	$(DOWNLOAD) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE)
+	$(download) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE)
 
 #E2FSPROGS_DEPENDENCIES = util-linux
 
@@ -582,7 +582,7 @@ HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
 HDPARM_SITE = https://sourceforge.net/projects/hdparm/files/hdparm
 
 $(DL_DIR)/$(HDPARM_SOURCE):
-	$(DOWNLOAD) $(HDPARM_SITE)/$(HDPARM_SOURCE)
+	$(download) $(HDPARM_SITE)/$(HDPARM_SOURCE)
 
 hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -603,7 +603,7 @@ F2FS_TOOLS_SOURCE = f2fs-tools-$(F2FS_TOOLS_VERSION).tar.gz
 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot
 
 $(DL_DIR)/$(F2FS_TOOLS_SOURCE):
-	$(DOWNLOAD) $(F2FS_TOOLS_SITE)/$(F2FS_TOOLS_SOURCE)
+	$(download) $(F2FS_TOOLS_SITE)/$(F2FS_TOOLS_SOURCE)
 
 F2FS_TOOLS_DEPENDENCIES = util-linux
 
@@ -631,7 +631,7 @@ UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL_LINUX_VERSION))
 
 $(DL_DIR)/$(UTIL_LINUX_SOURCE):
-	$(DOWNLOAD) $(UTIL_LINUX_SITE)/$(UTIL_LINUX_SOURCE)
+	$(download) $(UTIL_LINUX_SITE)/$(UTIL_LINUX_SOURCE)
 
 UTIL_LINUX_DEPENDENCIES = ncurses zlib
 
@@ -688,7 +688,7 @@ OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
 OPENVPN_SITE = http://build.openvpn.net/downloads/releases
 
 $(DL_DIR)/$(OPENVPN_SOURCE):
-	$(DOWNLOAD) $(OPENVPN_SITE)/$(OPENVPN_SOURCE)
+	$(download) $(OPENVPN_SITE)/$(OPENVPN_SOURCE)
 
 OPENVPN_DEPENDENCIES = lzo openssl
 
@@ -721,7 +721,7 @@ OPENSSH_SOURCE = openssh-$(OPENSSH_VERSION).tar.gz
 OPENSSH_SITE = https://artfiles.org/openbsd/OpenSSH/portable
 
 $(DL_DIR)/$(OPENSSH_SOURCE):
-	$(DOWNLOAD) $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
+	$(download) $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
 
 OPENSSH_DEPENDENCIES = openssl zlib
 
@@ -763,7 +763,7 @@ TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
 TZDATA_SITE = ftp://ftp.iana.org/tz/releases
 
 $(DL_DIR)/$(TZDATA_SOURCE):
-	$(DOWNLOAD) $(TZDATA_SITE)/$(TZDATA_SOURCE)
+	$(download) $(TZDATA_SITE)/$(TZDATA_SOURCE)
 
 TZDATA_DEPENDENCIES = host-zic
 
@@ -806,7 +806,7 @@ IPERF_SOURCE = iperf-$(IPERF_VERSION)-source.tar.gz
 IPERF_SITE = https://iperf.fr/download/source
 
 $(DL_DIR)/$(IPERF_SOURCE):
-	$(DOWNLOAD) $(IPERF_SITE)/$(IPERF_SOURCE)
+	$(download) $(IPERF_SITE)/$(IPERF_SOURCE)
 
 iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR)
 	$(call autotools-package)
@@ -819,7 +819,7 @@ PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
 PARTED_SITE = $(GNU_MIRROR)/parted
 
 $(DL_DIR)/$(PARTED_SOURCE):
-	$(DOWNLOAD) $(PARTED_SITE)/$(PARTED_SOURCE)
+	$(download) $(PARTED_SITE)/$(PARTED_SOURCE)
 
 PARTED_DEPENDENCIES = util-linux
 
@@ -850,7 +850,7 @@ HD_IDLE_SOURCE = hd-idle-$(HD_IDLE_VERSION).tgz
 HD_IDLE_SITE = https://sourceforge.net/projects/hd-idle/files
 
 $(DL_DIR)/$(HD_IDLE_SOURCE):
-	$(DOWNLOAD) $(HD_IDLE_SITE)/$(HD_IDLE_SOURCE)
+	$(download) $(HD_IDLE_SITE)/$(HD_IDLE_SOURCE)
 
 hd-idle: $(DL_DIR)/$(HD_IDLE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -870,7 +870,7 @@ LESS_SOURCE = less-$(LESS_VERSION).tar.gz
 LESS_SITE = $(GNU_MIRROR)/less
 
 $(DL_DIR)/$(LESS_SOURCE):
-	$(DOWNLOAD) $(LESS_SITE)/$(LESS_SOURCE)
+	$(download) $(LESS_SITE)/$(LESS_SOURCE)
 
 LESS_DEPENDENCIES = ncurses
 
@@ -885,7 +885,7 @@ NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VERSION))
 
 $(DL_DIR)/$(NTP_SOURCE):
-	$(DOWNLOAD) $(NTP_SITE)/$(NTP_SOURCE)
+	$(download) $(NTP_SITE)/$(NTP_SOURCE)
 
 NTP_DEPENDENCIES = openssl
 
@@ -917,7 +917,7 @@ DJMOUNT_SOURCE = djmount-$(DJMOUNT_VERSION).tar.gz
 DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VERSION)
 
 $(DL_DIR)/$(DJMOUNT_SOURCE):
-	$(DOWNLOAD) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE)
+	$(download) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE)
 
 DJMOUNT_DEPENDENCIES = libfuse
 
@@ -949,7 +949,7 @@ USHARE_SOURCE = uShare_v$(USHARE_VERSION).tar.gz
 USHARE_SITE = https://github.com/GeeXboX/ushare/archive
 
 $(DL_DIR)/$(USHARE_SOURCE):
-	$(DOWNLOAD) $(USHARE_SITE)/$(USHARE_SOURCE)
+	$(download) $(USHARE_SITE)/$(USHARE_SOURCE)
 
 USHARE_DEPENDENCIES = libupnp
 
@@ -985,7 +985,7 @@ SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org/2020
 
 $(DL_DIR)/$(SQLITE_SOURCE):
-	$(DOWNLOAD) $(SQLITE_SITE)/$(SQLITE_SOURCE)
+	$(download) $(SQLITE_SITE)/$(SQLITE_SOURCE)
 
 SQLITE_CONF_OPTS = \
 	--bindir=$(REMOVE_bindir)
@@ -1001,7 +1001,7 @@ MINIDLNA_SOURCE = minidlna-$(MINIDLNA_VERSION).tar.gz
 MINIDLNA_SITE = https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VERSION)
 
 $(DL_DIR)/$(MINIDLNA_SOURCE):
-	$(DOWNLOAD) $(MINIDLNA_SITE)/$(MINIDLNA_SOURCE)
+	$(download) $(MINIDLNA_SITE)/$(MINIDLNA_SOURCE)
 
 MINIDLNA_DEPENDENCIES = zlib sqlite libexif libjpeg-turbo libid3tag libogg libvorbis flac ffmpeg
 
@@ -1036,7 +1036,7 @@ SMARTMONTOOLS_SOURCE = smartmontools-$(SMARTMONTOOLS_VERSION).tar.gz
 SMARTMONTOOLS_SITE = https://sourceforge.net/projects/smartmontools/files/smartmontools/$(SMARTMONTOOLS_VERSION)
 
 $(DL_DIR)/$(SMARTMONTOOLS_SOURCE):
-	$(DOWNLOAD) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE)
+	$(download) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE)
 
 smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -1056,7 +1056,7 @@ INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
 
 $(DL_DIR)/$(INADYN_SOURCE):
-	$(DOWNLOAD) $(INADYN_SITE)/$(INADYN_SOURCE)
+	$(download) $(INADYN_SITE)/$(INADYN_SOURCE)
 
 INADYN_DEPENDENCIES = openssl confuse libite
 
@@ -1088,7 +1088,7 @@ VSFTPD_SOURCE = vsftpd-$(VSFTPD_VERSION).tar.gz
 VSFTPD_SITE = https://security.appspot.com/downloads
 
 $(DL_DIR)/$(VSFTPD_SOURCE):
-	$(DOWNLOAD) $(VSFTPD_SITE)/$(VSFTPD_SOURCE)
+	$(download) $(VSFTPD_SITE)/$(VSFTPD_SOURCE)
 
 VSFTPD_LIBS += -lcrypt $$($(PKG_CONFIG) --libs libssl libcrypto)
 
@@ -1120,7 +1120,7 @@ NANO_SOURCE = nano-$(NANO_VERSION).tar.gz
 NANO_SITE = $(GNU_MIRROR)/nano
 
 $(DL_DIR)/$(NANO_SOURCE):
-	$(DOWNLOAD) $(NANO_SITE)/$(NANO_SOURCE)
+	$(download) $(NANO_SITE)/$(NANO_SOURCE)
 
 NANO_DEPENDENCIES = ncurses
 
@@ -1155,7 +1155,7 @@ MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
 MINICOM_SITE = http://fossies.org/linux/misc
 
 $(DL_DIR)/$(MINICOM_SOURCE):
-	$(DOWNLOAD) $(MINICOM_SITE)/$(MINICOM_SOURCE)
+	$(download) $(MINICOM_SITE)/$(MINICOM_SOURCE)
 
 MINICOM_DEPENDENCIES = ncurses
 
@@ -1181,7 +1181,7 @@ AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
 AUTOFS_SITE = $(KERNEL_MIRROR)/linux/daemons/autofs/v5
 
 $(DL_DIR)/$(AUTOFS_SOURCE):
-	$(DOWNLOAD) $(AUTOFS_SITE)/$(AUTOFS_SOURCE)
+	$(download) $(AUTOFS_SITE)/$(AUTOFS_SOURCE)
 
 # cd package/autofs/patches
 # wget -N https://mirrors.edge.kernel.org/pub/linux/daemons/autofs/v5/patches-5.1.6/patch_order_5.1.5
@@ -1241,7 +1241,7 @@ SAMBA33_SOURCE = samba-$(SAMBA33_VERSION).tar.gz
 SAMBA33_SITE = https://download.samba.org/pub/samba
 
 $(DL_DIR)/$(SAMBA33_SOURCE):
-	$(DOWNLOAD) $(SAMBA33_SITE)/$(SAMBA33_SOURCE)
+	$(download) $(SAMBA33_SITE)/$(SAMBA33_SOURCE)
 
 SAMBA33_DEPENDENCIES = zlib
 
@@ -1313,7 +1313,7 @@ SAMBA36_SOURCE = samba-$(SAMBA36_VERSION).tar.gz
 SAMBA36_SITE = https://download.samba.org/pub/samba/stable
 
 $(DL_DIR)/$(SAMBA36_SOURCE):
-	$(DOWNLOAD) $(SAMBA36_SITE)/$(SAMBA36_SOURCE)
+	$(download) $(SAMBA36_SITE)/$(SAMBA36_SOURCE)
 
 SAMBA36_DEPENDENCIES = zlib
 
@@ -1383,7 +1383,7 @@ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 
 $(DL_DIR)/$(DROPBEAR_SOURCE):
-	$(DOWNLOAD) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
+	$(download) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
 
 DROPBEAR_DEPENDENCIES = zlib
 
@@ -1429,7 +1429,7 @@ SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
 SG3_UTILS_SITE = http://sg.danny.cz/sg/p
 
 $(DL_DIR)/$(SG3_UTILS_SOURCE):
-	$(DOWNLOAD) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE)
+	$(download) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE)
 
 SG3_UTILS_CONF_OPTS = \
 	--bindir=$(bindir).$(@F)
@@ -1454,7 +1454,7 @@ FBSHOT_SOURCE = fbshot-$(FBSHOT_VERSION).tar.gz
 FBSHOT_SITE = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot
 
 $(DL_DIR)/$(FBSHOT_SOURCE):
-	$(DOWNLOAD) $(FBSHOT_SITE)/$(FBSHOT_SOURCE)
+	$(download) $(FBSHOT_SITE)/$(FBSHOT_SOURCE)
 
 FBSHOT_DEPENDENCIES = libpng
 
@@ -1528,7 +1528,7 @@ WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz
 WPA_SUPPLICANT_SITE = https://w1.fi/releases
 
 $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE):
-	$(DOWNLOAD) $(WPA_SUPPLICANT_SITE)/$(WPA_SUPPLICANT_SOURCE)
+	$(download) $(WPA_SUPPLICANT_SITE)/$(WPA_SUPPLICANT_SOURCE)
 
 WPA_SUPPLICANT_DEPENDENCIES = openssl
 
@@ -1593,7 +1593,7 @@ NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
 NFS_UTILS_SITE = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
 
 $(DL_DIR)/$(NFS_UTILS_SOURCE):
-	$(DOWNLOAD) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE)
+	$(download) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE)
 
 NFS_UTILS_DEPENDENCIES = rpcbind
 
@@ -1637,7 +1637,7 @@ RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VERSION)
 
 $(DL_DIR)/$(RPCBIND_SOURCE):
-	$(DOWNLOAD) $(RPCBIND_SITE)/$(RPCBIND_SOURCE)
+	$(download) $(RPCBIND_SITE)/$(RPCBIND_SOURCE)
 
 RPCBIND_DEPENDENCIES = libtirpc
 
@@ -1687,7 +1687,7 @@ GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
 GETTEXT_SITE = $(GNU_MIRROR)/gettext
 
 $(DL_DIR)/$(GETTEXT_SOURCE):
-	$(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
+	$(download) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
 
 GETTEXT_AUTORECONF = YES
 
@@ -1722,7 +1722,7 @@ MC_SOURCE = mc-$(MC_VERSION).tar.xz
 MC_SITE = ftp.midnight-commander.org
 
 $(DL_DIR)/$(MC_SOURCE):
-	$(DOWNLOAD) $(MC_SITE)/$(MC_SOURCE)
+	$(download) $(MC_SITE)/$(MC_SOURCE)
 
 MC_DEPENDENCIES = glib2 ncurses
 
@@ -1756,7 +1756,7 @@ WGET_SOURCE = wget-$(WGET_VERSION).tar.gz
 WGET_SITE = $(GNU_MIRROR)/wget
 
 $(DL_DIR)/$(WGET_SOURCE):
-	$(DOWNLOAD) $(WGET_SITE)/$(WGET_SOURCE)
+	$(download) $(WGET_SITE)/$(WGET_SOURCE)
 
 WGET_DEPENDENCIES = openssl
 
@@ -1898,7 +1898,7 @@ ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(KERNEL_MIRROR)/software/network/ethtool
 
 $(DL_DIR)/$(ETHTOOL_SOURCE):
-	$(DOWNLOAD) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE)
+	$(download) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE)
 
 ETHTOOL_CONF_OPTS = \
 	--libdir=$(TARGET_libdir) \
@@ -1916,7 +1916,7 @@ GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VERSION).tar.gz
 GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VERSION)
 
 $(DL_DIR)/$(GPTFDISK_SOURCE):
-	$(DOWNLOAD) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE)
+	$(download) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE)
 
 GPTFDISK_DEPENDENCIES = popt e2fsprogs ncurses
 
@@ -1943,7 +1943,7 @@ RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
 RSYNC_SITE = https://download.samba.org/pub/rsync/src/
 
 $(DL_DIR)/$(RSYNC_SOURCE):
-	$(DOWNLOAD) $(RSYNC_SITE)/$(RSYNC_SOURCE)
+	$(download) $(RSYNC_SITE)/$(RSYNC_SOURCE)
 
 RSYNC_DEPENDENCIES = zlib popt
 
@@ -1965,7 +1965,7 @@ FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
 FLAC_SITE = http://downloads.xiph.org/releases/flac
 
 $(DL_DIR)/$(FLAC_SOURCE):
-	$(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE)
+	$(download) $(FLAC_SITE)/$(FLAC_SOURCE)
 
 FLAC_AUTORECONF = YES
 
@@ -1989,7 +1989,7 @@ CA_BUNDLE_SOURCE = cacert.pem
 CA_BUNDLE_SITE = https://curl.se/ca
 
 $(DL_DIR)/$(CA_BUNDLE_SOURCE):
-	$(DOWNLOAD) $(CA_BUNDLE_SITE)/$(CA_BUNDLE_SOURCE)
+	$(download) $(CA_BUNDLE_SITE)/$(CA_BUNDLE_SOURCE)
 
 CA_BUNDLE_CRT = ca-certificates.crt
 CA_BUNDLE_DIR = /etc/ssl/certs
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index b4c40fdc..1706df44 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -26,7 +26,7 @@ GCC_LINARO_SOURCE = gcc-linaro-$(GCC_LINARO_VERSION).tar.xz
 GCC_LINARO_SITE = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC_LINARO_VERSION)
 
 $(DL_DIR)/$(GCC_LINARO_SOURCE):
-	$(DOWNLOAD) $(GCC_LINARO_SITE)/$(GCC_LINARO_SOURCE)
+	$(download) $(GCC_LINARO_SITE)/$(GCC_LINARO_SOURCE)
 
 CROSSTOOL_NG_DEPS += $(DL_DIR)/$(GCC_LINARO_SOURCE)
 
diff --git a/package/ifenslave/ifenslave.mk b/package/ifenslave/ifenslave.mk
index 52776caf..446a4cef 100644
--- a/package/ifenslave/ifenslave.mk
+++ b/package/ifenslave/ifenslave.mk
@@ -10,7 +10,7 @@ IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz
 IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave
 
 $(DL_DIR)/$(IFENSLAVE_SOURCE):
-	$(DOWNLOAD) $(IFENSLAVE_SITE)/$(IFENSLAVE_SOURCE)
+	$(download) $(IFENSLAVE_SITE)/$(IFENSLAVE_SOURCE)
 
 ifenslave: $(DL_DIR)/$(IFENSLAVE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
index 403cb022..4040aabc 100644
--- a/package/sdl2/sdl2.mk
+++ b/package/sdl2/sdl2.mk
@@ -10,7 +10,7 @@ SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
 
 $(DL_DIR)/$(SDL2_SOURCE):
-	$(DOWNLOAD) $(SDL2_SITE)/$(SDL2_SOURCE)
+	$(download) $(SDL2_SITE)/$(SDL2_SOURCE)
 
 SDL2_DEPENDENCIES = alsa-lib