diff --git a/hash/mac_hdd.xml b/hash/mac_hdd.xml
index e53908dc77f..acacc8781a0 100644
--- a/hash/mac_hdd.xml
+++ b/hash/mac_hdd.xml
@@ -5,7 +5,7 @@
 		<description>System Software 6.0.8</description>
 		<year>1988</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac608" sha1="0eff82806f671484ec0c91cdc95ad90aa3157885" writeable="yes"/>
 			</diskarea>
@@ -15,7 +15,7 @@
 		<description>System Software 7.0</description>
 		<year>1991</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac700" sha1="a4c7777125331339afcd47dda5adca26ff57a427" writeable="yes"/>
 			</diskarea>
@@ -25,7 +25,7 @@
 		<description>System Software 7.0.1</description>
 		<year>1991</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac701" sha1="f867db45d7543ba87ca0e762bc920fe11d2a0753" writeable="yes"/>
 			</diskarea>
@@ -35,7 +35,7 @@
 		<description>System Software 7.1.1</description>
 		<year>1993</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac711" sha1="b1625378d1ba00861a07ebe47f4b6b54c849c61f" writeable="yes"/>
 			</diskarea>
@@ -45,7 +45,7 @@
 		<description>System Software 7.5</description>
 		<year>1994</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac750" sha1="9b59a611f0fddd560bc8b72c1dae07d0f2e10dcc" writeable="yes"/>
 			</diskarea>
@@ -55,7 +55,7 @@
 		<description>System Software 7.5.3 Revision 2</description>
 		<year>1996</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac753" sha1="757e4c69281993871bb7a199583f8f0c042c0ac7" writeable="yes"/>
 			</diskarea>
@@ -65,7 +65,7 @@
 		<description>System Software 7.5.5</description>
 		<year>1996</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac755" sha1="45990ff07419555d576eaa4f2293d62e74d055b6" writeable="yes"/>
 			</diskarea>
@@ -75,7 +75,7 @@
 		<description>System Software 7.6</description>
 		<year>1997</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac760" sha1="7e5ac00619dbf2395611f19658fab8e029d64bc7" writeable="yes"/>
 			</diskarea>
@@ -85,7 +85,7 @@
 		<description>System Software 7.6.1</description>
 		<year>1997</year>
 		<publisher>Apple</publisher>
-		<part name="hdd" interface="mac_hdd">
+		<part name="hdd" interface="scsi_hdd">
 			<diskarea name="harddriv">
 				<disk name="mac761" sha1="fa41734a26c37dea26f5d5590a8545afe26005ac" writeable="yes"/>
 			</diskarea>
diff --git a/src/emu/machine/nscsi_cd.c b/src/emu/machine/nscsi_cd.c
index 048928555d7..3b2b73b2420 100644
--- a/src/emu/machine/nscsi_cd.c
+++ b/src/emu/machine/nscsi_cd.c
@@ -23,7 +23,7 @@ void nscsi_cdrom_device::device_reset()
 	cur_lba = -1;
 }
 
-cdrom_interface nscsi_cdrom_device::cd_intf = { 0, 0 };
+cdrom_interface nscsi_cdrom_device::cd_intf = { "cdrom", NULL };
 
 static MACHINE_CONFIG_FRAGMENT(scsi_cdrom)
 	MCFG_CDROM_ADD("image", nscsi_cdrom_device::cd_intf)
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index 4138cc96127..6b2d7f1c2e2 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -28,7 +28,7 @@ void nscsi_harddisk_device::device_reset()
 	cur_lba = -1;
 }
 
-harddisk_interface nscsi_harddisk_device::hd_intf = { 0, 0 };
+harddisk_interface nscsi_harddisk_device::hd_intf = { NULL, NULL, "scsi_hdd", NULL };
 
 static MACHINE_CONFIG_FRAGMENT(scsi_harddisk)
 	MCFG_HARDDISK_CONFIG_ADD("image", nscsi_harddisk_device::hd_intf)
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index 1498dda4039..89d2d16818a 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -64,7 +64,7 @@ void scsicd_device::device_reset()
 	play_err_flag = 0;
 }
 
-cdrom_interface scsicd_device::cd_intf = { 0, 0 };
+cdrom_interface scsicd_device::cd_intf = { "cdrom", NULL };
 
 static MACHINE_CONFIG_FRAGMENT(scsi_cdrom)
 	MCFG_CDROM_ADD("image", scsicd_device::cd_intf)
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index 1dadc75eaeb..22661219479 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -52,8 +52,10 @@ void scsihd_device::device_reset()
 	}
 }
 
+harddisk_interface scsihd_device::hd_intf = { NULL, NULL, "scsi_hdd", NULL };
+
 static MACHINE_CONFIG_FRAGMENT(scsi_harddisk)
-	MCFG_HARDDISK_ADD("image")
+	MCFG_HARDDISK_CONFIG_ADD("image", scsihd_device::hd_intf)
 MACHINE_CONFIG_END
 
 machine_config_constructor scsihd_device::device_mconfig_additions() const
diff --git a/src/emu/machine/scsihd.h b/src/emu/machine/scsihd.h
index ee48788e807..acb15bdecbe 100644
--- a/src/emu/machine/scsihd.h
+++ b/src/emu/machine/scsihd.h
@@ -24,7 +24,9 @@ public:
 	virtual void WriteData( UINT8 *data, int dataLength );
 	virtual void ReadData( UINT8 *data, int dataLength );
 	virtual int GetSectorBytes();
-
+	
+	static struct harddisk_interface hd_intf;
+	
 protected:
 	// device-level overrides
 	virtual void device_start();