diff --git a/debian/arch/amd64/control.in b/debian/arch/amd64/control.in
index 1dcb67a4f..b028c21e0 100644
--- a/debian/arch/amd64/control.in
+++ b/debian/arch/amd64/control.in
@@ -1,30 +1,30 @@
-Package: kernel-headers-@version@-@abiname@-amd64
+Package: linux-headers-@version@-@abiname@-amd64
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: kernel-headers-@version@-@abiname@-amd64-generic, kernel-headers-@version@-@abiname@-amd64-k8, kernel-headers-@version@-@abiname@-amd64-k8-smp, kernel-headers-@version@-@abiname@-em64t-p4, kernel-headers-@version@-@abiname@-em64t-p4-smp
+Depends: linux-headers-@version@-@abiname@-amd64-generic, linux-headers-@version@-@abiname@-amd64-k8, linux-headers-@version@-@abiname@-amd64-k8-smp, linux-headers-@version@-@abiname@-em64t-p4, linux-headers-@version@-@abiname@-em64t-p4-smp
 Description: Virtual package that depends on all @version@ kernel headers for amd64
  This package provides common kernel header files for version @version@ on amd64,
  used to build out-of-tree kernel modules and the like. Please read
- /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details.
+ /usr/share/doc/linux-headers-@version@-@abiname@/debian.README.gz for details.
 
-Package: kernel-headers-@version@-@abiname@-amd64-k8
+Package: linux-headers-@version@-@abiname@-amd64-k8
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-@abiname@
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers for version @version@ on AMD64 systems
  This package provides kernel header files for version @version@ on
  AMD Athlon64, Athlon FX and Opteron, for sites that want the latest 
  kernel headers. Please read 
- /usr/share/doc/kernel-headers-@version@-@abiname@-amd64-k8/debian.README.gz for details.
+ /usr/share/doc/linux-headers-@version@-@abiname@-amd64-k8/debian.README.gz for details.
 
-Package: kernel-image-@version@-@abiname@-amd64-k8
+Package: linux-image-@version@-@abiname@-amd64-k8
 Architecture: amd64 
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), e2fsprogs (>= 1.35-7)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
@@ -46,23 +46,23 @@ Description: Linux kernel image for version @version@ on AMD64 systems
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-headers-@version@-@abiname@-amd64-k8-smp
+Package: linux-headers-@version@-@abiname@-amd64-k8-smp
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-@abiname@
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers for version @version@ on AMD64 SMP systems
  This package provides kernel header files for version @version@ on AMD Opteron 
  with SMP support, for sites that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-@version@-@abiname@-amd64-k8-smp/debian.README.gz
+ /usr/share/doc/linux-headers-@version@-@abiname@-amd64-k8-smp/debian.README.gz
  for details.
 
-Package: kernel-image-@version@-@abiname@-amd64-k8-smp
+Package: linux-image-@version@-@abiname@-amd64-k8-smp
 Architecture: amd64 
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), e2fsprogs (>= 1.35-7)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
@@ -85,23 +85,23 @@ Description: Linux kernel image for version @version@ on AMD64 SMP systems
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-headers-@version@-@abiname@-amd64-generic
+Package: linux-headers-@version@-@abiname@-amd64-generic
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-@abiname@
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers @version@ for generic x86_64 systems
  This package provides kernel header files for version @version@ on all x86_64 
  systems, for sites that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-@version@-@abiname@-amd64-generic/debian.README.gz for 
+ /usr/share/doc/linux-headers-@version@-@abiname@-amd64-generic/debian.README.gz for 
  details.
 
-Package: kernel-image-@version@-@abiname@-amd64-generic
+Package: linux-image-@version@-@abiname@-amd64-generic
 Architecture: amd64 
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), e2fsprogs (>= 1.35-7)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
@@ -124,23 +124,23 @@ Description: Linux kernel image for version @version@ on generic x86_64 systems
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-headers-@version@-@abiname@-em64t-p4
+Package: linux-headers-@version@-@abiname@-em64t-p4
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-@abiname@
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers for version @version@ on Intel EM64T systems
  This package provides kernel header files for version @version@ on all Intel 
  Pentium 4 and Xeon systems with EM64T extension, for sites that want the
  latest kernel headers. Please read
- /usr/share/doc/kernel-headers-@version@-@abiname@-em64t-p4/debian.README.gz for details.
+ /usr/share/doc/linux-headers-@version@-@abiname@-em64t-p4/debian.README.gz for details.
 
-Package: kernel-image-@version@-@abiname@-em64t-p4
+Package: linux-image-@version@-@abiname@-em64t-p4
 Architecture: amd64 
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), e2fsprogs (>= 1.35-7)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
@@ -165,23 +165,23 @@ Description: Linux kernel image for version @version@ on Intel EM64T systems
  .
  This kernel version has no P4 Hyper-Threading support.
 
-Package: kernel-headers-@version@-@abiname@-em64t-p4-smp
+Package: linux-headers-@version@-@abiname@-em64t-p4-smp
 Architecture: amd64 
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-@abiname@
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers for version @version@ on Intel EM64T SMP systems
  This package provides kernel header files for version @version@ on all Intel 
  P4 and Xeon systems with EM64T extension, for sites that want the 
  latest kernel headers. Please read
- /usr/share/doc/kernel-headers-@version@-@abiname@-em64t-p4/debian.README.gz for details.
+ /usr/share/doc/linux-headers-@version@-@abiname@-em64t-p4/debian.README.gz for details.
 
-Package: kernel-image-@version@-@abiname@-em64t-p4-smp
+Package: linux-image-@version@-@abiname@-em64t-p4-smp
 Architecture: amd64 
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), e2fsprogs (>= 1.35-7)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@