diff --git a/pkg/tc-linux_hdr/build b/pkg/linux_headers/build
similarity index 100%
rename from pkg/tc-linux_hdr/build
rename to pkg/linux_headers/build
diff --git a/pkg/tc-musl/build b/pkg/musl/build
similarity index 96%
rename from pkg/tc-musl/build
rename to pkg/musl/build
index a9af842..e214ea7 100755
--- a/pkg/tc-musl/build
+++ b/pkg/musl/build
@@ -3,7 +3,7 @@ SRCDIR="musl-$VERSION"
 TARBALL="$SRCDIR.tar.gz"
 URL="https://www.musl-libc.org/releases"
 SHA256SUM="d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118"
-DEPENDS="tc-gcc1 tc-linux_hdr"
+DEPENDS="tc-gcc1 linux_headers"
 
 prepare() {
 	return
diff --git a/pkg/tc-gcc1/build b/pkg/tc-gcc1/build
index 2711036..68138b6 100755
--- a/pkg/tc-gcc1/build
+++ b/pkg/tc-gcc1/build
@@ -3,7 +3,7 @@ SRCDIR="gcc-$VERSION"
 TARBALL="gcc-$VERSION.tar.xz"
 URL="http://ftp.gnu.org/gnu/gcc/gcc-$VERSION"
 SHA256SUM="832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c"
-DEPENDS="tc-binutils tc-cloog tc-gmp tc-isl tc-mpc tc-mpfr tc-linux_hdr"
+DEPENDS="tc-binutils tc-cloog tc-gmp tc-isl tc-mpc tc-mpfr linux_headers"
 
 prepare() {
 	for child in cloog gmp isl mpc mpfr; do
diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build
index 9c869c4..b53b230 100755
--- a/pkg/tc-gcc2/build
+++ b/pkg/tc-gcc2/build
@@ -1,6 +1,6 @@
 # inherit package details from first stage GCC
 source "$SCRIPTDIR/pkg/tc-gcc1/build"
-DEPENDS="tc-gcc1 tc-musl tc-linux_hdr"
+DEPENDS="tc-gcc1 musl linux_headers"
 
 build() {
 	$1/configure --prefix="$TCDIR" --target="$TARGET" \
diff --git a/pkg/toolchain/build b/pkg/toolchain/build
index af9a73b..f21d5ba 100755
--- a/pkg/toolchain/build
+++ b/pkg/toolchain/build
@@ -1,4 +1,4 @@
-DEPENDS="tc-gcc2 tc-musl tc-linux_hdr tc-pkg-config tc-file"
+DEPENDS="tc-gcc2 musl linux_headers tc-pkg-config tc-file"
 
 build() {
 	return