diff --git a/sys/arch/acorn32/conf/files.acorn32 b/sys/arch/acorn32/conf/files.acorn32
index efc4d60370d2..909818ecd32b 100644
--- a/sys/arch/acorn32/conf/files.acorn32
+++ b/sys/arch/acorn32/conf/files.acorn32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acorn32,v 1.18 2003/10/08 11:00:38 bouyer Exp $
+#	$NetBSD: files.acorn32,v 1.19 2003/10/08 20:57:59 bouyer Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -130,19 +130,19 @@ attach	csa at podulebus
 file	arch/acorn32/podulebus/csa.c		csa
 
 # ICS IDE driver
-device	icside {[channel = -1]}: wdc_base
+device	icside {[channel = -1]}: ata
 attach	icside at podulebus
 file	arch/acorn32/podulebus/icside.c		icside
 file	arch/acorn32/podulebus/icside_io_asm.S	icside
 
 # Yellowstone RapIDE driver
-device	rapide {[channel = -1]}: wdc_base
+device	rapide {[channel = -1]}: ata
 attach	rapide at podulebus
 file	arch/acorn32/podulebus/rapide.c		rapide
 file	arch/acorn32/podulebus/rapide_io_asm.S	rapide
 
 # Simtec IDE driver
-device	simide {[channel = -1]}: wdc_base
+device	simide {[channel = -1]}: ata
 attach	simide at podulebus
 file	arch/acorn32/podulebus/simide.c		simide
 file	arch/acorn32/podulebus/simide_io_asm.S	simide
diff --git a/sys/conf/files b/sys/conf/files
index 055cdae62a83..9a61c7e59819 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.637 2003/10/08 10:58:12 bouyer Exp $
+#	$NetBSD: files,v 1.638 2003/10/08 20:57:59 bouyer Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -195,10 +195,10 @@ include "dev/majors"
 define	audiobus	{ }
 define	midibus		{ }
 define	midisyn
-define	wdc_base        {[channel = -1]}
+define	ata	        {[channel = -1]}
 define	scsi_core
 define	scsi		{[channel = -1]}: scsi_core
-define	ata		{[drive = -1]}
+define	ata_hl		{[drive = -1]}
 define	atapi		{ }
 define	radiodev	{ }
 define	gpibdev		{[address = -1]}
@@ -718,10 +718,10 @@ file	dev/ic/rtl81x9.c		rtk
 
 # Common code for ESDI/IDE/etc. controllers
 #
-device	wdc: wdc_base
+device	wdc: ata
 
-device atabus: atapi,ata
-attach atabus at wdc_base
+device atabus: atapi,ata_hl
+attach atabus at ata
 file	dev/ic/wdc.c			atabus
 
 # CHIPS and Technologies 82C7[12][01] Universal Peripheral Controller
diff --git a/sys/dev/DEVNAMES b/sys/dev/DEVNAMES
index 13e98e364b5d..c361da6dc1ca 100644
--- a/sys/dev/DEVNAMES
+++ b/sys/dev/DEVNAMES
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.138 2003/08/30 21:41:19 jdolecek Exp $
+#	$NetBSD: DEVNAMES,v 1.139 2003/10/08 20:58:00 bouyer Exp $
 #
 # This file contains all used device names and defined attributes in 
 # alphabetical order. New devices added to the system somewhere should first 
@@ -87,6 +87,8 @@ ast			MI
 aster			amiga
 aster			amigappc
 ata			MI		Attribute
+ata_hl			MI		Attribute
+atabus			MI		
 atapi			MI		Attribute
 atapibus		MI		
 ate			MI		
@@ -1234,7 +1236,6 @@ vz			vax
 wavelan			MI		Attribute
 wd			MI		
 wdc			MI		
-wdc_base		MI		Attribute
 wdog			evbppc
 wdog			evbsh3
 wdog			mmeye
diff --git a/sys/dev/ata/files.ata b/sys/dev/ata/files.ata
index a6cd113a4948..376783e8fbc7 100644
--- a/sys/dev/ata/files.ata
+++ b/sys/dev/ata/files.ata
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ata,v 1.7 2003/10/08 10:58:12 bouyer Exp $
+#	$NetBSD: files.ata,v 1.8 2003/10/08 20:58:00 bouyer Exp $
 #
 # Config file and device description for machine-independent devices
 # which attach to ATA busses.  Included by ports that need it.  Ports
@@ -7,11 +7,11 @@
 
 # ATA disks
 device	wd: disk
-attach	wd at ata
+attach	wd at ata_hl
 file	dev/ata/wd.c			wd			needs-flag
 file	dev/ata/ata_wdc.c		wd & atabus
 
-file	dev/ata/ata.c			(ata | atapi) & atabus
+file	dev/ata/ata.c			(ata_hl | atapi) & atabus
 
 # ATA RAID configuration support
 defpseudo ataraid {[vendtype = -1], [unit = -1]}
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 2351ed659649..aefc4e6d0335 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.262 2003/10/08 10:58:12 bouyer Exp $ */
+/*	$NetBSD: wd.c,v 1.263 2003/10/08 20:58:00 bouyer Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.262 2003/10/08 10:58:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.263 2003/10/08 20:58:00 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -262,8 +262,8 @@ wdprobe(struct device *parent, struct cfdata *match, void *aux)
 	if (adev->adev_bustype->bustype_type != SCSIPI_BUSTYPE_ATA)
 		return 0;
 
-	if (match->cf_loc[ATACF_DRIVE] != ATACF_DRIVE_DEFAULT &&
-	    match->cf_loc[ATACF_DRIVE] != adev->adev_drv_data->drive)
+	if (match->cf_loc[ATA_HLCF_DRIVE] != ATA_HLCF_DRIVE_DEFAULT &&
+	    match->cf_loc[ATA_HLCF_DRIVE] != adev->adev_drv_data->drive)
 		return 0;
 	return 1;
 }
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 9751ec1e0ca0..acb79c0c2036 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.137 2003/10/08 10:58:12 bouyer Exp $ */
+/*	$NetBSD: wdc.c,v 1.138 2003/10/08 20:58:00 bouyer Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.137 2003/10/08 10:58:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.138 2003/10/08 20:58:00 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -214,8 +214,8 @@ atabusmatch(parent, cf, aux)
 	if (chp == NULL)
 		return (0);
 
-	if (cf->cf_loc[WDC_BASECF_CHANNEL] != chp->channel &&
-	    cf->cf_loc[WDC_BASECF_CHANNEL] != WDC_BASECF_CHANNEL_DEFAULT)
+	if (cf->cf_loc[ATACF_CHANNEL] != chp->channel &&
+	    cf->cf_loc[ATACF_CHANNEL] != ATACF_CHANNEL_DEFAULT)
 		return (0);
 
 	return (1);
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 6b7fb2fdd299..f3ae8c7955a6 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.197 2003/10/08 11:51:59 bouyer Exp $
+#	$NetBSD: files.pci,v 1.198 2003/10/08 20:58:00 bouyer Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -194,67 +194,67 @@ file	dev/pci/gtp.c			gtp
 define pciide_common
 file dev/pci/pciide_common.c pciide_common
 
-device	pciide {[channel = -1]}: wdc_base, pciide_common
+device	pciide {[channel = -1]}: ata, pciide_common
 attach	pciide at pci
 file	dev/pci/pciide.c		pciide
 
 # Acard IDE controllers
-device	acardide {[channel = -1]}: wdc_base, pciide_common
+device	acardide {[channel = -1]}: ata, pciide_common
 attach	acardide at pci
 file	dev/pci/acardide.c		acardide
 
 # Acer Lab IDE controllers
-device	aceride {[channel = -1]}: wdc_base, pciide_common
+device	aceride {[channel = -1]}: ata, pciide_common
 attach	aceride at pci
 file	dev/pci/aceride.c		aceride
 
 # CMD tech IDE controllers
-device	cmdide {[channel = -1]}: wdc_base, pciide_common
+device	cmdide {[channel = -1]}: ata, pciide_common
 attach	cmdide at pci
 file	dev/pci/cmdide.c		cmdide
 
 # Cypress IDE controllers
-device	cypide {[channel = -1]}: wdc_base, pciide_common, cy82c693
+device	cypide {[channel = -1]}: ata, pciide_common, cy82c693
 attach	cypide at pci
 file	dev/pci/cypide.c		cypide
 
 # Triones/HighPoint IDE controllers
-device	hptide {[channel = -1]}: wdc_base, pciide_common
+device	hptide {[channel = -1]}: ata, pciide_common
 attach	hptide at pci
 file	dev/pci/hptide.c		hptide
 
 # Opti IDE controllers
-device	optiide {[channel = -1]}: wdc_base, pciide_common
+device	optiide {[channel = -1]}: ata, pciide_common
 attach	optiide at pci
 file	dev/pci/optiide.c		optiide
 
 # Intel IDE controllers
-device	piixide {[channel = -1]}: wdc_base, pciide_common
+device	piixide {[channel = -1]}: ata, pciide_common
 attach	piixide at pci
 file	dev/pci/piixide.c		piixide
 
 # Promise IDE controllers
-device	pdcide {[channel = -1]}: wdc_base, pciide_common
+device	pdcide {[channel = -1]}: ata, pciide_common
 attach	pdcide at pci
 file	dev/pci/pdcide.c		pdcide
 
 # SiS IDE controllers
-device	siside {[channel = -1]}: wdc_base, pciide_common
+device	siside {[channel = -1]}: ata, pciide_common
 attach	siside at pci
 file	dev/pci/siside.c		siside
 
 # Symphony Labs IDE controllers
-device	slide {[channel = -1]}: wdc_base, pciide_common
+device	slide {[channel = -1]}: ata, pciide_common
 attach	slide at pci
 file	dev/pci/slide.c		slide
 
 # ServerWorks IDE controllers
-#device	swide {[channel = -1]}: wdc_base, pciide_common
+#device	swide {[channel = -1]}: ata, pciide_common
 #attach	swide at pci
 #file	dev/pci/swide.c		swide
 
 # VIA/AMD/Nvidia IDE controllers
-device	viaide {[channel = -1]}: wdc_base, pciide_common
+device	viaide {[channel = -1]}: ata, pciide_common
 attach	viaide at pci
 file	dev/pci/viaide.c	viaide
 
diff --git a/sys/dev/podulebus/files.podulebus b/sys/dev/podulebus/files.podulebus
index a3917bcb8ef6..e5b0f79a03f3 100644
--- a/sys/dev/podulebus/files.podulebus
+++ b/sys/dev/podulebus/files.podulebus
@@ -1,4 +1,4 @@
-# $NetBSD: files.podulebus,v 1.14 2003/10/08 10:58:13 bouyer Exp $
+# $NetBSD: files.podulebus,v 1.15 2003/10/08 20:58:00 bouyer Exp $
 
 device	podulebus { [slot = -1] }
 define	podloader
@@ -14,12 +14,12 @@ attach	hcsc at podulebus
 file	dev/podulebus/hcsc.c			hcsc
 
 # D.T. software IDE
-device	dtide: wdc_base
+device	dtide: ata
 attach	dtide at podulebus
 file	dev/podulebus/dtide.c			dtide
 
 # HCCS IDE
-device	hcide: wdc_base
+device	hcide: ata
 attach	hcide at podulebus
 file	dev/podulebus/hcide.c			hcide
 
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 97263e6d65a1..4b30d20ae93d 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$NetBSD: files.usb,v 1.51 2003/08/22 05:13:29 itojun Exp $
+#	$NetBSD: files.usb,v 1.52 2003/10/08 20:58:00 bouyer Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
@@ -90,7 +90,7 @@ file	dev/usb/ulpt.c			ulpt			needs-flag
 
 
 # Mass storage
-device	umass: scsi, atapi, ata
+device	umass: scsi, atapi, ata_hl
 attach	umass at uhub
 file	dev/usb/umass.c			umass
 file	dev/usb/umass_isdata.c		umass & wd