diff --git a/debian/arch/ia64/control.in b/debian/arch/ia64/control.in
index b0ea8ca8d..b2e12ff7b 100644
--- a/debian/arch/ia64/control.in
+++ b/debian/arch/ia64/control.in
@@ -1,44 +1,44 @@
-Package: kernel-headers-@version@-1
+Package: linux-headers-@version@-@abiname@-ia64
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-kbuild-2.6-3
+Provides: linux-headers, linux-headers-2.6
 Description: Header files related to Linux kernel version @version@
  This package provides kernel header files for version @version@, for sites 
  that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-@version@-1/debian.README.gz for details.
+ /usr/share/doc/linux-headers-@version@-1/debian.README.gz for details.
 
-Package: kernel-headers-@version@-1-itanium
+Package: linux-headers-@version@-1-itanium
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-1
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-1
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers @version@ on Itanium
  This package provides kernel header files for version @version@ on
  Itanium,
  for sites that want the latest kernel headers.
- Please read /usr/share/doc/kernel-headers-@version@-1-itanium/debian.README.gz
+ Please read /usr/share/doc/linux-headers-@version@-1-itanium/debian.README.gz
  for details.
 
-Package: kernel-headers-2.6-itanium
+Package: linux-headers-2.6-itanium
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-@version@-1-itanium
+Depends: linux-headers-@version@-1-itanium
 Description: Linux kernel headers 2.6 on Itanium
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium.
 
-Package: kernel-image-@version@-1-itanium
+Package: linux-image-@version@-1-itanium
 Architecture: ia64
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
-Suggests: elilo, kernel-doc-@version@ | kernel-source-@version@
+Suggests: elilo, linux-doc-@version@ | linux-source-@version@
 Description: Linux kernel image for version @version@ on Itanium
  This package contains the Linux kernel image for version @version@ on
  Itanium,
@@ -50,48 +50,48 @@ Description: Linux kernel image for version @version@ on Itanium
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.6-itanium
+Package: linux-image-2.6-itanium
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-@version@-1-itanium
+Depends: linux-image-@version@-1-itanium
 Description: Linux kernel image for version 2.6 on Itanium
  This package will always depend on the latest 2.6 kernel image available
  for Itanium.
 
-Package: kernel-headers-@version@-1-itanium-smp
+Package: linux-headers-@version@-1-itanium-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-1
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-1
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers @version@ on Itanium SMP
  This package provides kernel header files for version @version@ on
  Itanium with SMP support,
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read
- /usr/share/doc/kernel-headers-@version@-1-itanium-smp/debian.README.gz for
+ /usr/share/doc/linux-headers-@version@-1-itanium-smp/debian.README.gz for
  details.
 
-Package: kernel-headers-2.6-itanium-smp
+Package: linux-headers-2.6-itanium-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-@version@-1-itanium-smp
+Depends: linux-headers-@version@-1-itanium-smp
 Description: Linux kernel headers 2.6 on Itanium SMP
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-image-@version@-1-itanium-smp
+Package: linux-image-@version@-1-itanium-smp
 Architecture: ia64
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
-Suggests: elilo, kernel-doc-@version@ | kernel-source-@version@
+Suggests: elilo, linux-doc-@version@ | linux-source-@version@
 Description: Linux kernel image for version @version@ on Itanium SMP
  This package contains the Linux kernel image for version @version@ on
  Itanium with SMP support,
@@ -104,47 +104,47 @@ Description: Linux kernel image for version @version@ on Itanium SMP
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.6-itanium-smp
+Package: linux-image-2.6-itanium-smp
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-@version@-1-itanium-smp
+Depends: linux-image-@version@-1-itanium-smp
 Description: Linux kernel image for version 2.6 on Itanium SMP
  This package will always depend on the latest 2.6 kernel image available
  for Itanium with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-headers-@version@-1-mckinley
+Package: linux-headers-@version@-1-mckinley
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-1
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-1
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers @version@ on Itanium II
  This package provides kernel header files for version @version@ on
  Itanium II (also known as McKinley),
  for sites that want the latest kernel headers.
  Please read
- /usr/share/doc/kernel-headers-@version@-1-mckinley/debian.README.gz for
+ /usr/share/doc/linux-headers-@version@-1-mckinley/debian.README.gz for
  details.
 
-Package: kernel-headers-2.6-mckinley
+Package: linux-headers-2.6-mckinley
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-@version@-1-mckinley
+Depends: linux-headers-@version@-1-mckinley
 Description: Linux kernel headers 2.6 on Itanium II
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium II (also known as McKinley)
 
-Package: kernel-image-@version@-1-mckinley
+Package: linux-image-@version@-1-mckinley
 Architecture: ia64
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
-Suggests: elilo, kernel-doc-@version@ | kernel-source-@version@
+Suggests: elilo, linux-doc-@version@ | linux-source-@version@
 Description: Linux kernel image for version @version@ on Itanium II
  This package contains the Linux kernel image for version @version@ on
  Itanium II (also known as McKinley),
@@ -156,48 +156,48 @@ Description: Linux kernel image for version @version@ on Itanium II
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.6-mckinley
+Package: linux-image-2.6-mckinley
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-@version@-1-mckinley
+Depends: linux-image-@version@-1-mckinley
 Description: Linux kernel image for version 2.6 on Itanium II
  This package will always depend on the latest 2.6 kernel image available
  for Itanium II (also known as McKinley).
 
-Package: kernel-headers-@version@-1-mckinley-smp
+Package: linux-headers-@version@-1-mckinley-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-1
-Provides: kernel-headers, kernel-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), linux-headers-@version@-1
+Provides: linux-headers, linux-headers-2.6
 Description: Linux kernel headers @version@ on Itanium II SMP
  This package provides kernel header files for version @version@ on
  Itanium II (also known as McKinleywith SMP support,
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read
- /usr/share/doc/kernel-headers-@version@-1-mckinley-smp/debian.README.gz for
+ /usr/share/doc/linux-headers-@version@-1-mckinley-smp/debian.README.gz for
  details.
 
-Package: kernel-headers-2.6-mckinley-smp
+Package: linux-headers-2.6-mckinley-smp
 Architecture: ia64
 Section: devel
 Priority: optional
-Depends: kernel-headers-@version@-1-mckinley-smp
+Depends: linux-headers-@version@-1-mckinley-smp
 Description: Linux kernel headers 2.6 on Itanium II SMP
  This package will always depend on the latest 2.6 kernel headers available
  for Itanium II (also known as McKinley) with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
-Package: kernel-image-@version@-1-mckinley-smp
+Package: linux-image-@version@-1-mckinley-smp
 Architecture: ia64
 Section: base
 Priority: optional
-Provides: kernel-image, kernel-image-2.6
+Provides: linux-image, linux-image-2.6
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
-Suggests: elilo, kernel-doc-@version@ | kernel-source-@version@
+Suggests: elilo, linux-doc-@version@ | linux-source-@version@
 Description: Linux kernel image for version @version@ on Itanium II SMP
  This package contains the Linux kernel image for version @version@ on
  Itanium II (also known as McKinley) with SMP support,
@@ -206,15 +206,15 @@ Description: Linux kernel image for version @version@ on Itanium II SMP
  It also contains scripts that try to ensure that the system is not left in
  a unbootable state after an update.
  .
- Kernel image packages are generally produced using kernel-package,
+ Kernel image packages are generally produced using linux-package,
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.6-mckinley-smp
+Package: linux-image-2.6-mckinley-smp
 Architecture: ia64
 Section: base
 Priority: optional
-Depends: kernel-image-@version@-1-mckinley-smp
+Depends: linux-image-@version@-1-mckinley-smp
 Description: Linux kernel image for version 2.6 on Itanium II SMP
  This package will always depend on the latest 2.6 kernel image available
  for Itanium II (also known as McKinley) with SMP support.