7 files changed, 11 insertions, 8 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh
index 30110067..cb103740 100644
--- a/scripts/build/binutils.sh
+++ b/scripts/build/binutils.sh
@@ -3,7 +3,7 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 do_print_filename() {
-    echo "${CT_BINUTILS_FILE}"
+    echo "binutils-${CT_BINUTILS_VERSION}"
 }
 
 # Download binutils
diff --git a/scripts/build/cc_core_gcc.sh b/scripts/build/cc_core_gcc.sh
index 52db1d3f..968e62e1 100644
--- a/scripts/build/cc_core_gcc.sh
+++ b/scripts/build/cc_core_gcc.sh
@@ -4,7 +4,7 @@
 
 do_print_filename() {
     [ "${CT_CC_CORE}" = "gcc" ] || return 0
-    echo "${CT_CC_CORE_FILE}"
+    echo "gcc-${CT_CC_CORE_VERSION}"
 }
 
 # Download core gcc
diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh
index 0b24f830..dc427cf0 100644
--- a/scripts/build/cc_gcc.sh
+++ b/scripts/build/cc_gcc.sh
@@ -4,7 +4,7 @@
 
 do_print_filename() {
     [ "${CT_CC}" = "gcc" ] || return 0
-    echo "${CT_CC_FILE}"
+    echo "gcc-${CT_CC_VERSION}"
 }
 
 # Download final gcc
diff --git a/scripts/build/kernel_linux.sh b/scripts/build/kernel_linux.sh
index f779505d..9c5341b3 100644
--- a/scripts/build/kernel_linux.sh
+++ b/scripts/build/kernel_linux.sh
@@ -4,7 +4,10 @@
 
 do_print_filename() {
     [ "${CT_KERNEL}" = "linux" ] || return 0
-    echo "${CT_KERNEL_FILE}"
+    case "${CT_KERNEL_LINUX_HEADERS_SANITISED}" in
+        y)  echo "linux-libc-headers-${CT_KERNEL_VERSION}";;
+        *)  echo "linux-${CT_KERNEL_VERSION}";;
+    esac
 }
 
 # Download the kernel
diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh
index 5474cda8..6b6e8902 100644
--- a/scripts/build/libc_glibc.sh
+++ b/scripts/build/libc_glibc.sh
@@ -4,11 +4,11 @@
 
 do_print_filename() {
     [ "${CT_LIBC}" = "glibc" ] || return 0
-    echo "${CT_LIBC_FILE}"
+    echo "glibc-${CT_LIBC_VERSION}"
     for addon in `do_libc_add_ons_list " "`; do
         # NPTL addon is not to be downloaded, in any case
         [ "${addon}" = "nptl" ] && continue || true
-        echo "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+        echo "glibc-${addon}-${CT_LIBC_VERSION}"
     done
 }
 
diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh
index cf434b09..0f0bf5c9 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -4,7 +4,7 @@
 
 do_print_filename() {
     [ "${CT_LIBC}" = "uClibc" ] || return 0
-    echo "${CT_LIBC_FILE}"
+    echo "uClibc-${CT_LIBC_VERSION}"
     [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true
 }
 
diff --git a/scripts/build/libfloat.sh b/scripts/build/libfloat.sh
index 20613efd..7fc9e6da 100644
--- a/scripts/build/libfloat.sh
+++ b/scripts/build/libfloat.sh
@@ -6,7 +6,7 @@
 if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
 
 do_print_filename() {
-    echo "${CT_LIBFLOAT_FILE}"
+    echo "libfloat-${CT_LIBFLOAT_VERSION}"
 }
 
 # Download libfloat