diff --git a/src/emu/audit.c b/src/emu/audit.c
index 0f43d69d2ed..65738fd3094 100644
--- a/src/emu/audit.c
+++ b/src/emu/audit.c
@@ -154,7 +154,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
 	/* count the number of sample records attached to this driver */
 	const device_config_sound_interface *sound = NULL;
 	for (bool gotone = config->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-		if (sound->devconfig().type() == SOUND_SAMPLES)
+		if (sound->devconfig().type() == SAMPLES)
 		{
 			const samples_interface *intf = (const samples_interface *)sound->devconfig().static_config();
 
@@ -177,7 +177,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
 
 	/* now iterate over sample entries */
 	for (bool gotone = config->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-		if (sound->devconfig().type() == SOUND_SAMPLES)
+		if (sound->devconfig().type() == SAMPLES)
 		{
 			const samples_interface *intf = (const samples_interface *)sound->devconfig().static_config();
 			const char *sharedname = NULL;
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 4271ea6df17..d6be94c8ea3 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -622,7 +622,7 @@ int cli_info_listsamples(core_options *options, const char *gamename)
 
 			/* find samples interfaces */
 			for (bool gotone = config->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-				if (sound->devconfig().type() == SOUND_SAMPLES)
+				if (sound->devconfig().type() == SAMPLES)
 				{
 					const char *const *samplenames = ((const samples_interface *)sound->devconfig().static_config())->samplenames;
 					int sampnum;
diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h
index 88c1bc3c808..d49bc594bf0 100644
--- a/src/emu/devlegcy.h
+++ b/src/emu/devlegcy.h
@@ -228,13 +228,13 @@ const device_type name = configclass::static_alloc_device_config
 
 // reduced macros that are easier to use, and map to the above two macros
 #define DECLARE_LEGACY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_device_config_base, legacy_device_base)
-#define DECLARE_LEGACY_SOUND_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(SOUND_##name, basename, basename##_sound_device_config, basename##_sound_device, legacy_sound_device_config_base, legacy_sound_device_base)
+#define DECLARE_LEGACY_SOUND_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_sound_device_config_base, legacy_sound_device_base)
 #define DECLARE_LEGACY_MEMORY_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_memory_device_config_base, legacy_memory_device_base)
 #define DECLARE_LEGACY_NVRAM_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_nvram_device_config_base, legacy_nvram_device_base)
 #define DECLARE_LEGACY_IMAGE_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_image_device_config_base, legacy_image_device_base)
 
 #define DEFINE_LEGACY_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_device_config_base, legacy_device_base)
-#define DEFINE_LEGACY_SOUND_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(SOUND_##name, basename, basename##_sound_device_config, basename##_sound_device, legacy_sound_device_config_base, legacy_sound_device_base)
+#define DEFINE_LEGACY_SOUND_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_sound_device_config_base, legacy_sound_device_base)
 #define DEFINE_LEGACY_MEMORY_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_memory_device_config_base, legacy_memory_device_base)
 #define DEFINE_LEGACY_NVRAM_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_nvram_device_config_base, legacy_nvram_device_base)
 #define DEFINE_LEGACY_IMAGE_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device_config, basename##_device, legacy_image_device_config_base, legacy_image_device_base)
diff --git a/src/emu/disound.h b/src/emu/disound.h
index 04a4df62466..cc948e1dcd7 100644
--- a/src/emu/disound.h
+++ b/src/emu/disound.h
@@ -61,7 +61,7 @@ const int ALL_OUTPUTS		= MAX_OUTPUTS;	// special value indicating all outputs fo
 //**************************************************************************
 
 #define MDRV_SOUND_ADD(_tag, _type, _clock) \
-	MDRV_DEVICE_ADD(_tag, SOUND_##_type, _clock) \
+	MDRV_DEVICE_ADD(_tag, _type, _clock) \
 
 #define MDRV_SOUND_MODIFY(_tag) \
 	MDRV_DEVICE_MODIFY(_tag)
@@ -70,7 +70,7 @@ const int ALL_OUTPUTS		= MAX_OUTPUTS;	// special value indicating all outputs fo
 	MDRV_DEVICE_CLOCK(_clock)
 
 #define MDRV_SOUND_REPLACE(_tag, _type, _clock) \
-	MDRV_DEVICE_REPLACE(_tag, SOUND_##_type, _clock)
+	MDRV_DEVICE_REPLACE(_tag, _type, _clock)
 
 #define MDRV_SOUND_CONFIG(_config) \
 	MDRV_DEVICE_CONFIG(_config)
diff --git a/src/emu/info.c b/src/emu/info.c
index 6d72d3339d4..0360d1d7cbe 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -616,7 +616,7 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin
 	const device_config_sound_interface *sound = NULL;
 
 	for (bool gotone = config->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-		if (sound->devconfig().type() == SOUND_SAMPLES)
+		if (sound->devconfig().type() == SAMPLES)
 		{
 			const char *const *samplenames = ((const samples_interface *)sound->devconfig().static_config())->samplenames;
 			if (samplenames != NULL)
@@ -648,7 +648,7 @@ static void print_game_sample(FILE *out, const game_driver *game, const machine_
 
 	/* iterate over sound chips looking for samples */
 	for (bool gotone = config->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-		if (sound->devconfig().type() == SOUND_SAMPLES)
+		if (sound->devconfig().type() == SAMPLES)
 		{
 			const char *const *samplenames = ((const samples_interface *)sound->devconfig().static_config())->samplenames;
 			if (samplenames != NULL)
diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h
index d5631fbf708..a2ca38a0b8c 100644
--- a/src/emu/machine/laserdsc.h
+++ b/src/emu/machine/laserdsc.h
@@ -216,7 +216,7 @@ void laserdisc_set_config(running_device *device, const laserdisc_config *config
 DECLARE_LEGACY_DEVICE(LASERDISC, laserdisc);
 
 /* audio get info callback */
-DECLARE_LEGACY_SOUND_DEVICE(LASERDISC, laserdisc_sound);
+DECLARE_LEGACY_SOUND_DEVICE(LASERDISC_SOUND, laserdisc_sound);
 
 /* type setter */
 int laserdisc_get_type(running_device *device);
diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c
index be05e09c543..e1e6528ade4 100644
--- a/src/emu/machine/ldcore.c
+++ b/src/emu/machine/ldcore.c
@@ -1665,4 +1665,4 @@ DEVICE_GET_INFO( laserdisc )
 
 
 DEFINE_LEGACY_DEVICE(LASERDISC, laserdisc);
-DEFINE_LEGACY_SOUND_DEVICE(LASERDISC, laserdisc_sound);
+DEFINE_LEGACY_SOUND_DEVICE(LASERDISC_SOUND, laserdisc_sound);
diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index 996dafd1eea..eec6ba33362 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -27,7 +27,7 @@ struct _ym2151_state
 INLINE ym2151_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2151);
+	assert(device->type() == YM2151);
 	return (ym2151_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 0b8175c3c41..030c88862e4 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -19,7 +19,7 @@ struct _ym2203_state
 INLINE ym2203_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2203);
+	assert(device->type() == YM2203);
 	return (ym2203_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -131,7 +131,7 @@ static DEVICE_START( ym2203 )
 
 	info->intf = intf;
 	info->device = device;
-	info->psg = ay8910_start_ym(NULL, SOUND_YM2203, device, device->clock(), &intf->ay8910_intf);
+	info->psg = ay8910_start_ym(NULL, YM2203, device, device->clock(), &intf->ay8910_intf);
 	assert_always(info->psg != NULL, "Error creating YM2203/AY8910 chip");
 
 	/* Timer Handler set */
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index ab0309968cf..042308b6814 100644
--- a/src/emu/sound/2413intf.c
+++ b/src/emu/sound/2413intf.c
@@ -22,7 +22,7 @@ struct _ym2413_state
 INLINE ym2413_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2413);
+	assert(device->type() == YM2413);
 	return (ym2413_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index 21d099b6639..d125cb3424d 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -32,7 +32,7 @@ struct _ym2608_state
 INLINE ym2608_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2608);
+	assert(device->type() == YM2608);
 	return (ym2608_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -149,7 +149,7 @@ static DEVICE_START( ym2608 )
 	info->device = device;
 
 	/* FIXME: Force to use simgle output */
-	info->psg = ay8910_start_ym(NULL, SOUND_YM2608, device, device->clock(), &intf->ay8910_intf);
+	info->psg = ay8910_start_ym(NULL, YM2608, device, device->clock(), &intf->ay8910_intf);
 	assert_always(info->psg != NULL, "Error creating YM2608/AY8910 chip");
 
 	/* Timer Handler set */
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index 4031498acc3..5ceb59337ca 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -32,7 +32,7 @@ struct _ym2610_state
 INLINE ym2610_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2610 || device->type() == SOUND_YM2610B);
+	assert(device->type() == YM2610 || device->type() == YM2610B);
 	return (ym2610_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -161,7 +161,7 @@ static DEVICE_START( ym2610 )
 	info->timer[1] = timer_alloc(device->machine, timer_callback_1, info);
 
 	/* stream system initialize */
-	info->stream = stream_create(device,0,2,rate,info,(type == SOUND_YM2610) ? ym2610_stream_update : ym2610b_stream_update);
+	info->stream = stream_create(device,0,2,rate,info,(type == YM2610) ? ym2610_stream_update : ym2610b_stream_update);
 	/* setup adpcm buffers */
 	pcmbufa  = *device->region();
 	pcmsizea = device->region()->bytes();
diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c
index 7c83c400e10..14840d4f5e1 100644
--- a/src/emu/sound/2612intf.c
+++ b/src/emu/sound/2612intf.c
@@ -31,7 +31,7 @@ struct _ym2612_state
 INLINE ym2612_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM2612 || device->type() == SOUND_YM3438);
+	assert(device->type() == YM2612 || device->type() == YM3438);
 	return (ym2612_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c
index e2af706ef5a..ed5c4ff1ebb 100644
--- a/src/emu/sound/262intf.c
+++ b/src/emu/sound/262intf.c
@@ -25,7 +25,7 @@ struct _ymf262_state
 INLINE ymf262_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YMF262);
+	assert(device->type() == YMF262);
 	return (ymf262_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/3526intf.c b/src/emu/sound/3526intf.c
index d5bce06f4a4..98b4010c5d0 100644
--- a/src/emu/sound/3526intf.c
+++ b/src/emu/sound/3526intf.c
@@ -37,7 +37,7 @@ struct _ym3526_state
 INLINE ym3526_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM3526);
+	assert(device->type() == YM3526);
 	return (ym3526_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index 0a01ab59c5d..4bec6863df6 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -37,7 +37,7 @@ struct _ym3812_state
 INLINE ym3812_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YM3812);
+	assert(device->type() == YM3812);
 	return (ym3812_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/8950intf.c b/src/emu/sound/8950intf.c
index 83ffd3d5348..eaf14eb1fa4 100644
--- a/src/emu/sound/8950intf.c
+++ b/src/emu/sound/8950intf.c
@@ -37,7 +37,7 @@ struct _y8950_state
 INLINE y8950_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_Y8950);
+	assert(device->type() == Y8950);
 	return (y8950_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 2455d8df731..1b7edd3470e 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -213,7 +213,7 @@ static signed short *RBUFDST;	//this points to where the sample will be stored i
 INLINE aica_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_AICA);
+	assert(device->type() == AICA);
 	return (aica_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c
index 68ecfc5977a..1535a7bce4a 100644
--- a/src/emu/sound/astrocde.c
+++ b/src/emu/sound/astrocde.c
@@ -73,7 +73,7 @@ struct _astrocade_state
 INLINE astrocade_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ASTROCADE);
+	assert(device->type() == ASTROCADE);
 	return (astrocade_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 38ef166a5fa..6831a49b7fc 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -200,14 +200,14 @@ struct _ay8910_context
 INLINE ay8910_context *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_AY8910 ||
-		   device->type() == SOUND_AY8912 ||
-		   device->type() == SOUND_AY8913 ||
-		   device->type() == SOUND_AY8930 ||
-		   device->type() == SOUND_YM2149 ||
-		   device->type() == SOUND_YM3439 ||
-		   device->type() == SOUND_YMZ284 ||
-		   device->type() == SOUND_YMZ294);
+	assert(device->type() == AY8910 ||
+		   device->type() == AY8912 ||
+		   device->type() == AY8913 ||
+		   device->type() == AY8930 ||
+		   device->type() == YM2149 ||
+		   device->type() == YM3439 ||
+		   device->type() == YMZ284 ||
+		   device->type() == YMZ294);
 	return (ay8910_context *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -755,7 +755,7 @@ void *ay8910_start_ym(void *infoptr, device_type chip_type, running_device *devi
 	else
 		info->streams = 3;
 
-	if (chip_type == SOUND_AY8910 || chip_type == SOUND_AY8930)
+	if (chip_type == AY8910 || chip_type == AY8930)
 	{
 		info->step = 2;
 		info->par = &ay8910_param;
@@ -916,7 +916,7 @@ static DEVICE_START( ay8910 )
 		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 	};
 	const ay8910_interface *intf = (device->baseconfig().static_config() ? (const ay8910_interface *)device->baseconfig().static_config() : &generic_ay8910);
-	ay8910_start_ym(get_safe_token(device), SOUND_AY8910, device, device->clock(), intf);
+	ay8910_start_ym(get_safe_token(device), AY8910, device, device->clock(), intf);
 }
 
 static DEVICE_START( ym2149 )
@@ -928,7 +928,7 @@ static DEVICE_START( ym2149 )
 		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 	};
 	const ay8910_interface *intf = (device->baseconfig().static_config() ? (const ay8910_interface *)device->baseconfig().static_config() : &generic_ay8910);
-	ay8910_start_ym(get_safe_token(device), SOUND_YM2149, device, device->clock(), intf);
+	ay8910_start_ym(get_safe_token(device), YM2149, device, device->clock(), intf);
 }
 
 static DEVICE_STOP( ay8910 )
diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c
index 61f6492b278..ffae558f3c8 100644
--- a/src/emu/sound/beep.c
+++ b/src/emu/sound/beep.c
@@ -32,7 +32,7 @@ struct _beep_state
 INLINE beep_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_BEEP);
+	assert(device->type() == BEEP);
 	return (beep_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 73c4de2d35e..175a88272b8 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -99,7 +99,7 @@ static void set_regmap(bsmt2000_chip *chip, UINT8 posbase, UINT8 ratebase, UINT8
 INLINE bsmt2000_chip *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_BSMT2000);
+	assert(device->type() == BSMT2000);
 	return (bsmt2000_chip *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index fae9cbdbeeb..1a911102691 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -109,7 +109,7 @@ struct _c140_state
 INLINE c140_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_C140);
+	assert(device->type() == C140);
 	return (c140_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index 648c6805c0e..6b713f67bd9 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -85,7 +85,7 @@ struct _c352_state
 INLINE c352_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_C352);
+	assert(device->type() == C352);
 	return (c352_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index 705e2eacb34..f530d42a2dd 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -86,7 +86,7 @@ typedef struct {
 INLINE c6280_t *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_C6280);
+	assert(device->type() == C6280);
 	return (c6280_t *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c
index 1824604bdcb..5c20b973140 100644
--- a/src/emu/sound/cdda.c
+++ b/src/emu/sound/cdda.c
@@ -25,7 +25,7 @@ struct _cdda_info
 INLINE cdda_info *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_CDDA);
+	assert(device->type() == CDDA);
 	return (cdda_info *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -94,7 +94,7 @@ running_device *cdda_from_cdrom(running_machine *machine, void *file)
 	device_sound_interface *sound = NULL;
 
 	for (bool gotone = machine->m_devicelist.first(sound); gotone; gotone = sound->next(sound))
-		if (sound->device().type() == SOUND_CDDA)
+		if (sound->device().type() == CDDA)
 		{
 			cdda_info *info = get_safe_token(*sound);
 			if (info->disc == file)
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index 9fcb86dd7bd..afcfb6e59d9 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -88,7 +88,7 @@
 DECLARE_LEGACY_SOUND_DEVICE(CDP1869, cdp1869);
 
 #define MDRV_CDP1869_ADD(_tag, _pixclock, _config) \
-	MDRV_DEVICE_ADD(_tag, SOUND_CDP1869, _pixclock) \
+	MDRV_DEVICE_ADD(_tag, CDP1869, _pixclock) \
 	MDRV_DEVICE_CONFIG(_config)
 
 #define MDRV_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \
diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c
index 908ea2a2fca..1e1b4fbad54 100644
--- a/src/emu/sound/cem3394.c
+++ b/src/emu/sound/cem3394.c
@@ -141,7 +141,7 @@ struct _cem3394_state
 INLINE cem3394_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_CEM3394);
+	assert(device->type() == CEM3394);
 	return (cem3394_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c
index 2d943b86a72..e5d5a925edd 100644
--- a/src/emu/sound/dac.c
+++ b/src/emu/sound/dac.c
@@ -20,7 +20,7 @@ struct _dac_state
 INLINE dac_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_DAC);
+	assert(device->type() == DAC);
 	return (dac_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c
index 2b35232f99f..ba917650150 100644
--- a/src/emu/sound/digitalk.c
+++ b/src/emu/sound/digitalk.c
@@ -288,7 +288,7 @@ static const int pitch_vals[32] = {
 INLINE digitalker *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_DIGITALKER);
+	assert(device->type() == DIGITALKER);
 	return (digitalker *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/disc_inp.c b/src/emu/sound/disc_inp.c
index f05ceddf4f7..c74ff87a97a 100644
--- a/src/emu/sound/disc_inp.c
+++ b/src/emu/sound/disc_inp.c
@@ -47,7 +47,7 @@ struct dss_input_context
 INLINE discrete_info *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_DISCRETE);
+	assert(device->type() == DISCRETE);
 	return (discrete_info *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c
index 6f89c20a7f3..bed3e520f67 100644
--- a/src/emu/sound/dmadac.c
+++ b/src/emu/sound/dmadac.c
@@ -59,7 +59,7 @@ struct _dmadac_state
 INLINE dmadac_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_DMADAC);
+	assert(device->type() == DMADAC);
 	return (dmadac_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -241,7 +241,7 @@ void dmadac_set_volume(dmadac_sound_device **devlist, UINT8 num_channels, UINT16
  * Generic get_info
  **************************************************************************/
 
-DEVICE_GET_INFO( dmadac )
+DEVICE_GET_INFO( dmadac_sound )
 {
 	switch (state)
 	{
@@ -263,4 +263,4 @@ DEVICE_GET_INFO( dmadac )
 }
 
 
-DEFINE_LEGACY_SOUND_DEVICE(DMADAC, dmadac);
+DEFINE_LEGACY_SOUND_DEVICE(DMADAC, dmadac_sound);
diff --git a/src/emu/sound/dmadac.h b/src/emu/sound/dmadac.h
index d467beda2ad..eee3ab6d792 100644
--- a/src/emu/sound/dmadac.h
+++ b/src/emu/sound/dmadac.h
@@ -12,7 +12,7 @@
 
 #include "devlegcy.h"
 
-DECLARE_LEGACY_SOUND_DEVICE(DMADAC, dmadac);
+DECLARE_LEGACY_SOUND_DEVICE(DMADAC, dmadac_sound);
 
 void dmadac_transfer(dmadac_sound_device **devlist, UINT8 num_channels, offs_t channel_spacing, offs_t frame_spacing, offs_t total_frames, INT16 *data);
 void dmadac_enable(dmadac_sound_device **devlist, UINT8 num_channels, UINT8 enable);
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 70b6839c6bf..93c5fdcdcc2 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -79,7 +79,7 @@ typedef struct
 INLINE ES5503Chip *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ES5503);
+	assert(device->type() == ES5503);
 	return (ES5503Chip *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index dd34f7b389b..65fdfadec73 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -130,7 +130,7 @@ struct _es5506_state
 INLINE es5506_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ES5505 || device->type() == SOUND_ES5506);
+	assert(device->type() == ES5505 || device->type() == ES5506);
 	return (es5506_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -854,7 +854,7 @@ static void es5506_start_common(running_device *device, const void *config, devi
 	compute_tables(chip);
 
 	/* init the voices */
-	accum_mask = (sndtype == SOUND_ES5506) ? 0xffffffff : 0x7fffffff;
+	accum_mask = (sndtype == ES5506) ? 0xffffffff : 0x7fffffff;
 	for (j = 0; j < 32; j++)
 	{
 		chip->voice[j].index = j;
@@ -915,7 +915,7 @@ static void es5506_start_common(running_device *device, const void *config, devi
 
 static DEVICE_START( es5506 )
 {
-	es5506_start_common(device, device->baseconfig().static_config(), SOUND_ES5506);
+	es5506_start_common(device, device->baseconfig().static_config(), ES5506);
 }
 
 
@@ -1490,7 +1490,7 @@ static DEVICE_START( es5505 )
 	es5506intf.irq_callback = intf->irq_callback;
 	es5506intf.read_port = intf->read_port;
 
-	es5506_start_common(device, &es5506intf, SOUND_ES5505);
+	es5506_start_common(device, &es5506intf, ES5505);
 }
 
 
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index 2c3af96e35b..6f5702c79f4 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -51,7 +51,7 @@ static int diff_lookup[49*16];
 INLINE es8712_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ES8712);
+	assert(device->type() == ES8712);
 	return (es8712_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c
index f5010fd91ef..377dfe32194 100644
--- a/src/emu/sound/flt_rc.c
+++ b/src/emu/sound/flt_rc.c
@@ -15,7 +15,7 @@ struct _filter_rc_state
 INLINE filter_rc_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_FILTER_RC);
+	assert(device->type() == FILTER_RC);
 	return (filter_rc_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c
index 3c97eba0ebe..4c772c839b4 100644
--- a/src/emu/sound/flt_vol.c
+++ b/src/emu/sound/flt_vol.c
@@ -13,7 +13,7 @@ struct _filter_volume_state
 INLINE filter_volume_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_FILTER_VOLUME);
+	assert(device->type() == FILTER_VOLUME);
 	return (filter_volume_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c
index f814bfc8fcb..10f2d8db478 100644
--- a/src/emu/sound/gaelco.c
+++ b/src/emu/sound/gaelco.c
@@ -78,7 +78,7 @@ static wav_file *	wavraw;					/* raw waveform */
 INLINE gaelco_sound_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_GAELCO_GAE1 || device->type() == SOUND_GAELCO_CG1V);
+	assert(device->type() == GAELCO_GAE1 || device->type() == GAELCO_CG1V);
 	return (gaelco_sound_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c
index 8f835ac74d4..0700181ffb3 100644
--- a/src/emu/sound/hc55516.c
+++ b/src/emu/sound/hc55516.c
@@ -55,9 +55,9 @@ static STREAM_UPDATE( hc55516_update );
 INLINE hc55516_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_HC55516 ||
-		   device->type() == SOUND_MC3417 ||
-		   device->type() == SOUND_MC3418);
+	assert(device->type() == HC55516 ||
+		   device->type() == MC3417 ||
+		   device->type() == MC3418);
 	return (hc55516_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c
index 41244621798..0fef51c4ce4 100644
--- a/src/emu/sound/ics2115.c
+++ b/src/emu/sound/ics2115.c
@@ -68,7 +68,7 @@ struct _ics2115_state
 INLINE ics2115_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ICS2115);
+	assert(device->type() == ICS2115);
 	return (ics2115_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c
index a2610bd2289..3d123fe2441 100644
--- a/src/emu/sound/iremga20.c
+++ b/src/emu/sound/iremga20.c
@@ -60,7 +60,7 @@ struct _ga20_state
 INLINE ga20_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_IREMGA20);
+	assert(device->type() == IREMGA20);
 	return (ga20_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c
index 7f1ae7d2fed..855ce28b399 100644
--- a/src/emu/sound/k005289.c
+++ b/src/emu/sound/k005289.c
@@ -64,7 +64,7 @@ struct _k005289_state
 INLINE k005289_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_K005289);
+	assert(device->type() == K005289);
 	return (k005289_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c
index dc7d3fe23af..39d8ca08f9a 100644
--- a/src/emu/sound/k007232.c
+++ b/src/emu/sound/k007232.c
@@ -58,7 +58,7 @@ typedef struct kdacApcm
 INLINE KDAC_A_PCM *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_K007232);
+	assert(device->type() == K007232);
 	return (KDAC_A_PCM *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index 9a23376b986..875a77e91d9 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -58,7 +58,7 @@ struct _k051649_state
 INLINE k051649_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_K051649);
+	assert(device->type() == K051649);
 	return (k051649_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index 3c553313ddb..24c7e4ee873 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -47,7 +47,7 @@ struct _k053260_state
 INLINE k053260_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_K053260);
+	assert(device->type() == K053260);
 	return (k053260_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index 376a54bda9a..4086e7d99b3 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -94,7 +94,7 @@ struct _k054539_state {
 INLINE k054539_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_K054539);
+	assert(device->type() == K054539);
 	return (k054539_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h
index 76bdca43fce..0203c4cfdc6 100644
--- a/src/emu/sound/mos6560.h
+++ b/src/emu/sound/mos6560.h
@@ -89,14 +89,13 @@ struct _mos6560_interface
 ***************************************************************************/
 
 DECLARE_LEGACY_SOUND_DEVICE(MOS656X, mos6560);
-#define MOS656X SOUND_MOS656X
 
 /***************************************************************************
     DEVICE CONFIGURATION MACROS
 ***************************************************************************/
 
 #define MDRV_MOS656X_ADD(_tag, _interface) \
-	MDRV_DEVICE_ADD(_tag, SOUND_MOS656X, 0) \
+	MDRV_SOUND_ADD(_tag, MOS656X, 0) \
 	MDRV_DEVICE_CONFIG(_interface)
 
 
diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c
index 7e5920884e7..7ce72505348 100644
--- a/src/emu/sound/msm5205.c
+++ b/src/emu/sound/msm5205.c
@@ -49,7 +49,7 @@ struct _msm5205_state
 INLINE msm5205_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_MSM5205);
+	assert(device->type() == MSM5205);
 	return (msm5205_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index 31b9439d150..84254ce3aca 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -72,14 +72,14 @@ typedef struct {
 	running_device *device;
 	void (*gate_handler)(running_device *device, int state);	/* callback called when the GATE output pin changes state */
 
-} MSM5232;
+} msm5232_state;
 
 
-INLINE MSM5232 *get_safe_token(running_device *device)
+INLINE msm5232_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_MSM5232);
-	return (MSM5232 *)downcast<legacy_device_base *>(device)->token();
+	assert(device->type() == MSM5232);
+	return (msm5232_state *)downcast<legacy_device_base *>(device)->token();
 }
 
 
@@ -172,7 +172,7 @@ static FILE *sample[9];
 
 
 
-static void msm5232_init_tables( MSM5232 *chip )
+static void msm5232_init_tables( msm5232_state *chip )
 {
 	int i;
 	double scale;
@@ -245,7 +245,7 @@ static void msm5232_init_tables( MSM5232 *chip )
 }
 
 
-static void msm5232_init_voice(MSM5232 *chip, int i)
+static void msm5232_init_voice(msm5232_state *chip, int i)
 {
 	chip->voi[i].ar_rate= chip->ar_tbl[0] * chip->external_capacity[i];
 	chip->voi[i].dr_rate= chip->dr_tbl[0] * chip->external_capacity[i];
@@ -257,7 +257,7 @@ static void msm5232_init_voice(MSM5232 *chip, int i)
 }
 
 
-static void msm5232_gate_update(MSM5232 *chip)
+static void msm5232_gate_update(msm5232_state *chip)
 {
 	int new_state = (chip->control2 & 0x20) ? chip->voi[7].GF : 0;
 
@@ -271,7 +271,7 @@ static void msm5232_gate_update(MSM5232 *chip)
 
 static DEVICE_RESET( msm5232 )
 {
-	MSM5232 *chip = get_safe_token(device);
+	msm5232_state *chip = get_safe_token(device);
 	int i;
 
 	for (i=0; i<8; i++)
@@ -298,7 +298,7 @@ static DEVICE_RESET( msm5232 )
 	msm5232_gate_update(chip);
 }
 
-static void msm5232_init(MSM5232 *chip, const msm5232_interface *intf, int clock, int rate)
+static void msm5232_init(msm5232_state *chip, const msm5232_interface *intf, int clock, int rate)
 {
 	int j;
 
@@ -340,7 +340,7 @@ static DEVICE_STOP( msm5232 )
 
 WRITE8_DEVICE_HANDLER( msm5232_w )
 {
-	MSM5232 *chip = get_safe_token(device);
+	msm5232_state *chip = get_safe_token(device);
 
 	if (offset > 0x0d)
 		return;
@@ -477,7 +477,7 @@ WRITE8_DEVICE_HANDLER( msm5232_w )
 #define VMAX	32768
 
 
-INLINE void EG_voices_advance(MSM5232 *chip)
+INLINE void EG_voices_advance(msm5232_state *chip)
 {
 	VOICE *voi = &chip->voi[0];
 	int samplerate = chip->rate;
@@ -579,7 +579,7 @@ INLINE void EG_voices_advance(MSM5232 *chip)
 
 static int o2,o4,o8,o16,solo8,solo16;
 
-INLINE void TG_group_advance(MSM5232 *chip, int groupidx)
+INLINE void TG_group_advance(msm5232_state *chip, int groupidx)
 {
 	VOICE *voi = &chip->voi[groupidx*4];
 	int i;
@@ -708,7 +708,7 @@ INLINE void TG_group_advance(MSM5232 *chip, int groupidx)
 
 static STREAM_UPDATE( MSM5232_update_one )
 {
-	MSM5232 * chip = (MSM5232 *)param;
+	msm5232_state * chip = (msm5232_state *)param;
 	stream_sample_t *buf1 = outputs[0];
 	stream_sample_t *buf2 = outputs[1];
 	stream_sample_t *buf3 = outputs[2];
@@ -782,7 +782,7 @@ static STREAM_UPDATE( MSM5232_update_one )
 /* MAME Interface */
 static STATE_POSTLOAD( msm5232_postload )
 {
-	MSM5232 *chip = (MSM5232 *)param;
+	msm5232_state *chip = (msm5232_state *)param;
 	msm5232_init_tables(chip);
 }
 
@@ -790,7 +790,7 @@ static DEVICE_START( msm5232 )
 {
 	const msm5232_interface *intf = (const msm5232_interface *)device->baseconfig().static_config();
 	int rate = device->clock()/CLOCK_RATE_DIVIDER;
-	MSM5232 *chip = get_safe_token(device);
+	msm5232_state *chip = get_safe_token(device);
 	int voicenum;
 
 	chip->device = device;
@@ -840,7 +840,7 @@ static DEVICE_START( msm5232 )
 
 void msm5232_set_clock(running_device *device, int clock)
 {
-	MSM5232 *chip = get_safe_token(device);
+	msm5232_state *chip = get_safe_token(device);
 
 	if (chip->clock != clock)
 	{
@@ -863,7 +863,7 @@ DEVICE_GET_INFO( msm5232 )
 	switch (state)
 	{
 		/* --- the following bits of info are returned as 64-bit signed integers --- */
-		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(MSM5232);						break;
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(msm5232_state);						break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( msm5232 );		break;
diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index 4dc47863e8a..24bd5998d4f 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -129,7 +129,7 @@ static const int val2chan[] =
 INLINE MultiPCM *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_MULTIPCM);
+	assert(device->type() == MULTIPCM);
 	return (MultiPCM *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c
index 2a0b6a98e76..18b3a466ed7 100644
--- a/src/emu/sound/n63701x.c
+++ b/src/emu/sound/n63701x.c
@@ -50,7 +50,7 @@ static const int vol_table[4] = { 26, 84, 200, 258 };
 INLINE namco_63701x *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_NAMCO_63701X);
+	assert(device->type() == NAMCO_63701X);
 	return (namco_63701x *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index fb332b655fe..124a64c7456 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -78,9 +78,9 @@ struct _namco_sound
 INLINE namco_sound *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_NAMCO ||
-		   device->type() == SOUND_NAMCO_15XX ||
-		   device->type() == SOUND_NAMCO_CUS30);
+	assert(device->type() == NAMCO ||
+		   device->type() == NAMCO_15XX ||
+		   device->type() == NAMCO_CUS30);
 	return (namco_sound *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 558b6a19666..e5a56838e17 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -75,7 +75,7 @@ struct _nesapu_state
 INLINE nesapu_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_NES);
+	assert(device->type() == NES);
 	return (nesapu_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/nile.c b/src/emu/sound/nile.c
index 3a39636406f..d65010c007f 100644
--- a/src/emu/sound/nile.c
+++ b/src/emu/sound/nile.c
@@ -65,7 +65,7 @@ struct _nile_state
 INLINE nile_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_NILE);
+	assert(device->type() == NILE);
 	return (nile_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c
index 2b263d50e9b..ac973841697 100644
--- a/src/emu/sound/okim6258.c
+++ b/src/emu/sound/okim6258.c
@@ -52,7 +52,7 @@ static int tables_computed = 0;
 INLINE okim6258_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_OKIM6258);
+	assert(device->type() == OKIM6258);
 	return (okim6258_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c
index aa925c4cf75..62daa3817be 100644
--- a/src/emu/sound/okim6376.c
+++ b/src/emu/sound/okim6376.c
@@ -66,7 +66,7 @@ static int tables_computed = 0;
 INLINE okim6376_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_OKIM6376);
+	assert(device->type() == OKIM6376);
 	return (okim6376_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index 3df772adc77..57b2797bdea 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -525,7 +525,7 @@ static TIMER_CALLBACK( pokey_pot_trigger );
 INLINE pokey_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_POKEY);
+	assert(device->type() == POKEY);
 	return (pokey_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c
index 47ec3b1a670..676782910dc 100644
--- a/src/emu/sound/psx.c
+++ b/src/emu/sound/psx.c
@@ -87,7 +87,7 @@ struct psxinfo
 INLINE struct psxinfo *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_PSXSPU);
+	assert(device->type() == PSXSPU);
 	return (struct psxinfo *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c
index cf46e358581..85d5c1a1a5e 100644
--- a/src/emu/sound/qsound.c
+++ b/src/emu/sound/qsound.c
@@ -91,7 +91,7 @@ struct _qsound_state
 INLINE qsound_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_QSOUND);
+	assert(device->type() == QSOUND);
 	return (qsound_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 1dccd13583f..21a69bdabac 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -97,7 +97,7 @@ enum {
 INLINE rf5c400_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_RF5C400);
+	assert(device->type() == RF5C400);
 	return (rf5c400_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 4e15188200e..a2140c6c456 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -40,7 +40,7 @@ struct _rf5c68_state
 INLINE rf5c68_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_RF5C68);
+	assert(device->type() == RF5C68);
 	return (rf5c68_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c
index d9f79e0cab6..966fcf293fc 100644
--- a/src/emu/sound/s14001a.c
+++ b/src/emu/sound/s14001a.c
@@ -268,7 +268,7 @@ typedef struct
 INLINE S14001AChip *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_S14001A);
+	assert(device->type() == S14001A);
 	return (S14001AChip *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/s2636.c b/src/emu/sound/s2636.c
index e18c0ea4813..250ac93b4b0 100644
--- a/src/emu/sound/s2636.c
+++ b/src/emu/sound/s2636.c
@@ -22,7 +22,7 @@ struct _s2636_sound
 static s2636_sound *get_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_S2636);
+	assert(device->type() == S2636_SOUND);
 	return (s2636_sound *) downcast<legacy_device_base *>(device)->token();
 }
 
@@ -100,4 +100,4 @@ DEVICE_GET_INFO( s2636_sound )
 	}
 }
 
-DEFINE_LEGACY_SOUND_DEVICE(S2636, s2636_sound);
+DEFINE_LEGACY_SOUND_DEVICE(S2636_SOUND, s2636_sound);
diff --git a/src/emu/sound/s2636.h b/src/emu/sound/s2636.h
index f7d074ec338..021e0aca8c9 100644
--- a/src/emu/sound/s2636.h
+++ b/src/emu/sound/s2636.h
@@ -9,7 +9,7 @@
 
 
 
-DECLARE_LEGACY_SOUND_DEVICE(S2636, s2636_sound);
+DECLARE_LEGACY_SOUND_DEVICE(S2636_SOUND, s2636_sound);
 void s2636_soundport_w (running_device *device, int mode, int data);
 
 
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index bfe2c825800..0918e794e32 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -171,7 +171,7 @@ static const UINT8 envelope[8][64] = {
 INLINE saa1099_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SAA1099);
+	assert(device->type() == SAA1099);
 	return (saa1099_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 870fda7eabc..fe064a0dd8d 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -33,7 +33,7 @@ struct _samples_info
 INLINE samples_info *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SAMPLES);
+	assert(device->type() == SAMPLES);
 	return (samples_info *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index fe98f293ceb..70789209fc6 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -175,8 +175,8 @@ struct _SLOT
 
 #define USEDSP
 
-typedef struct _SCSP SCSP;
-struct _SCSP
+typedef struct _scsp_state scsp_state;
+struct _scsp_state
 {
 	union
 	{
@@ -227,7 +227,7 @@ struct _SCSP
 	running_device *device;
 };
 
-static void dma_scsp(address_space *space, struct _SCSP *SCSP);		/*SCSP DMA transfer function*/
+static void dma_scsp(address_space *space, scsp_state *scsp);		/*state DMA transfer function*/
 #define	scsp_dgate		scsp_regs[0x16/2] & 0x4000
 #define	scsp_ddir		scsp_regs[0x16/2] & 0x2000
 #define scsp_dexe		scsp_regs[0x16/2] & 0x1000
@@ -244,34 +244,34 @@ static int length;
 static signed short *RBUFDST;	//this points to where the sample will be stored in the RingBuf
 
 
-INLINE SCSP *get_safe_token(running_device *device)
+INLINE scsp_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SCSP);
-	return (SCSP *)downcast<legacy_device_base *>(device)->token();
+	assert(device->type() == SCSP);
+	return (scsp_state *)downcast<legacy_device_base *>(device)->token();
 }
 
-static unsigned char DecodeSCI(struct _SCSP *SCSP,unsigned char irq)
+static unsigned char DecodeSCI(scsp_state *scsp,unsigned char irq)
 {
 	unsigned char SCI=0;
 	unsigned char v;
-	v=(SCILV0((SCSP))&(1<<irq))?1:0;
+	v=(SCILV0((scsp))&(1<<irq))?1:0;
 	SCI|=v;
-	v=(SCILV1((SCSP))&(1<<irq))?1:0;
+	v=(SCILV1((scsp))&(1<<irq))?1:0;
 	SCI|=v<<1;
-	v=(SCILV2((SCSP))&(1<<irq))?1:0;
+	v=(SCILV2((scsp))&(1<<irq))?1:0;
 	SCI|=v<<2;
 	return SCI;
 }
 
-static void CheckPendingIRQ(struct _SCSP *SCSP)
+static void CheckPendingIRQ(scsp_state *scsp)
 {
-	UINT32 pend=SCSP->udata.data[0x20/2];
-	UINT32 en=SCSP->udata.data[0x1e/2];
+	UINT32 pend=scsp->udata.data[0x20/2];
+	UINT32 en=scsp->udata.data[0x1e/2];
 
-	if(SCSP->MidiW!=SCSP->MidiR)
+	if(scsp->MidiW!=scsp->MidiR)
 	{
-		SCSP->udata.data[0x20/2] |= 8;
+		scsp->udata.data[0x20/2] |= 8;
 		pend |= 8;
 	}
 	if(!pend)
@@ -279,113 +279,113 @@ static void CheckPendingIRQ(struct _SCSP *SCSP)
 	if(pend&0x40)
 		if(en&0x40)
 		{
-			SCSP->Int68kCB(SCSP->device, SCSP->IrqTimA);
+			scsp->Int68kCB(scsp->device, scsp->IrqTimA);
 			return;
 		}
 	if(pend&0x80)
 		if(en&0x80)
 		{
-			SCSP->Int68kCB(SCSP->device, SCSP->IrqTimBC);
+			scsp->Int68kCB(scsp->device, scsp->IrqTimBC);
 			return;
 		}
 	if(pend&0x100)
 		if(en&0x100)
 		{
-			SCSP->Int68kCB(SCSP->device, SCSP->IrqTimBC);
+			scsp->Int68kCB(scsp->device, scsp->IrqTimBC);
 			return;
 		}
 	if(pend&8)
 		if (en&8)
 		{
-			SCSP->Int68kCB(SCSP->device, SCSP->IrqMidi);
-			SCSP->udata.data[0x20/2] &= ~8;
+			scsp->Int68kCB(scsp->device, scsp->IrqMidi);
+			scsp->udata.data[0x20/2] &= ~8;
 			return;
 		}
 
-	SCSP->Int68kCB(SCSP->device, 0);
+	scsp->Int68kCB(scsp->device, 0);
 }
 
-static void ResetInterrupts(struct _SCSP *SCSP)
+static void ResetInterrupts(scsp_state *scsp)
 {
-	UINT32 reset = SCSP->udata.data[0x22/2];
+	UINT32 reset = scsp->udata.data[0x22/2];
 
 	if (reset & 0x40)
 	{
-		SCSP->Int68kCB(SCSP->device, -SCSP->IrqTimA);
+		scsp->Int68kCB(scsp->device, -scsp->IrqTimA);
 	}
 	if (reset & 0x180)
 	{
-		SCSP->Int68kCB(SCSP->device, -SCSP->IrqTimBC);
+		scsp->Int68kCB(scsp->device, -scsp->IrqTimBC);
 	}
 	if (reset & 0x8)
 	{
-		SCSP->Int68kCB(SCSP->device, -SCSP->IrqMidi);
+		scsp->Int68kCB(scsp->device, -scsp->IrqMidi);
 	}
 
-	CheckPendingIRQ(SCSP);
+	CheckPendingIRQ(scsp);
 }
 
 static TIMER_CALLBACK( timerA_cb )
 {
-	struct _SCSP *SCSP = (struct _SCSP *)ptr;
+	scsp_state *scsp = (scsp_state *)ptr;
 
-	SCSP->TimCnt[0] = 0xFFFF;
-	SCSP->udata.data[0x20/2]|=0x40;
-	SCSP->udata.data[0x18/2]&=0xff00;
-	SCSP->udata.data[0x18/2]|=SCSP->TimCnt[0]>>8;
+	scsp->TimCnt[0] = 0xFFFF;
+	scsp->udata.data[0x20/2]|=0x40;
+	scsp->udata.data[0x18/2]&=0xff00;
+	scsp->udata.data[0x18/2]|=scsp->TimCnt[0]>>8;
 
-	CheckPendingIRQ(SCSP);
+	CheckPendingIRQ(scsp);
 }
 
 static TIMER_CALLBACK( timerB_cb )
 {
-	struct _SCSP *SCSP = (struct _SCSP *)ptr;
+	scsp_state *scsp = (scsp_state *)ptr;
 
-	SCSP->TimCnt[1] = 0xFFFF;
-	SCSP->udata.data[0x20/2]|=0x80;
-	SCSP->udata.data[0x1a/2]&=0xff00;
-	SCSP->udata.data[0x1a/2]|=SCSP->TimCnt[1]>>8;
+	scsp->TimCnt[1] = 0xFFFF;
+	scsp->udata.data[0x20/2]|=0x80;
+	scsp->udata.data[0x1a/2]&=0xff00;
+	scsp->udata.data[0x1a/2]|=scsp->TimCnt[1]>>8;
 
-	CheckPendingIRQ(SCSP);
+	CheckPendingIRQ(scsp);
 }
 
 static TIMER_CALLBACK( timerC_cb )
 {
-	struct _SCSP *SCSP = (struct _SCSP *)ptr;
+	scsp_state *scsp = (scsp_state *)ptr;
 
-	SCSP->TimCnt[2] = 0xFFFF;
-	SCSP->udata.data[0x20/2]|=0x100;
-	SCSP->udata.data[0x1c/2]&=0xff00;
-	SCSP->udata.data[0x1c/2]|=SCSP->TimCnt[2]>>8;
+	scsp->TimCnt[2] = 0xFFFF;
+	scsp->udata.data[0x20/2]|=0x100;
+	scsp->udata.data[0x1c/2]&=0xff00;
+	scsp->udata.data[0x1c/2]|=scsp->TimCnt[2]>>8;
 
-	CheckPendingIRQ(SCSP);
+	CheckPendingIRQ(scsp);
 }
 
-static int Get_AR(struct _SCSP *SCSP,int base,int R)
+static int Get_AR(scsp_state *scsp,int base,int R)
 {
 	int Rate=base+(R<<1);
 	if(Rate>63)	Rate=63;
 	if(Rate<0) Rate=0;
-	return SCSP->ARTABLE[Rate];
+	return scsp->ARTABLE[Rate];
 }
 
-static int Get_DR(struct _SCSP *SCSP,int base,int R)
+static int Get_DR(scsp_state *scsp,int base,int R)
 {
 	int Rate=base+(R<<1);
 	if(Rate>63)	Rate=63;
 	if(Rate<0) Rate=0;
-	return SCSP->DRTABLE[Rate];
+	return scsp->DRTABLE[Rate];
 }
 
-static int Get_RR(struct _SCSP *SCSP,int base,int R)
+static int Get_RR(scsp_state *scsp,int base,int R)
 {
 	int Rate=base+(R<<1);
 	if(Rate>63)	Rate=63;
 	if(Rate<0) Rate=0;
-	return SCSP->DRTABLE[Rate];
+	return scsp->DRTABLE[Rate];
 }
 
-static void Compute_EG(struct _SCSP *SCSP,struct _SLOT *slot)
+static void Compute_EG(scsp_state *scsp,struct _SLOT *slot)
 {
 	int octave=(OCT(slot)^8)-8;
 	int rate;
@@ -395,10 +395,10 @@ static void Compute_EG(struct _SCSP *SCSP,struct _SLOT *slot)
 		rate=0; //rate=((FNS(slot)>>9)&1);
 
 	slot->EG.volume=0x17F<<EG_SHIFT;
-	slot->EG.AR=Get_AR(SCSP,rate,AR(slot));
-	slot->EG.D1R=Get_DR(SCSP,rate,D1R(slot));
-	slot->EG.D2R=Get_DR(SCSP,rate,D2R(slot));
-	slot->EG.RR=Get_RR(SCSP,rate,RR(slot));
+	slot->EG.AR=Get_AR(scsp,rate,AR(slot));
+	slot->EG.D1R=Get_DR(scsp,rate,D1R(slot));
+	slot->EG.D2R=Get_DR(scsp,rate,D2R(slot));
+	slot->EG.RR=Get_RR(scsp,rate,RR(slot));
 	slot->EG.DL=0x1f-DL(slot);
 	slot->EG.EGHOLD=EGHOLD(slot);
 }
@@ -480,17 +480,17 @@ static void Compute_LFO(struct _SLOT *slot)
 		LFO_ComputeStep(&(slot->ALFO),LFOF(slot),ALFOWS(slot),ALFOS(slot),1);
 }
 
-static void SCSP_StartSlot(struct _SCSP *SCSP, struct _SLOT *slot)
+static void SCSP_StartSlot(scsp_state *scsp, struct _SLOT *slot)
 {
 	UINT32 start_offset;
 
 	slot->active=1;
 	start_offset = PCM8B(slot) ? SA(slot) : SA(slot) & 0x7FFFE;
-	slot->base=SCSP->SCSPRAM + start_offset;
+	slot->base=scsp->SCSPRAM + start_offset;
 	slot->cur_addr=0;
 	slot->nxt_addr=1<<SHIFT;
 	slot->step=SCSP_Step(slot);
-	Compute_EG(SCSP,slot);
+	Compute_EG(scsp,slot);
 	slot->EG.state=ATTACK;
 	slot->EG.volume=0x17F<<EG_SHIFT;
 	slot->Prev=0;
@@ -516,41 +516,41 @@ static void SCSP_StopSlot(struct _SLOT *slot,int keyoff)
 
 #define log_base_2(n) (log((double)(n))/log(2.0))
 
-static void SCSP_Init(running_device *device, struct _SCSP *SCSP, const scsp_interface *intf)
+static void SCSP_Init(running_device *device, scsp_state *scsp, const scsp_interface *intf)
 {
 	int i;
 
-	memset(SCSP,0,sizeof(*SCSP));
+	memset(scsp,0,sizeof(*scsp));
 
-	SCSPDSP_Init(&SCSP->DSP);
+	SCSPDSP_Init(&scsp->DSP);
 
-	SCSP->device = device;
-	SCSP->IrqTimA = SCSP->IrqTimBC = SCSP->IrqMidi = 0;
-	SCSP->MidiR=SCSP->MidiW=0;
-	SCSP->MidiOutR=SCSP->MidiOutW=0;
+	scsp->device = device;
+	scsp->IrqTimA = scsp->IrqTimBC = scsp->IrqMidi = 0;
+	scsp->MidiR=scsp->MidiW=0;
+	scsp->MidiOutR=scsp->MidiOutW=0;
 
 	// get SCSP RAM
 	if (strcmp(device->tag(), "scsp") == 0 || strcmp(device->tag(), "scsp1") == 0)
 	{
-		SCSP->Master=1;
+		scsp->Master=1;
 	}
 	else
 	{
-		SCSP->Master=0;
+		scsp->Master=0;
 	}
 
-	SCSP->SCSPRAM = *device->region();
-	if (SCSP->SCSPRAM)
+	scsp->SCSPRAM = *device->region();
+	if (scsp->SCSPRAM)
 	{
-		SCSP->SCSPRAM_LENGTH = device->region()->bytes();
-		SCSP->DSP.SCSPRAM = (UINT16 *)SCSP->SCSPRAM;
-		SCSP->DSP.SCSPRAM_LENGTH = SCSP->SCSPRAM_LENGTH/2;
-		SCSP->SCSPRAM += intf->roffset;
+		scsp->SCSPRAM_LENGTH = device->region()->bytes();
+		scsp->DSP.SCSPRAM = (UINT16 *)scsp->SCSPRAM;
+		scsp->DSP.SCSPRAM_LENGTH = scsp->SCSPRAM_LENGTH/2;
+		scsp->SCSPRAM += intf->roffset;
 	}
 
-	SCSP->timerA = timer_alloc(device->machine, timerA_cb, SCSP);
-	SCSP->timerB = timer_alloc(device->machine, timerB_cb, SCSP);
-	SCSP->timerC = timer_alloc(device->machine, timerC_cb, SCSP);
+	scsp->timerA = timer_alloc(device->machine, timerA_cb, scsp);
+	scsp->timerB = timer_alloc(device->machine, timerB_cb, scsp);
+	scsp->timerC = timer_alloc(device->machine, timerC_cb, scsp);
 
 	for(i=0;i<0x400;++i)
 	{
@@ -606,12 +606,12 @@ static void SCSP_Init(running_device *device, struct _SCSP *SCSP, const scsp_int
 		else
 			fSDL=0.0;
 
-		SCSP->LPANTABLE[i]=FIX((4.0*LPAN*TL*fSDL));
-		SCSP->RPANTABLE[i]=FIX((4.0*RPAN*TL*fSDL));
+		scsp->LPANTABLE[i]=FIX((4.0*LPAN*TL*fSDL));
+		scsp->RPANTABLE[i]=FIX((4.0*RPAN*TL*fSDL));
 	}
 
-	SCSP->ARTABLE[0]=SCSP->DRTABLE[0]=0;	//Infinite time
-	SCSP->ARTABLE[1]=SCSP->DRTABLE[1]=0;	//Infinite time
+	scsp->ARTABLE[0]=scsp->DRTABLE[0]=0;	//Infinite time
+	scsp->ARTABLE[1]=scsp->DRTABLE[1]=0;	//Infinite time
 	for(i=2;i<64;++i)
 	{
 		double t,step,scale;
@@ -620,41 +620,40 @@ static void SCSP_Init(running_device *device, struct _SCSP *SCSP, const scsp_int
 		{
 			step=(1023*1000.0)/((float) 44100.0f*t);
 			scale=(double) (1<<EG_SHIFT);
-			SCSP->ARTABLE[i]=(int) (step*scale);
+			scsp->ARTABLE[i]=(int) (step*scale);
 		}
 		else
-			SCSP->ARTABLE[i]=1024<<EG_SHIFT;
+			scsp->ARTABLE[i]=1024<<EG_SHIFT;
 
 		t=DRTimes[i];	//In ms
 		step=(1023*1000.0)/((float) 44100.0f*t);
 		scale=(double) (1<<EG_SHIFT);
-		SCSP->DRTABLE[i]=(int) (step*scale);
+		scsp->DRTABLE[i]=(int) (step*scale);
 	}
 
 	// make sure all the slots are off
 	for(i=0;i<32;++i)
 	{
-		SCSP->Slots[i].slot=i;
-		SCSP->Slots[i].active=0;
-		SCSP->Slots[i].base=NULL;
-		SCSP->Slots[i].EG.state=RELEASE;
+		scsp->Slots[i].slot=i;
+		scsp->Slots[i].active=0;
+		scsp->Slots[i].base=NULL;
+		scsp->Slots[i].EG.state=RELEASE;
 	}
 
 	LFO_Init(device->machine);
-	SCSP->buffertmpl=auto_alloc_array_clear(device->machine, signed int, 44100);
-	SCSP->buffertmpr=auto_alloc_array_clear(device->machine, signed int, 44100);
+	scsp->buffertmpl=auto_alloc_array_clear(device->machine, signed int, 44100);
+	scsp->buffertmpr=auto_alloc_array_clear(device->machine, signed int, 44100);
 
 	// no "pend"
-	SCSP[0].udata.data[0x20/2] = 0;
-	//SCSP[1].udata.data[0x20/2] = 0;
-	SCSP->TimCnt[0] = 0xffff;
-	SCSP->TimCnt[1] = 0xffff;
-	SCSP->TimCnt[2] = 0xffff;
+	scsp->udata.data[0x20/2] = 0;
+	scsp->TimCnt[0] = 0xffff;
+	scsp->TimCnt[1] = 0xffff;
+	scsp->TimCnt[2] = 0xffff;
 }
 
-static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
+static void SCSP_UpdateSlotReg(scsp_state *scsp,int s,int r)
 {
-	struct _SLOT *slot=SCSP->Slots+s;
+	struct _SLOT *slot=scsp->Slots+s;
 	int sl;
 	switch(r&0x3f)
 	{
@@ -664,11 +663,11 @@ static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
 			{
 				for(sl=0;sl<32;++sl)
 				{
-					struct _SLOT *s2=SCSP->Slots+sl;
+					struct _SLOT *s2=scsp->Slots+sl;
 					{
 						if(KEYONB(s2) && s2->EG.state==RELEASE/*&& !s2->active*/)
 						{
-							SCSP_StartSlot(SCSP, s2);
+							SCSP_StartSlot(scsp, s2);
 						}
 						if(!KEYONB(s2) /*&& s2->active*/)
 						{
@@ -685,7 +684,7 @@ static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
 			break;
 		case 0xA:
 		case 0xB:
-			slot->EG.RR=Get_RR(SCSP,0,RR(slot));
+			slot->EG.RR=Get_RR(scsp,0,RR(slot));
 			slot->EG.DL=0x1f-DL(slot);
 			break;
 		case 0x12:
@@ -695,30 +694,30 @@ static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
 	}
 }
 
-static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
+static void SCSP_UpdateReg(scsp_state *scsp, int reg)
 {
 	/* temporary hack until this is converted to a device */
-	address_space *space = device_get_space(SCSP->device->machine->firstcpu, AS_PROGRAM);
+	address_space *space = device_get_space(scsp->device->machine->firstcpu, AS_PROGRAM);
 	switch(reg&0x3f)
 	{
 		case 0x2:
 		case 0x3:
 			{
-				unsigned int v=RBL(SCSP);
-				SCSP->DSP.RBP=RBP(SCSP);
+				unsigned int v=RBL(scsp);
+				scsp->DSP.RBP=RBP(scsp);
 				if(v==0)
-					SCSP->DSP.RBL=8*1024;
+					scsp->DSP.RBL=8*1024;
 				else if(v==1)
-					SCSP->DSP.RBL=16*1024;
+					scsp->DSP.RBL=16*1024;
 				if(v==2)
-					SCSP->DSP.RBL=32*1024;
+					scsp->DSP.RBL=32*1024;
 				if(v==3)
-					SCSP->DSP.RBL=64*1024;
+					scsp->DSP.RBL=64*1024;
 			}
 			break;
 		case 0x6:
 		case 0x7:
-			scsp_midi_in(space->machine->device("scsp"), 0, SCSP->udata.data[0x6/2]&0xff, 0);
+			scsp_midi_in(space->machine->device("scsp"), 0, scsp->udata.data[0x6/2]&0xff, 0);
 			break;
 		case 0x12:
 		case 0x13:
@@ -729,57 +728,57 @@ static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
 			break;
 		case 0x18:
 		case 0x19:
-			if(SCSP->Master)
+			if(scsp->Master)
 			{
 				UINT32 time;
 
-				SCSP->TimPris[0]=1<<((SCSP->udata.data[0x18/2]>>8)&0x7);
-				SCSP->TimCnt[0]=(SCSP->udata.data[0x18/2]&0xff)<<8;
+				scsp->TimPris[0]=1<<((scsp->udata.data[0x18/2]>>8)&0x7);
+				scsp->TimCnt[0]=(scsp->udata.data[0x18/2]&0xff)<<8;
 
-				if ((SCSP->udata.data[0x18/2]&0xff) != 255)
+				if ((scsp->udata.data[0x18/2]&0xff) != 255)
 				{
-					time = (44100 / SCSP->TimPris[0]) / (255-(SCSP->udata.data[0x18/2]&0xff));
+					time = (44100 / scsp->TimPris[0]) / (255-(scsp->udata.data[0x18/2]&0xff));
 					if (time)
 					{
-						timer_adjust_oneshot(SCSP->timerA, ATTOTIME_IN_HZ(time), 0);
+						timer_adjust_oneshot(scsp->timerA, ATTOTIME_IN_HZ(time), 0);
 					}
 				}
 			}
 			break;
 		case 0x1a:
 		case 0x1b:
-			if(SCSP->Master)
+			if(scsp->Master)
 			{
 				UINT32 time;
 
-				SCSP->TimPris[1]=1<<((SCSP->udata.data[0x1A/2]>>8)&0x7);
-				SCSP->TimCnt[1]=(SCSP->udata.data[0x1A/2]&0xff)<<8;
+				scsp->TimPris[1]=1<<((scsp->udata.data[0x1A/2]>>8)&0x7);
+				scsp->TimCnt[1]=(scsp->udata.data[0x1A/2]&0xff)<<8;
 
-				if ((SCSP->udata.data[0x1A/2]&0xff) != 255)
+				if ((scsp->udata.data[0x1A/2]&0xff) != 255)
 				{
-					time = (44100 / SCSP->TimPris[1]) / (255-(SCSP->udata.data[0x1A/2]&0xff));
+					time = (44100 / scsp->TimPris[1]) / (255-(scsp->udata.data[0x1A/2]&0xff));
 					if (time)
 					{
-						timer_adjust_oneshot(SCSP->timerB, ATTOTIME_IN_HZ(time), 0);
+						timer_adjust_oneshot(scsp->timerB, ATTOTIME_IN_HZ(time), 0);
 					}
 				}
 			}
 			break;
 		case 0x1C:
 		case 0x1D:
-			if(SCSP->Master)
+			if(scsp->Master)
 			{
 				UINT32 time;
 
-				SCSP->TimPris[2]=1<<((SCSP->udata.data[0x1C/2]>>8)&0x7);
-				SCSP->TimCnt[2]=(SCSP->udata.data[0x1C/2]&0xff)<<8;
+				scsp->TimPris[2]=1<<((scsp->udata.data[0x1C/2]>>8)&0x7);
+				scsp->TimCnt[2]=(scsp->udata.data[0x1C/2]&0xff)<<8;
 
-				if ((SCSP->udata.data[0x1C/2]&0xff) != 255)
+				if ((scsp->udata.data[0x1C/2]&0xff) != 255)
 				{
-					time = (44100 / SCSP->TimPris[2]) / (255-(SCSP->udata.data[0x1C/2]&0xff));
+					time = (44100 / scsp->TimPris[2]) / (255-(scsp->udata.data[0x1C/2]&0xff));
 					if (time)
 					{
-						timer_adjust_oneshot(SCSP->timerC, ATTOTIME_IN_HZ(time), 0);
+						timer_adjust_oneshot(scsp->timerC, ATTOTIME_IN_HZ(time), 0);
 					}
 				}
 			}
@@ -787,24 +786,24 @@ static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
 		case 0x22:	//SCIRE
 		case 0x23:
 
-			if(SCSP->Master)
+			if(scsp->Master)
 			{
-				SCSP->udata.data[0x20/2]&=~SCSP->udata.data[0x22/2];
-				ResetInterrupts(SCSP);
+				scsp->udata.data[0x20/2]&=~scsp->udata.data[0x22/2];
+				ResetInterrupts(scsp);
 
 				// behavior from real hardware: if you SCIRE a timer that's expired,
 				// it'll immediately pop up again in SCIPD.  ask Sakura Taisen on the Saturn...
-				if (SCSP->TimCnt[0] == 0xffff)
+				if (scsp->TimCnt[0] == 0xffff)
 				{
-					SCSP->udata.data[0x20/2] |= 0x40;
+					scsp->udata.data[0x20/2] |= 0x40;
 				}
-				if (SCSP->TimCnt[1] == 0xffff)
+				if (scsp->TimCnt[1] == 0xffff)
 				{
-					SCSP->udata.data[0x20/2] |= 0x80;
+					scsp->udata.data[0x20/2] |= 0x80;
 				}
-				if (SCSP->TimCnt[2] == 0xffff)
+				if (scsp->TimCnt[2] == 0xffff)
 				{
-					SCSP->udata.data[0x20/2] |= 0x100;
+					scsp->udata.data[0x20/2] |= 0x100;
 				}
 			}
 			break;
@@ -814,38 +813,38 @@ static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
 		case 0x27:
 		case 0x28:
 		case 0x29:
-			if(SCSP->Master)
+			if(scsp->Master)
 			{
-				SCSP->IrqTimA=DecodeSCI(SCSP,SCITMA);
-				SCSP->IrqTimBC=DecodeSCI(SCSP,SCITMB);
-				SCSP->IrqMidi=DecodeSCI(SCSP,SCIMID);
+				scsp->IrqTimA=DecodeSCI(scsp,SCITMA);
+				scsp->IrqTimBC=DecodeSCI(scsp,SCITMB);
+				scsp->IrqMidi=DecodeSCI(scsp,SCIMID);
 			}
 			break;
 	}
 }
 
-static void SCSP_UpdateSlotRegR(struct _SCSP *SCSP, int slot,int reg)
+static void SCSP_UpdateSlotRegR(scsp_state *scsp, int slot,int reg)
 {
 
 }
 
-static void SCSP_UpdateRegR(struct _SCSP *SCSP, int reg)
+static void SCSP_UpdateRegR(scsp_state *scsp, int reg)
 {
 	switch(reg&0x3f)
 	{
 		case 4:
 		case 5:
 			{
-				unsigned short v=SCSP->udata.data[0x5/2];
+				unsigned short v=scsp->udata.data[0x5/2];
 				v&=0xff00;
-				v|=SCSP->MidiStack[SCSP->MidiR];
-				SCSP[0].Int68kCB(SCSP->device, -SCSP->IrqMidi);	// cancel the IRQ
-				if(SCSP->MidiR!=SCSP->MidiW)
+				v|=scsp->MidiStack[scsp->MidiR];
+				scsp->Int68kCB(scsp->device, -scsp->IrqMidi);	// cancel the IRQ
+				if(scsp->MidiR!=scsp->MidiW)
 				{
-					++SCSP->MidiR;
-					SCSP->MidiR&=31;
+					++scsp->MidiR;
+					scsp->MidiR&=31;
 				}
-				SCSP->udata.data[0x5/2]=v;
+				scsp->udata.data[0x5/2]=v;
 			}
 			break;
 		case 8:
@@ -853,12 +852,12 @@ static void SCSP_UpdateRegR(struct _SCSP *SCSP, int reg)
 			{
 				// MSLC     |  CA   |SGC|EG
 				// f e d c b a 9 8 7 6 5 4 3 2 1 0
-				unsigned char MSLC=(SCSP->udata.data[0x8/2]>>11)&0x1f;
-				struct _SLOT *slot=SCSP->Slots + MSLC;
+				unsigned char MSLC=(scsp->udata.data[0x8/2]>>11)&0x1f;
+				struct _SLOT *slot=scsp->Slots + MSLC;
 				unsigned int SGC = (slot->EG.state) & 3;
 				unsigned int CA = (slot->cur_addr>>(SHIFT+12)) & 0xf;
 				unsigned int EG = (0x1f - (slot->EG.volume>>(EG_SHIFT+5))) & 0x1f;
-				SCSP->udata.data[0x8/2] =  (MSLC << 11) | (CA << 7) | (SGC << 5) | EG;
+				scsp->udata.data[0x8/2] =  (MSLC << 11) | (CA << 7) | (SGC << 5) | EG;
 			}
 			break;
 
@@ -876,46 +875,46 @@ static void SCSP_UpdateRegR(struct _SCSP *SCSP, int reg)
 	}
 }
 
-static void SCSP_w16(struct _SCSP *SCSP,unsigned int addr,unsigned short val)
+static void SCSP_w16(scsp_state *scsp,unsigned int addr,unsigned short val)
 {
 	addr&=0xffff;
 	if(addr<0x400)
 	{
 		int slot=addr/0x20;
 		addr&=0x1f;
-		*((unsigned short *) (SCSP->Slots[slot].udata.datab+(addr))) = val;
-		SCSP_UpdateSlotReg(SCSP,slot,addr&0x1f);
+		*((unsigned short *) (scsp->Slots[slot].udata.datab+(addr))) = val;
+		SCSP_UpdateSlotReg(scsp,slot,addr&0x1f);
 	}
 	else if(addr<0x600)
 	{
 		if (addr < 0x430)
 		{
-			*((unsigned short *) (SCSP->udata.datab+((addr&0x3f)))) = val;
-			SCSP_UpdateReg(SCSP, addr&0x3f);
+			*((unsigned short *) (scsp->udata.datab+((addr&0x3f)))) = val;
+			SCSP_UpdateReg(scsp, addr&0x3f);
 		}
 	}
 	else if(addr<0x700)
-		SCSP->RINGBUF[(addr-0x600)/2]=val;
+		scsp->RINGBUF[(addr-0x600)/2]=val;
 	else
 	{
 		//DSP
 		if(addr<0x780)	//COEF
-			*((unsigned short *) (SCSP->DSP.COEF+(addr-0x700)/2))=val;
+			*((unsigned short *) (scsp->DSP.COEF+(addr-0x700)/2))=val;
 		else if(addr<0x800)
-			*((unsigned short *) (SCSP->DSP.MADRS+(addr-0x780)/2))=val;
+			*((unsigned short *) (scsp->DSP.MADRS+(addr-0x780)/2))=val;
 		else if(addr<0xC00)
 		{
-			*((unsigned short *) (SCSP->DSP.MPRO+(addr-0x800)/2))=val;
+			*((unsigned short *) (scsp->DSP.MPRO+(addr-0x800)/2))=val;
 
 			if(addr==0xBF0)
 			{
-				SCSPDSP_Start(&SCSP->DSP);
+				SCSPDSP_Start(&scsp->DSP);
 	    		}
 		}
 	}
 }
 
-static unsigned short SCSP_r16(struct _SCSP *SCSP, unsigned int addr)
+static unsigned short SCSP_r16(scsp_state *scsp, unsigned int addr)
 {
 	unsigned short v=0;
 	addr&=0xffff;
@@ -923,26 +922,26 @@ static unsigned short SCSP_r16(struct _SCSP *SCSP, unsigned int addr)
 	{
 		int slot=addr/0x20;
 		addr&=0x1f;
-		SCSP_UpdateSlotRegR(SCSP, slot,addr&0x1f);
-		v=*((unsigned short *) (SCSP->Slots[slot].udata.datab+(addr)));
+		SCSP_UpdateSlotRegR(scsp, slot,addr&0x1f);
+		v=*((unsigned short *) (scsp->Slots[slot].udata.datab+(addr)));
 	}
 	else if(addr<0x600)
 	{
 		if (addr < 0x430)
 		{
-			SCSP_UpdateRegR(SCSP, addr&0x3f);
-			v= *((unsigned short *) (SCSP->udata.datab+((addr&0x3f))));
+			SCSP_UpdateRegR(scsp, addr&0x3f);
+			v= *((unsigned short *) (scsp->udata.datab+((addr&0x3f))));
 		}
 	}
 	else if(addr<0x700)
-		v=SCSP->RINGBUF[(addr-0x600)/2];
+		v=scsp->RINGBUF[(addr-0x600)/2];
 	return v;
 }
 
 
 #define REVSIGN(v) ((~v)+1)
 
-INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
+INLINE INT32 SCSP_UpdateSlot(scsp_state *scsp, struct _SLOT *slot)
 {
 	INT32 sample;
 	int step=slot->step;
@@ -972,7 +971,7 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
 
 	if(MDL(slot)!=0 || MDXSL(slot)!=0 || MDYSL(slot)!=0)
 	{
-		INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2;
+		INT32 smp=(scsp->RINGBUF[(scsp->BUFPTR+MDXSL(slot))&63]+scsp->RINGBUF[(scsp->BUFPTR+MDYSL(slot))&63])/2;
 
 		smp<<=0xA; // associate cycle with 1024
 		smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF)
@@ -983,8 +982,8 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
 
 	if(PCM8B(slot))	//8 bit signed
 	{
-		INT8 *p1=(signed char *) (SCSP->SCSPRAM+BYTE_XOR_BE(((SA(slot)+addr1))&0x7FFFF));
-		INT8 *p2=(signed char *) (SCSP->SCSPRAM+BYTE_XOR_BE(((SA(slot)+addr2))&0x7FFFF));
+		INT8 *p1=(signed char *) (scsp->SCSPRAM+BYTE_XOR_BE(((SA(slot)+addr1))&0x7FFFF));
+		INT8 *p2=(signed char *) (scsp->SCSPRAM+BYTE_XOR_BE(((SA(slot)+addr2))&0x7FFFF));
 		//sample=(p[0])<<8;
 		INT32 s;
 		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
@@ -993,8 +992,8 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
 	}
 	else	//16 bit signed (endianness?)
 	{
-		INT16 *p1=(signed short *) (SCSP->SCSPRAM+((SA(slot)+addr1)&0x7FFFE));
-		INT16 *p2=(signed short *) (SCSP->SCSPRAM+((SA(slot)+addr2)&0x7FFFE));
+		INT16 *p1=(signed short *) (scsp->SCSPRAM+((SA(slot)+addr1)&0x7FFFE));
+		INT16 *p2=(signed short *) (scsp->SCSPRAM+((SA(slot)+addr2)&0x7FFFE));
 		INT32 s;
 		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
 		s=(int)(p1[0])*((1<<SHIFT)-fpart)+(int)(p2[0])*fpart;
@@ -1089,19 +1088,19 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
 		if(!SDIR(slot))
 		{
 			unsigned short Enc=((TL(slot))<<0x0)|(0x7<<0xd);
-			*RBUFDST=(sample*SCSP->LPANTABLE[Enc])>>(SHIFT+1);
+			*RBUFDST=(sample*scsp->LPANTABLE[Enc])>>(SHIFT+1);
 		}
 		else
 		{
 			unsigned short Enc=(0<<0x0)|(0x7<<0xd);
-			*RBUFDST=(sample*SCSP->LPANTABLE[Enc])>>(SHIFT+1);
+			*RBUFDST=(sample*scsp->LPANTABLE[Enc])>>(SHIFT+1);
 		}
 	}
 
 	return sample;
 }
 
-static void SCSP_DoMasterSamples(struct _SCSP *SCSP, int nsamples)
+static void SCSP_DoMasterSamples(scsp_state *scsp, int nsamples)
 {
 	stream_sample_t *bufr,*bufl;
 	int sl, s, i;
@@ -1118,48 +1117,48 @@ static void SCSP_DoMasterSamples(struct _SCSP *SCSP, int nsamples)
 		for(sl=0;sl<32;++sl)
 		{
 #if FM_DELAY
-			RBUFDST=SCSP->DELAYBUF+SCSP->DELAYPTR;
+			RBUFDST=scsp->DELAYBUF+scsp->DELAYPTR;
 #else
-			RBUFDST=SCSP->RINGBUF+SCSP->BUFPTR;
+			RBUFDST=scsp->RINGBUF+scsp->BUFPTR;
 #endif
-			if(SCSP->Slots[sl].active)
+			if(scsp->Slots[sl].active)
 			{
-				struct _SLOT *slot=SCSP->Slots+sl;
+				struct _SLOT *slot=scsp->Slots+sl;
 				unsigned short Enc;
 				signed int sample;
 
-				sample=SCSP_UpdateSlot(SCSP, slot);
+				sample=SCSP_UpdateSlot(scsp, slot);
 
 				Enc=((TL(slot))<<0x0)|((IMXL(slot))<<0xd);
-				SCSPDSP_SetSample(&SCSP->DSP,(sample*SCSP->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				SCSPDSP_SetSample(&scsp->DSP,(sample*scsp->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
 				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
 				{
-					smpl+=(sample*SCSP->LPANTABLE[Enc])>>SHIFT;
-					smpr+=(sample*SCSP->RPANTABLE[Enc])>>SHIFT;
+					smpl+=(sample*scsp->LPANTABLE[Enc])>>SHIFT;
+					smpr+=(sample*scsp->RPANTABLE[Enc])>>SHIFT;
 				}
 			}
 
 #if FM_DELAY
-			SCSP->RINGBUF[(SCSP->BUFPTR+64-(FM_DELAY-1))&63] = SCSP->DELAYBUF[(SCSP->DELAYPTR+FM_DELAY-(FM_DELAY-1))%FM_DELAY];
+			scsp->RINGBUF[(scsp->BUFPTR+64-(FM_DELAY-1))&63] = scsp->DELAYBUF[(scsp->DELAYPTR+FM_DELAY-(FM_DELAY-1))%FM_DELAY];
 #endif
-			++SCSP->BUFPTR;
-			SCSP->BUFPTR&=63;
+			++scsp->BUFPTR;
+			scsp->BUFPTR&=63;
 #if FM_DELAY
-			++SCSP->DELAYPTR;
-			if(SCSP->DELAYPTR>FM_DELAY-1) SCSP->DELAYPTR=0;
+			++scsp->DELAYPTR;
+			if(scsp->DELAYPTR>FM_DELAY-1) scsp->DELAYPTR=0;
 #endif
 		}
 
-		SCSPDSP_Step(&SCSP->DSP);
+		SCSPDSP_Step(&scsp->DSP);
 
 		for(i=0;i<16;++i)
 		{
-			struct _SLOT *slot=SCSP->Slots+i;
+			struct _SLOT *slot=scsp->Slots+i;
 			if(EFSDL(slot))
 			{
 				unsigned short Enc=((EFPAN(slot))<<0x8)|((EFSDL(slot))<<0xd);
-				smpl+=(SCSP->DSP.EFREG[i]*SCSP->LPANTABLE[Enc])>>SHIFT;
-				smpr+=(SCSP->DSP.EFREG[i]*SCSP->RPANTABLE[Enc])>>SHIFT;
+				smpl+=(scsp->DSP.EFREG[i]*scsp->LPANTABLE[Enc])>>SHIFT;
+				smpr+=(scsp->DSP.EFREG[i]*scsp->RPANTABLE[Enc])>>SHIFT;
 			}
 		}
 
@@ -1168,15 +1167,15 @@ static void SCSP_DoMasterSamples(struct _SCSP *SCSP, int nsamples)
 	}
 }
 
-static void dma_scsp(address_space *space, struct _SCSP *SCSP)
+static void dma_scsp(address_space *space, scsp_state *scsp)
 {
 	static UINT16 tmp_dma[3], *scsp_regs;
 
-	scsp_regs = (UINT16 *)SCSP->udata.datab;
+	scsp_regs = (UINT16 *)scsp->udata.datab;
 
 	logerror("SCSP: DMA transfer START\n"
 			 "DMEA: %04x DRGA: %04x DTLG: %04x\n"
-			 "DGATE: %d  DDIR: %d\n",SCSP->scsp_dmea,SCSP->scsp_drga,SCSP->scsp_dtlg,scsp_dgate ? 1 : 0,scsp_ddir ? 1 : 0);
+			 "DGATE: %d  DDIR: %d\n",scsp->scsp_dmea,scsp->scsp_drga,scsp->scsp_dtlg,scsp_dgate ? 1 : 0,scsp_ddir ? 1 : 0);
 
 	/* Copy the dma values in a temp storage for resuming later */
     	/* (DMA *can't* overwrite his parameters).                  */
@@ -1189,20 +1188,20 @@ static void dma_scsp(address_space *space, struct _SCSP *SCSP)
 
 	if(scsp_ddir)
 	{
-		for(;SCSP->scsp_dtlg > 0;SCSP->scsp_dtlg-=2)
+		for(;scsp->scsp_dtlg > 0;scsp->scsp_dtlg-=2)
 		{
-			space->write_word(SCSP->scsp_dmea, space->read_word(0x100000|SCSP->scsp_drga));
-			SCSP->scsp_dmea+=2;
-			SCSP->scsp_drga+=2;
+			space->write_word(scsp->scsp_dmea, space->read_word(0x100000|scsp->scsp_drga));
+			scsp->scsp_dmea+=2;
+			scsp->scsp_drga+=2;
 		}
 	}
 	else
 	{
-		for(;SCSP->scsp_dtlg > 0;SCSP->scsp_dtlg-=2)
+		for(;scsp->scsp_dtlg > 0;scsp->scsp_dtlg-=2)
 		{
-			space->write_word(0x100000|SCSP->scsp_drga,space->read_word(SCSP->scsp_dmea));
-			SCSP->scsp_dmea+=2;
-			SCSP->scsp_drga+=2;
+			space->write_word(0x100000|scsp->scsp_drga,space->read_word(scsp->scsp_dmea));
+			scsp->scsp_dmea+=2;
+			scsp->scsp_drga+=2;
 		}
 	}
 
@@ -1229,69 +1228,69 @@ int SCSP_IRQCB(void *param)
 
 static STREAM_UPDATE( SCSP_Update )
 {
-	struct _SCSP *SCSP = (struct _SCSP *)param;
+	scsp_state *scsp = (scsp_state *)param;
 	bufferl = outputs[0];
 	bufferr = outputs[1];
 	length = samples;
-	SCSP_DoMasterSamples(SCSP, samples);
+	SCSP_DoMasterSamples(scsp, samples);
 }
 
 static DEVICE_START( scsp )
 {
 	const scsp_interface *intf;
 
-	struct _SCSP *SCSP = get_safe_token(device);
+	scsp_state *scsp = get_safe_token(device);
 
 	intf = (const scsp_interface *)device->baseconfig().static_config();
 
 	// init the emulation
-	SCSP_Init(device, SCSP, intf);
+	SCSP_Init(device, scsp, intf);
 
 	// set up the IRQ callbacks
 	{
-		SCSP->Int68kCB = intf->irq_callback;
+		scsp->Int68kCB = intf->irq_callback;
 
-		SCSP->stream = stream_create(device, 0, 2, 44100, SCSP, SCSP_Update);
+		scsp->stream = stream_create(device, 0, 2, 44100, scsp, SCSP_Update);
 	}
 }
 
 
 void scsp_set_ram_base(running_device *device, void *base)
 {
-	struct _SCSP *SCSP = get_safe_token(device);
-	if (SCSP)
+	scsp_state *scsp = get_safe_token(device);
+	if (scsp)
 	{
-		SCSP->SCSPRAM = (unsigned char *)base;
-		SCSP->DSP.SCSPRAM = (UINT16 *)base;
-		SCSP->SCSPRAM_LENGTH = 0x80000;
-		SCSP->DSP.SCSPRAM_LENGTH = 0x80000/2;
+		scsp->SCSPRAM = (unsigned char *)base;
+		scsp->DSP.SCSPRAM = (UINT16 *)base;
+		scsp->SCSPRAM_LENGTH = 0x80000;
+		scsp->DSP.SCSPRAM_LENGTH = 0x80000/2;
 	}
 }
 
 
 READ16_DEVICE_HANDLER( scsp_r )
 {
-	struct _SCSP *SCSP = get_safe_token(device);
+	scsp_state *scsp = get_safe_token(device);
 
-	stream_update(SCSP->stream);
+	stream_update(scsp->stream);
 
-	return SCSP_r16(SCSP, offset*2);
+	return SCSP_r16(scsp, offset*2);
 }
 
 UINT32* stv_scu;
 
 WRITE16_DEVICE_HANDLER( scsp_w )
 {
-	struct _SCSP *SCSP = get_safe_token(device);
+	scsp_state *scsp = get_safe_token(device);
 	UINT16 tmp, *scsp_regs;
 
-	stream_update(SCSP->stream);
+	stream_update(scsp->stream);
 
-	tmp = SCSP_r16(SCSP, offset*2);
+	tmp = SCSP_r16(scsp, offset*2);
 	COMBINE_DATA(&tmp);
-	SCSP_w16(SCSP,offset*2, tmp);
+	SCSP_w16(scsp,offset*2, tmp);
 
-	scsp_regs = (UINT16 *)SCSP->udata.datab;
+	scsp_regs = (UINT16 *)scsp->udata.datab;
 
 	switch(offset*2)
 	{
@@ -1299,14 +1298,14 @@ WRITE16_DEVICE_HANDLER( scsp_w )
 		case 0x412:
 		/*DMEA [15:1]*/
 		/*Sound memory address*/
-		SCSP->scsp_dmea = (((scsp_regs[0x414/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x412/2] & 0xfffe);
+		scsp->scsp_dmea = (((scsp_regs[0x414/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x412/2] & 0xfffe);
 		break;
 		case 0x414:
 		/*DMEA [19:16]*/
-		SCSP->scsp_dmea = (((scsp_regs[0x414/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x412/2] & 0xfffe);
+		scsp->scsp_dmea = (((scsp_regs[0x414/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x412/2] & 0xfffe);
 		/*DRGA [11:1]*/
 		/*Register memory address*/
-		SCSP->scsp_drga = scsp_regs[0x414/2] & 0x0ffe;
+		scsp->scsp_drga = scsp_regs[0x414/2] & 0x0ffe;
 		break;
 		case 0x416:
 		/*DGATE[14]*/
@@ -1317,10 +1316,10 @@ WRITE16_DEVICE_HANDLER( scsp_w )
 		/*starting bit*/
 		/*DTLG[11:1]*/
 		/*size of transfer*/
-		SCSP->scsp_dtlg = scsp_regs[0x416/2] & 0x0ffe;
+		scsp->scsp_dtlg = scsp_regs[0x416/2] & 0x0ffe;
 		if(scsp_dexe)
 		{
-			dma_scsp(cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_PROGRAM), SCSP);
+			dma_scsp(cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_PROGRAM), scsp);
 			scsp_regs[0x416/2]^=0x1000;//disable starting bit
 		}
 		break;
@@ -1341,21 +1340,21 @@ WRITE16_DEVICE_HANDLER( scsp_w )
 
 WRITE16_DEVICE_HANDLER( scsp_midi_in )
 {
-	struct _SCSP *SCSP = get_safe_token(device);
+	scsp_state *scsp = get_safe_token(device);
 
-	SCSP->MidiStack[SCSP->MidiW++]=data;
-	SCSP->MidiW &= 31;
+	scsp->MidiStack[scsp->MidiW++]=data;
+	scsp->MidiW &= 31;
 
-	CheckPendingIRQ(SCSP);
+	CheckPendingIRQ(scsp);
 }
 
 READ16_DEVICE_HANDLER( scsp_midi_out_r )
 {
-	struct _SCSP *SCSP = get_safe_token(device);
+	scsp_state *scsp = get_safe_token(device);
 	unsigned char val;
 
-	val=SCSP->MidiStack[SCSP->MidiR++];
-	SCSP->MidiR&=31;
+	val=scsp->MidiStack[scsp->MidiR++];
+	scsp->MidiR&=31;
 	return val;
 }
 
@@ -1370,7 +1369,7 @@ DEVICE_GET_INFO( scsp )
 	switch (state)
 	{
 		/* --- the following bits of info are returned as 64-bit signed integers --- */
-		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(struct _SCSP);				break;
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(scsp_state);				break;
 
 		/* --- the following bits of info are returned as pointers to data or functions --- */
 		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( scsp );		break;
diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c
index 13d73bc29aa..2cda4c2e490 100644
--- a/src/emu/sound/segapcm.c
+++ b/src/emu/sound/segapcm.c
@@ -21,7 +21,7 @@ struct _segapcm_state
 INLINE segapcm_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SEGAPCM);
+	assert(device->type() == SEGAPCM);
 	return (segapcm_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c
index 878db6e7519..367da869a7f 100644
--- a/src/emu/sound/sid6581.c
+++ b/src/emu/sound/sid6581.c
@@ -15,7 +15,7 @@
 static SID6581 *get_sid(running_device *device)
 {
 	assert(device != NULL);
-	assert((device->type() == SOUND_SID6581) || (device->type() == SOUND_SID8580));
+	assert((device->type() == SID6581) || (device->type() == SID8580));
 	return (SID6581 *) downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index a4bb9e4dd53..ab45cc57b70 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -264,7 +264,7 @@ struct _sn76477_state
 INLINE sn76477_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SN76477);
+	assert(device->type() == SN76477);
 	return (sn76477_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c
index 40faa1dd0a1..5c582ec79e9 100644
--- a/src/emu/sound/sn76496.c
+++ b/src/emu/sound/sn76496.c
@@ -138,14 +138,14 @@ struct _sn76496_state
 INLINE sn76496_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SN76496 ||
-		   device->type() == SOUND_SN76489 ||
-		   device->type() == SOUND_SN76489A ||
-		   device->type() == SOUND_SN76494 ||
-		   device->type() == SOUND_SN94624 ||
-		   device->type() == SOUND_NCR7496 ||
-		   device->type() == SOUND_GAMEGEAR ||
-		   device->type() == SOUND_SMSIII);
+	assert(device->type() == SN76496 ||
+		   device->type() == SN76489 ||
+		   device->type() == SN76489A ||
+		   device->type() == SN76494 ||
+		   device->type() == SN94624 ||
+		   device->type() == NCR7496 ||
+		   device->type() == GAMEGEAR ||
+		   device->type() == SMSIII);
 	return (sn76496_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c
index 0b9a30abf3c..1c8e9ed7204 100644
--- a/src/emu/sound/snkwave.c
+++ b/src/emu/sound/snkwave.c
@@ -36,7 +36,7 @@ struct _snkwave_state
 INLINE snkwave_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SNKWAVE);
+	assert(device->type() == SNKWAVE);
 	return (snkwave_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c
index 2722bfef4ba..e08903f9e22 100644
--- a/src/emu/sound/sp0250.c
+++ b/src/emu/sound/sp0250.c
@@ -60,7 +60,7 @@ struct _sp0250_state
 INLINE sp0250_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SP0250);
+	assert(device->type() == SP0250);
 	return (sp0250_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index 3814aeba898..93b39c8e40f 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -135,7 +135,7 @@ static const INT16 qtbl[128] =
 INLINE sp0256_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SP0256);
+	assert(device->type() == SP0256);
 	return (sp0256_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 59e25e8f0ae..1d3b6caba4c 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -129,7 +129,7 @@ static double get_filtered_volume(speaker_state *sp);
 INLINE speaker_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SPEAKER);
+	assert(device->type() == SPEAKER_SOUND);
 	return (speaker_state *)downcast<legacy_device_base *>(device)->token();
 }
 
@@ -424,7 +424,7 @@ static double get_filtered_volume(speaker_state *sp)
  * Generic get_info
  **************************************************************************/
 
-DEVICE_GET_INFO( speaker )
+DEVICE_GET_INFO( speaker_sound )
 {
 	switch (state)
 	{
@@ -446,4 +446,4 @@ DEVICE_GET_INFO( speaker )
 }
 
 
-DEFINE_LEGACY_SOUND_DEVICE(SPEAKER, speaker);
+DEFINE_LEGACY_SOUND_DEVICE(SPEAKER_SOUND, speaker_sound);
diff --git a/src/emu/sound/speaker.h b/src/emu/sound/speaker.h
index f7136506577..cd465441620 100644
--- a/src/emu/sound/speaker.h
+++ b/src/emu/sound/speaker.h
@@ -23,6 +23,6 @@ struct _speaker_interface
 
 void speaker_level_w (running_device *device, int new_level);
 
-DECLARE_LEGACY_SOUND_DEVICE(SPEAKER, speaker);
+DECLARE_LEGACY_SOUND_DEVICE(SPEAKER_SOUND, speaker_sound);
 
 #endif /* __SPEAKER_H__ */
diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c
index 7be3d5f4d31..ac6c39bd6bb 100644
--- a/src/emu/sound/st0016.c
+++ b/src/emu/sound/st0016.c
@@ -22,7 +22,7 @@ struct _st0016_state
 INLINE st0016_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ST0016);
+	assert(device->type() == ST0016);
 	return (st0016_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/t6w28.c b/src/emu/sound/t6w28.c
index b55a41e6ff8..9008b657433 100644
--- a/src/emu/sound/t6w28.c
+++ b/src/emu/sound/t6w28.c
@@ -61,7 +61,7 @@ struct _t6w28_state
 INLINE t6w28_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_T6W28);
+	assert(device->type() == T6W28);
 	return (t6w28_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/tiaintf.c b/src/emu/sound/tiaintf.c
index 96ff0cd0930..36d8166c1dc 100644
--- a/src/emu/sound/tiaintf.c
+++ b/src/emu/sound/tiaintf.c
@@ -13,7 +13,7 @@ struct _tia_state
 INLINE tia_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_TIA);
+	assert(device->type() == TIA);
 	return (tia_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c
index 44b03223a18..ed598d8f0ee 100644
--- a/src/emu/sound/tms3615.c
+++ b/src/emu/sound/tms3615.c
@@ -24,7 +24,7 @@ struct _tms_state {
 INLINE tms_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_TMS3615);
+	assert(device->type() == TMS3615);
 	return (tms_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index 1cb8f74616c..4f856bd0640 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -344,7 +344,7 @@ static const int *const tunes[] = {NULL,tune1,tune2,tune3,tune4};
 INLINE tms_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_TMS36XX);
+	assert(device->type() == TMS36XX);
 	return (tms_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c
index 9a275fbabc1..8576e3f3884 100644
--- a/src/emu/sound/tms5110.c
+++ b/src/emu/sound/tms5110.c
@@ -198,13 +198,13 @@ struct _tmsprom_state
 INLINE tms5110_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_TMS5110 ||
-		   device->type() == SOUND_TMS5100 ||
-		   device->type() == SOUND_TMS5110A ||
-		   device->type() == SOUND_CD2801 ||
-		   device->type() == SOUND_TMC0281 ||
-		   device->type() == SOUND_CD2802 ||
-		   device->type() == SOUND_M58817);
+	assert(device->type() == TMS5110 ||
+		   device->type() == TMS5100 ||
+		   device->type() == TMS5110A ||
+		   device->type() == CD2801 ||
+		   device->type() == TMC0281 ||
+		   device->type() == CD2802 ||
+		   device->type() == M58817);
 	return (tms5110_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c
index 26a83062879..aed2eb9d35d 100644
--- a/src/emu/sound/tms5220.c
+++ b/src/emu/sound/tms5220.c
@@ -441,10 +441,10 @@ struct _tms5220_state
 INLINE tms5220_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_TMS5220 ||
-		   device->type() == SOUND_TMS5220C ||
-		   device->type() == SOUND_TMC0285 ||
-		   device->type() == SOUND_TMS5200);
+	assert(device->type() == TMS5220 ||
+		   device->type() == TMS5220C ||
+		   device->type() == TMC0285 ||
+		   device->type() == TMS5200);
 	return (tms5220_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index 4a40daede82..21fe941523a 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -224,7 +224,7 @@ static const int upd7759_state_table[16] = { -1, -1, 0, 0, 1, 2, 2, 3, -1, -1, 0
 INLINE upd7759_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_UPD7759);
+	assert(device->type() == UPD7759);
 	return (upd7759_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index 628372cf930..3e3f90bbebb 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -256,7 +256,7 @@ static const INT16 K5_table[] = {
 INLINE vlm5030_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_VLM5030);
+	assert(device->type() == VLM5030);
 	return (vlm5030_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c
index ad933245597..bd27fd0a43b 100644
--- a/src/emu/sound/votrax.c
+++ b/src/emu/sound/votrax.c
@@ -41,7 +41,7 @@ struct _votrax_state
 INLINE votrax_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_VOTRAX);
+	assert(device->type() == VOTRAX);
 	return (votrax_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c
index 02cbaf50258..6ee4fe570b5 100644
--- a/src/emu/sound/vrender0.c
+++ b/src/emu/sound/vrender0.c
@@ -26,7 +26,7 @@ struct _vr0_state
 INLINE vr0_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_VRENDER0);
+	assert(device->type() == VRENDER0);
 	return (vr0_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 25f5b19b978..235e08aadac 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -101,7 +101,7 @@ struct _x1_010_state
 INLINE x1_010_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_X1_010);
+	assert(device->type() == X1_010);
 	return (x1_010_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index 700e73f9ae3..e608da0fec9 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -276,7 +276,7 @@ static int env_volume_table[256];
 INLINE YMF271Chip *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YMF271);
+	assert(device->type() == YMF271);
 	return (YMF271Chip *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index fc9a47ba656..a5609307210 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -132,7 +132,7 @@ typedef struct
 INLINE YMF278BChip *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YMF278B);
+	assert(device->type() == YMF278B);
 	return (YMF278BChip *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 9310d6c493c..71d9f9d8ed1 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -133,7 +133,7 @@ static const timer_fired_func update_irq_state_cb[] =
 INLINE ymz280b_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_YMZ280B);
+	assert(device->type() == YMZ280B);
 	return (ymz280b_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c
index ca556352565..15d5581fd11 100644
--- a/src/emu/sound/zsg2.c
+++ b/src/emu/sound/zsg2.c
@@ -69,7 +69,7 @@ struct _zsg2_state
 INLINE zsg2_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_ZSG2);
+	assert(device->type() == ZSG2);
 	return (zsg2_state *)downcast<legacy_device_base *>(device)->token();
 }
 
diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c
index 9a5caa977f3..8762364625a 100644
--- a/src/ldplayer/ldplayer.c
+++ b/src/ldplayer/ldplayer.c
@@ -563,7 +563,7 @@ static MACHINE_CONFIG_FRAGMENT( ldplayer_core )
 	/* audio hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 9c0bf76b4f0..e4f26af49d5 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -57,8 +57,8 @@ static cpu_device *jsacpu;
 static const char *test_port;
 static UINT16 test_mask;
 
-static pokey_sound_device *pokey;
-static ym2151_sound_device *ym2151;
+static pokey_device *pokey;
+static ym2151_device *ym2151;
 static device_t *tms5220;
 static okim6295_device *oki6295;
 static okim6295_device *oki6295_l, *oki6295_r;
@@ -139,8 +139,8 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
 
 	/* determine which sound hardware is installed */
 	tms5220 = machine->device("tms");
-	ym2151 = machine->device<ym2151_sound_device>("ymsnd");
-	pokey = machine->device<pokey_sound_device>("pokey");
+	ym2151 = machine->device<ym2151_device>("ymsnd");
+	pokey = machine->device<pokey_device>("pokey");
 	oki6295 = machine->device<okim6295_device>("adpcm");
 	oki6295_l = machine->device<okim6295_device>("adpcml");
 	oki6295_r = machine->device<okim6295_device>("adpcmr");
diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c
index 9d72dcce281..e7bad7785e6 100644
--- a/src/mame/audio/micro3d.c
+++ b/src/mame/audio/micro3d.c
@@ -213,7 +213,7 @@ void micro3d_noise_sh_w(running_machine *machine, UINT8 data)
 INLINE noise_state *get_safe_token(running_device *device)
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_MICRO3D);
+	assert(device->type() == MICRO3D);
 
 	return (noise_state *)downcast<legacy_device_base *>(device)->token();
 }
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 968472b424c..90bf06ac5ba 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -30,8 +30,8 @@
 
 DEVICE_GET_INFO( sega005_sound );
 
-DECLARE_LEGACY_SOUND_DEVICE(005, sega005_sound);
-DEFINE_LEGACY_SOUND_DEVICE(005, sega005_sound);
+DECLARE_LEGACY_SOUND_DEVICE(SEGA005, sega005_sound);
+DEFINE_LEGACY_SOUND_DEVICE(SEGA005, sega005_sound);
 
 
 
@@ -343,7 +343,7 @@ WRITE8_HANDLER( astrob_sound_w )
  *
  *************************************/
 
-static SOUND_START( 005 );
+static SOUND_START( sega005 );
 static STREAM_UPDATE( sega005_stream_update );
 static TIMER_CALLBACK( sega005_auto_timer );
 static WRITE8_DEVICE_HANDLER( sega005_sound_a_w );
@@ -441,13 +441,13 @@ MACHINE_CONFIG_FRAGMENT( 005_sound_board )
 	MDRV_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
 
 	/* sound hardware */
-	MDRV_SOUND_START(005)
+	MDRV_SOUND_START(sega005)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
 	MDRV_SOUND_CONFIG(sega005_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MDRV_SOUND_ADD("005", 005, 0)
+	MDRV_SOUND_ADD("005", SEGA005, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_CONFIG_END
 
@@ -459,7 +459,7 @@ MACHINE_CONFIG_END
  *
  *************************************/
 
-static SOUND_START( 005 )
+static SOUND_START( sega005 )
 {
 	state_save_register_global_array(machine, sound_state);
 	state_save_register_global(machine, sound_addr);
diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c
index 6ff7d1d709b..ad2dc1adc15 100644
--- a/src/mame/audio/senjyo.c
+++ b/src/mame/audio/senjyo.c
@@ -51,7 +51,7 @@ Z80CTC_INTERFACE( senjyo_ctc_intf )
 
 WRITE8_HANDLER( senjyo_volume_w )
 {
-	samples_sound_device *samples = space->machine->device<samples_sound_device>("samples");
+	samples_device *samples = space->machine->device<samples_device>("samples");
 	single_volume = data & 0x0f;
 	sample_set_volume(samples,0,single_volume / 15.0);
 }
diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c
index 04bbf22f4d1..db571710c8b 100644
--- a/src/mame/audio/snes_snd.c
+++ b/src/mame/audio/snes_snd.c
@@ -235,7 +235,7 @@ struct _snes_sound_state
 INLINE snes_sound_state *get_safe_token( running_device *device )
 {
 	assert(device != NULL);
-	assert(device->type() == SNES_SPC);
+	assert(device->type() == SNES);
 
 	return (snes_sound_state *)downcast<legacy_device_base *>(device)->token();
 }
diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h
index 0a93b3ff2e0..46459b2b361 100644
--- a/src/mame/audio/snes_snd.h
+++ b/src/mame/audio/snes_snd.h
@@ -17,7 +17,6 @@
 ***************************************************************************/
 
 DECLARE_LEGACY_SOUND_DEVICE(SNES, snes_sound);
-#define SNES_SPC SOUND_SNES
 
 
 /***************************************************************************
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index e5732ae02b4..620fa7b8310 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -385,7 +385,7 @@ DISCRETE_SOUND_END
 INLINE snk6502_sound_state *get_safe_token( running_device *device )
 {
 	assert(device != NULL);
-	assert(device->type() == SOUND_SNK6502);
+	assert(device->type() == SNK6502);
 
 	return (snk6502_sound_state *)downcast<legacy_device_base *>(device)->token();
 }
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 3dd027fb51f..5ba2662805b 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -451,7 +451,7 @@ static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root )
 	MDRV_FRAGMENT_ADD(invaders_samples_audio)
 
 	/* extra audio channel */
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_CONFIG_END
@@ -808,7 +808,7 @@ static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
 
 	/* extra audio channel */
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_CONFIG_END
@@ -1135,7 +1135,7 @@ static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root )
 	/* sound hardware */
 	MDRV_FRAGMENT_ADD(invaders_samples_audio)
 
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 3addf61b0cd..1629c45831a 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -437,7 +437,7 @@ static MACHINE_CONFIG_START( alg_r1, driver_device )
 	MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
 	MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index dc254e1df51..41b45445dda 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -710,7 +710,7 @@ static MACHINE_CONFIG_START( cliffhgr, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 107d92da458..ff93f34c3e1 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -529,7 +529,7 @@ static MACHINE_CONFIG_START( cubeqst, driver_device )
 
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index b954986c2f2..d9a51d40169 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -517,7 +517,7 @@ static MACHINE_CONFIG_START( rblaster, driver_device )
 	MDRV_SOUND_ADD("ay2", AY8910, 1500000)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 6e2e0a9c1fe..661d31992f5 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -209,7 +209,7 @@ static MACHINE_RESET( dlair )
 static INTERRUPT_GEN( vblank_callback )
 {
 	/* also update the speaker on the European version */
-	beep_sound_device *beep = device->machine->device<beep_sound_device>("beep");
+	beep_device *beep = device->machine->device<beep_device>("beep");
 	if (beep != NULL)
 	{
 		z80ctc_device *ctc = device->machine->device<z80ctc_device>("ctc");
@@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( dlair_base, driver_device )
 	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
@@ -741,7 +741,7 @@ static MACHINE_CONFIG_START( dleuro, driver_device )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index d5c172020e7..cfe98521846 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -303,7 +303,7 @@ static MACHINE_CONFIG_START( esh, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index 7e70d166f12..8e22606e91c 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -696,7 +696,7 @@ static MACHINE_CONFIG_START( firefox, driver_device )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index b7946693b60..173a7cbfbb8 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -282,13 +282,13 @@ static MACHINE_CONFIG_START( galaxia, driver_device )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
-	MDRV_SOUND_ADD("s2636snd_0", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MDRV_SOUND_ADD("s2636snd_1", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MDRV_SOUND_ADD("s2636snd_2", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd_2", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 32ec4b35fdb..00ff8ae29d3 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1964,7 +1964,7 @@ static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core )
 	MDRV_DEVICE_REMOVE("screen")
 	MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "mono", 1.0)
 	/* right channel is processed as data */
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 20860d142a4..56216d91aa3 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -463,7 +463,7 @@ static MACHINE_CONFIG_START( gpworld, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index d81d369f813..99b7c1a3106 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -354,7 +354,7 @@ static MACHINE_CONFIG_START( istellar, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index ce5c2d270c0..0fcab09b078 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -366,7 +366,7 @@ static MACHINE_CONFIG_START( lgp, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 352b5533b94..53e18873485 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -433,10 +433,10 @@ static MACHINE_CONFIG_START( malzak, malzak_state )
 	MDRV_SOUND_CONFIG(sn76477_intf)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MDRV_SOUND_ADD("s2636snd_0", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MDRV_SOUND_ADD("s2636snd_1", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index bb7d85dc2ac..d8031e54c83 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -461,7 +461,7 @@ static MACHINE_CONFIG_START( a600xl, driver_device )
 	MDRV_SOUND_CONFIG(pokey_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_MACHINE_START( atarixl )
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index e25bda354d9..21d11c5d723 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( photon, driver_device )
 
     /* audio hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index c65a12f8e39..26a30b10821 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( photon2, driver_device )
 
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
-	MDRV_SOUND_ADD("speaker", SPEAKER, 0)
+	MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index cc0816ab172..eb62e9b7948 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -4150,7 +4150,7 @@ static DRIVER_INIT( radr )
 
 static DRIVER_INIT( scross )
 {
-	multipcm_sound_device *multipcm = machine->device<multipcm_sound_device>("sega");
+	multipcm_device *multipcm = machine->device<multipcm_device>("sega");
 	segas32_common_init(analog_custom_io_r, analog_custom_io_w);
 	memory_install_write8_device_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), multipcm, 0xb0, 0xbf, 0, 0, scross_bank_w);
 
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index b29311c19e8..6654bc9e58e 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -351,7 +351,7 @@ static MACHINE_CONFIG_START( superdq, superdq_state )
 	MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8)
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index a9b5b6c6170..6743f8fdaa5 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -779,7 +779,7 @@ static MACHINE_CONFIG_START( thayers, driver_device )
 	MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 	// SSI 263 @ 2MHz
 
-	MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
+	MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
 	MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 6bce75bf2fb..2caa657fd2a 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -263,7 +263,7 @@ static MACHINE_CONFIG_START( tinvader, driver_device )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
-	MDRV_SOUND_ADD("s2636snd", S2636, 0)
+	MDRV_SOUND_ADD("s2636snd", S2636_SOUND, 0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index 95ad446df2c..806d0cfe3e6 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -37,7 +37,7 @@ public:
 		astring temp;
 		for (int i = 0; i < ARRAY_LENGTH(cem_device); i++)
 		{
-			cem_device[i] = machine.device<cem3394_sound_device>(temp.format("cem%d", i+1));
+			cem_device[i] = machine.device<cem3394_device>(temp.format("cem%d", i+1));
 			assert(cem_device[i] != NULL);
 		}
 	}
@@ -100,7 +100,7 @@ public:
 
 	/* noise generator states */
 	UINT32 noise_position[6];
-	cem3394_sound_device *cem_device[6];
+	cem3394_device *cem_device[6];
 
 	/* game-specific states */
 	UINT8 nstocker_bits;
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index d189eb76512..5c273adf555 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -9,7 +9,7 @@ public:
 		: driver_device(machine, config),
 		  maincpu(machine.device<cpu_device>("maincpu")),
 		  oki(machine.device<okim6295_device>("oki")),
-		  msm(machine.device<msm5205_sound_device>("msm")) { }
+		  msm(machine.device<msm5205_device>("msm")) { }
 
 	/* memory pointers */
 	UINT16 *    tilemapram;
@@ -34,7 +34,7 @@ public:
 	/* devices */
 	cpu_device *maincpu;
 	okim6295_device *oki;
-	msm5205_sound_device *msm;
+	msm5205_device *msm;
 };
 
 
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 116efb7a583..821e32283fd 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -461,7 +461,7 @@ public:
 	/* devices */
 	_5a22_device *maincpu;
 	spc700_device *soundcpu;
-	snes_sound_sound_device *spc700;
+	snes_sound_device *spc700;
 	cpu_device *superfx;
 };
 
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index 5a75fec7b7f..cac90e0e655 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -891,22 +891,22 @@ void atarigen_set_vol(running_machine *machine, int volume, device_type type)
 
 void atarigen_set_ym2151_vol(running_machine *machine, int volume)
 {
-	atarigen_set_vol(machine, volume, SOUND_YM2151);
+	atarigen_set_vol(machine, volume, YM2151);
 }
 
 void atarigen_set_ym2413_vol(running_machine *machine, int volume)
 {
-	atarigen_set_vol(machine, volume, SOUND_YM2413);
+	atarigen_set_vol(machine, volume, YM2413);
 }
 
 void atarigen_set_pokey_vol(running_machine *machine, int volume)
 {
-	atarigen_set_vol(machine, volume, SOUND_POKEY);
+	atarigen_set_vol(machine, volume, POKEY);
 }
 
 void atarigen_set_tms5220_vol(running_machine *machine, int volume)
 {
-	atarigen_set_vol(machine, volume, SOUND_TMS5220);
+	atarigen_set_vol(machine, volume, TMS5220);
 }
 
 void atarigen_set_oki6295_vol(running_machine *machine, int volume)
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 65e72a2d3ee..8e1d937c469 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -1696,7 +1696,7 @@ MACHINE_START( snes )
 
 	state->maincpu = machine->device<_5a22_device>("maincpu");
 	state->soundcpu = machine->device<spc700_device>("soundcpu");
-	state->spc700 = machine->device<snes_sound_sound_device>("spc700");
+	state->spc700 = machine->device<snes_sound_device>("spc700");
 	state->superfx = machine->device<cpu_device>("superfx");
 
 	state->maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate_create_static(snes_direct, *machine));
diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c
index 4b874c7dfb7..946927891a4 100644
--- a/src/mame/machine/xevious.c
+++ b/src/mame/machine/xevious.c
@@ -157,7 +157,7 @@ WRITE8_HANDLER( battles_noise_sound_w )
 {
 	logerror("CPU3 %04x: 50%02x Write = %02x\n",cpu_get_pc(space->cpu),offset,data);
 	if( (battles_sound_played == 0) && (data == 0xFF) ){
-		samples_sound_device *samples = space->machine->device<samples_sound_device>("samples");
+		samples_device *samples = space->machine->device<samples_device>("samples");
 		if( customio[0] == 0x40 ){
 			sample_start (samples, 0, 0, 0);
 		}
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index f418714d05c..b11a4c3b06a 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -572,7 +572,7 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1
 						/* HACK! When tilted, sound CPU needs to be reset. */
 						running_device *ym = vdp->machine->device("ymsnd");
 
-						if (ym && ym->type() == SOUND_YM3812)
+						if (ym && ym->type() == YM3812)
 						{
 							cputag_set_input_line(vdp->machine, "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
 							devtag_reset(vdp->machine, "ymsnd");