diff --git a/src/devices/bus/ata/atapicdr.cpp b/src/devices/bus/ata/atapicdr.cpp
index c140b87d2e7..69b19656f15 100644
--- a/src/devices/bus/ata/atapicdr.cpp
+++ b/src/devices/bus/ata/atapicdr.cpp
@@ -45,7 +45,10 @@ atapi_fixed_dvdrom_device::atapi_fixed_dvdrom_device(const machine_config &mconf
 
 void atapi_cdrom_device::device_add_mconfig(machine_config &config)
 {
-	CDROM(config, "image").set_interface("cdrom");
+	if(type() == ATAPI_DVDROM || type() == ATAPI_FIXED_DVDROM)
+		DVDROM(config, "image").set_interface("cdrom");
+	else
+		CDROM(config, "image").set_interface("cdrom");
 	CDDA(config, "cdda");
 }
 
diff --git a/src/mame/konami/firebeat.cpp b/src/mame/konami/firebeat.cpp
index f4a1685c65b..af4dcb4a842 100644
--- a/src/mame/konami/firebeat.cpp
+++ b/src/mame/konami/firebeat.cpp
@@ -2257,10 +2257,10 @@ ROM_START( ppp )
 	ROM_REGION(0xc8, "user2", 0)    // Security dongle
 	ROM_LOAD("gq977", 0x00, 0xc8, CRC(1cf40267) SHA1(28269e30a05c7334955c02aaa8e233d7e53842d9))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "977jaa01", 0, BAD_DUMP SHA1(59c03d8eb366167feef741d42d9d8b54bfeb3c1e) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "977jaa02", 0, SHA1(bd07c25ee3e1edc962997f6a5bb1700897231fb2) )
 ROM_END
 
@@ -2271,10 +2271,10 @@ ROM_START( ppp1mp )
 	ROM_REGION(0xc0, "user2", 0)    // Security dongle
 	ROM_LOAD("gqa11-ja", 0x00, 0xc0, BAD_DUMP CRC(207a99b2) SHA1(d19788e1c377771141527660311ff84653039c32))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a11jaa01", 0, SHA1(539ec6f1c1d198b0d6ce5543eadcbb4d9917fa42) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "a11jaa02", 0, SHA1(575069570cb4a2b58b199a1329d45b189a20fcc9) )
 ROM_END
 
@@ -2285,10 +2285,10 @@ ROM_START( ppd )
 	ROM_REGION(0xc0, "user2", ROMREGION_ERASE00)    // Security dongle
 	ROM_LOAD("gq977-ko", 0x00, 0xc0, BAD_DUMP CRC(b275de3c) SHA1(d23fcf0e87da2e561bc112851d26b3e78079f40a))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "977kaa01", 0, BAD_DUMP SHA1(7af9f4949ffa10ea5fc18b6c88c2abc710df3cf9) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "977kaa02", 1, SHA1(0feb5ac56269ad4a8401fcfe3bb98b01a0169177) )
 ROM_END
 
@@ -2299,10 +2299,10 @@ ROM_START( ppp11 )
 	ROM_REGION(0xc8, "user2", ROMREGION_ERASE00)    // Security dongle
 	ROM_LOAD("gq977", 0x00, 0xc8, CRC(1cf40267) SHA1(28269e30a05c7334955c02aaa8e233d7e53842d9))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gc977jaa01", 0, SHA1(7ed1f4b55105c93fec74468436bfb1d540bce944) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "gc977jaa02", 1, SHA1(74ce8c90575fd562807def7d561392d0f91f2bc6) )
 ROM_END
 
@@ -2313,10 +2313,10 @@ ROM_START( kbm )
 	ROM_REGION(0xc8, "user2", ROMREGION_ERASE00)    // Security dongle
 	ROM_LOAD("gq974", 0x00, 0xc8, CRC(65e4886a) SHA1(afba0315f2532599c51e232f734c538c4d108d73))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gq974-ja c01", 0, SHA1(975a4a59f842b8a7edad79b307e489cc88bef24d) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "gq974-ja a02", 1, SHA1(80086676c00c9ca06ec14e305ea4523b6576e47f) )
 ROM_END
 
@@ -2327,10 +2327,10 @@ ROM_START( kbh )
 	ROM_REGION(0xc8, "user2", ROMREGION_ERASE00)    // Security dongle
 	ROM_LOAD("gu974", 0x00, 0xc8, CRC(748b8476) SHA1(5d507fd46235c4315ad32599ce87aa4e06642eb5))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gu974-ka a01", 0, SHA1(07d3d6abcb13b2c2a556f2eed7e89e3d11febf1b) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "gu974-ka a02", 1, SHA1(9e358b0551b650a432e685ec82d3df2433e2aac3) )
 ROM_END
 
@@ -2341,10 +2341,10 @@ ROM_START( kbm2nd )
 	ROM_REGION(0xc8, "user2", ROMREGION_ERASE00)    // Security dongle
 	ROM_LOAD("gca01ja_gca01aa", 0x00, 0xc8, CRC(27f977cf) SHA1(14739cb4edfc3c4453673d59f2bd0442eab71d6a))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a01 ja a01", 0, SHA1(6a661dd737c83130febe771402a159859afeffba) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "a01 ja a02", 1, SHA1(e1ffc0bd4ea169951ed9ceaf090dbb1511a46601) )
 ROM_END
 
@@ -2355,10 +2355,10 @@ ROM_START( kbm3rd )
 	ROM_REGION(0xc8, "user2", 0)    // Security dongle
 	ROM_LOAD("gca12-ja_gca12-aa.bin", 0x00, 0xc8, CRC(96b12482) SHA1(199f20d9fa53108b3fe02d91d6793af1554b0f6f))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a12jaa01", 0, SHA1(ea30bf1273bce772f09063bfc8a74df360c743a7) )
 
-	DISK_REGION( "ata:1:cdrom" ) // audio CD-ROM
+	DISK_REGION( "ata:1:cdrom:image" ) // audio CD-ROM
 	DISK_IMAGE_READONLY( "a12jaa02", 0, SHA1(6bf7adbd637a0ce0c19b57187d3e46fabea99363) )
 ROM_END
 
@@ -2372,10 +2372,10 @@ ROM_START( popn4 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gq986jaa01", 0, SHA1(e5368ac029b0bdf29943ae66677b5521ae1176e1) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE( "gq986jaa02", 0, SHA1(c34ac216b3e0bef1d1813119469364c6403feaa4) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2392,10 +2392,10 @@ ROM_START( popn5 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP( "a02jaa04.3q",  0x000000, 0x080000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683) )
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a04jaa01", 0, SHA1(87136ddad1d786b4d5f04381fcbf679ab666e6c9) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "a04jaa02", 0, SHA1(49a017dde76f84829f6e99a678524c40665c3bfd) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2412,10 +2412,10 @@ ROM_START( popn6 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gqa16jaa01", 0, SHA1(7a7e475d06c74a273f821fdfde0743b33d566e4c) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE( "gqa16jaa02", 0, SHA1(e39067300e9440ff19cb98c1abc234fa3d5b26d1) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2432,10 +2432,10 @@ ROM_START( popn7 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "b00jab01", 0, SHA1(259c733ca4d30281205b46b7bf8d60c9d01aa818) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "b00jaa02", 0, SHA1(c8ce2f8ee6aeeedef9c110a59e68fcec7b669ad6) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2452,10 +2452,10 @@ ROM_START( popn8 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gqb30jaa01", 0, SHA1(0ff3e40e3717ce23337b3a2438bdaca01cba9e30) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "gqb30jaa02", 0, SHA1(f067d502c23efe0267aada5706f5bc7a54605942) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2472,10 +2472,10 @@ ROM_START( popnanm )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gq987jaa01", 0, SHA1(ee1f9cf480c01ef356451cec30e5303d6c433758) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "gq987jaa02", 0, SHA1(d72515bac3fcd9f28c39fa1402292009734df678) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2492,10 +2492,10 @@ ROM_START( popnanm2 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gea02jaa01", 0, SHA1(e81203b6812336c4d00476377193340031ef11b1) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "gea02jaa02", 0, SHA1(7212e399779f37a5dcb8317a8f635a3b3f620aa9) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2512,10 +2512,10 @@ ROM_START( popnmt )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP( "a02jaa04.3q",  0x000000, 0x080000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683) )
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "976jaa01", 0, SHA1(622a9350107e9fb17609ea1a234ca35489915da7) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(3881bb1e4deb829ba272c541cb7d203924571f3b) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2533,10 +2533,10 @@ ROM_START( popnmt2 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP( "a02jaa04.3q",  0x000000, 0x080000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683) )
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "976jba01", 0, SHA1(f8a70ca0718dc222cebbef238b5954494503d315) )
 
-	DISK_REGION( "spu_ata:0:cdrom" ) // data DVD-ROM
+	DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM
 	DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(3881bb1e4deb829ba272c541cb7d203924571f3b) )
 
 	ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00)    // Default unlocked RTC
@@ -2553,7 +2553,7 @@ ROM_START( bm3 )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("972spua01.3q", 0x00000, 0x80000, CRC(308dbcff) SHA1(87d11eb3e28cb4f3a8f88e3c57a28809dc429ccd))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gc97201", 0, SHA1(216ced68f2082bf891dc3e89fb0663f559cc4915) )
 
 	DISK_REGION( "spu_ata:0:hdd:image" ) // HDD
@@ -2573,7 +2573,7 @@ ROM_START( bm3core )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("972spua01.3q", 0x00000, 0x80000, CRC(308dbcff) SHA1(87d11eb3e28cb4f3a8f88e3c57a28809dc429ccd))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a05jca01", 0, SHA1(b89eced8a1325b087e3f875d1a643bebe9bad5c0) )
 
 	DISK_REGION( "spu_ata:0:hdd:image" ) // HDD
@@ -2593,7 +2593,7 @@ ROM_START( bm36th )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a21jca03.3q", 0x00000, 0x80000, CRC(98ea367a) SHA1(f0b72bdfbba4d265e7b08d606cd82424947d97b9))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "a21jca01", 0, SHA1(d1b888379cc0b2c2ab58fa2c5be49258043c3ea1) )
 
 	DISK_REGION( "spu_ata:0:hdd:image" ) // HDD
@@ -2613,7 +2613,7 @@ ROM_START( bm37th )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a21jca03.3q", 0x00000, 0x80000, CRC(98ea367a) SHA1(f0b72bdfbba4d265e7b08d606cd82424947d97b9))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gcb07jca01", 0, SHA1(f906379bdebee314e2ca97c7756259c8c25897fd) )
 
 	DISK_REGION( "spu_ata:0:hdd:image" ) // HDD
@@ -2633,7 +2633,7 @@ ROM_START( bm3final )
 	ROM_REGION(0x80000, "audiocpu", 0)          // SPU 68K program
 	ROM_LOAD16_WORD_SWAP("a21jca03.3q", 0x00000, 0x80000, CRC(98ea367a) SHA1(f0b72bdfbba4d265e7b08d606cd82424947d97b9))
 
-	DISK_REGION( "ata:0:cdrom" ) // program CD-ROM
+	DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM
 	DISK_IMAGE_READONLY( "gcc01jca01", 0, SHA1(3e7af83670d791591ad838823422959987f7aab9) )
 
 	DISK_REGION( "spu_ata:0:hdd:image" ) // HDD