diff --git a/templates/linux-headers.tmpl b/templates/kernel-headers.tmpl
similarity index 89%
rename from templates/linux-headers.tmpl
rename to templates/kernel-headers.tmpl
index 12e6a212404..5cc1748785e 100644
--- a/templates/linux-headers.tmpl
+++ b/templates/kernel-headers.tmpl
@@ -1,5 +1,5 @@
-# Template file for 'linux-headers'
-pkgname=linux-headers
+# Template file for 'kernel-headers'
+pkgname=kernel-headers
 version=2.6.27.3
 wrksrc="linux-$version"
 distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version@.tar.bz2"
diff --git a/templates/util-linux.tmpl b/templates/util-linux.tmpl
index 9db692f5267..c698137c898 100644
--- a/templates/util-linux.tmpl
+++ b/templates/util-linux.tmpl
@@ -22,4 +22,4 @@ checksum=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 long_desc="
  util-linux is a random collection of Linux utilities."
 
-build_depends="linux-headers-2.6.27.3"
+build_depends="kernel-headers-2.6.27.3"
diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl
index 9cce0c194a6..37682a73e27 100644
--- a/templates/xbps-base-chroot.tmpl
+++ b/templates/xbps-base-chroot.tmpl
@@ -9,6 +9,6 @@ long_desc="
  inside of a chroot and continue installing them."
 
 base_chroot=yes
-build_depends="glibc-2.8 linux-headers-2.6.27.3 bash-3.2 coreutils-6.12
+build_depends="glibc-2.8 kernel-headers-2.6.27.3 bash-3.2 coreutils-6.12
  tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 findutils-4.4.0
  sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4"