diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index 11b23d3a848..6fe00529a16 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -19,7 +19,7 @@ struct ym2151_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct YM2151interface *intf;
+	const ym2151_interface *intf;
 };
 
 
@@ -39,7 +39,7 @@ static STATE_POSTLOAD( ym2151_postload )
 
 static void *ym2151_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2151interface dummy = { 0 };
+	static const ym2151_interface dummy = { 0 };
 	struct ym2151_info *info;
 	int rate;
 
diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h
index 66bab7708ce..87b1e3e33b8 100644
--- a/src/emu/sound/2151intf.h
+++ b/src/emu/sound/2151intf.h
@@ -1,7 +1,8 @@
 #ifndef YM2151INTF_H
 #define YM2151INTF_H
 
-struct YM2151interface
+typedef struct _ym2151_interface ym2151_interface;
+struct _ym2151_interface
 {
 	void (*irqhandler)(running_machine *machine, int irq);
 	write8_machine_func portwritehandler;
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 08eb1fb8018..b752b12b033 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -12,7 +12,7 @@ struct ym2203_info
 	emu_timer *	timer[2];
 	void *			chip;
 	void *			psg;
-	const struct YM2203interface *intf;
+	const ym2203_interface *intf;
 };
 
 
@@ -107,7 +107,7 @@ static STATE_POSTLOAD( ym2203_postload )
 
 static void *ym2203_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2203interface generic_2203 =
+	static const ym2203_interface generic_2203 =
 	{
 		{
 			AY8910_LEGACY_OUTPUT,
@@ -116,7 +116,7 @@ static void *ym2203_start(const char *tag, int sndindex, int clock, const void *
 		},
 		NULL
 	};
-	const struct YM2203interface *intf = config ? config : &generic_2203;
+	const ym2203_interface *intf = config ? config : &generic_2203;
 	struct ym2203_info *info;
 	int rate = clock/72; /* ??? */
 
diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h
index fa5a480c685..61e54955e41 100644
--- a/src/emu/sound/2203intf.h
+++ b/src/emu/sound/2203intf.h
@@ -3,7 +3,8 @@
 
 #include "ay8910.h"
 
-struct YM2203interface
+typedef struct _ym2203_interface ym2203_interface;
+struct _ym2203_interface
 {
 	const ay8910_interface ay8910_intf;
 	void (*handler)(running_machine *machine, int irq);
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index f3abb517f3a..e352a233b39 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -24,7 +24,7 @@ struct ym2608_info
 	emu_timer *	timer[2];
 	void *			chip;
 	void *			psg;
-	const struct YM2608interface *intf;
+	const ym2608_interface *intf;
 };
 
 
@@ -120,7 +120,7 @@ static STATE_POSTLOAD( ym2608_postload )
 
 static void *ym2608_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2608interface generic_2608 =
+	static const ym2608_interface generic_2608 =
 	{
 		{
 			AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -129,7 +129,7 @@ static void *ym2608_start(const char *tag, int sndindex, int clock, const void *
 		},
 		NULL
 	};
-	const struct YM2608interface *intf = config ? config : &generic_2608;
+	const ym2608_interface *intf = config ? config : &generic_2608;
 	int rate = clock/72;
 	void *pcmbufa;
 	int  pcmsizea;
diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h
index dbc21f3d3bd..a88d73e4a4a 100644
--- a/src/emu/sound/2608intf.h
+++ b/src/emu/sound/2608intf.h
@@ -4,7 +4,8 @@
 #include "fm.h"
 #include "ay8910.h"
 
-struct YM2608interface
+typedef struct _ym2608_interface ym2608_interface;
+struct _ym2608_interface
 {
 	const ay8910_interface ay8910_intf;
 	void ( *handler )( running_machine *machine, int irq );	/* IRQ handler for the YM2608 */
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index c6f3c83dc47..a0814a40546 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -25,7 +25,7 @@ struct ym2610_info
 	emu_timer *	timer[2];
 	void *			chip;
 	void *			psg;
-	const struct YM2610interface *intf;
+	const ym2610_interface *intf;
 };
 
 
@@ -122,14 +122,14 @@ static STATE_POSTLOAD( ym2610_postload )
 
 static void *ym2610_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2610interface generic_2610 = { 0 };
+	static const ym2610_interface generic_2610 = { 0 };
 	static const ay8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
 		AY8910_DEFAULT_LOADS,
 		NULL, NULL, NULL, NULL
 	};
-	const struct YM2610interface *intf = config ? config : &generic_2610;
+	const ym2610_interface *intf = config ? config : &generic_2610;
 	int rate = clock/72;
 	void *pcmbufa,*pcmbufb;
 	int  pcmsizea,pcmsizeb;
@@ -188,14 +188,14 @@ static void ym2610b_stream_update(void *param, stream_sample_t **inputs, stream_
 
 static void *ym2610b_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2610interface generic_2610 = { 0 };
+	static const ym2610_interface generic_2610 = { 0 };
 	static const ay8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
 		AY8910_DEFAULT_LOADS,
 		NULL, NULL, NULL, NULL
 	};
-	const struct YM2610interface *intf = config ? config : &generic_2610;
+	const ym2610_interface *intf = config ? config : &generic_2610;
 	int rate = clock/72;
 	void *pcmbufa,*pcmbufb;
 	int  pcmsizea,pcmsizeb;
diff --git a/src/emu/sound/2610intf.h b/src/emu/sound/2610intf.h
index d5790001cb0..89908f5fcf7 100644
--- a/src/emu/sound/2610intf.h
+++ b/src/emu/sound/2610intf.h
@@ -3,7 +3,8 @@
 
 #include "fm.h"
 
-struct YM2610interface
+typedef struct _ym2610_interface ym2610_interface;
+struct _ym2610_interface
 {
 	void ( *handler )( running_machine *machine, int irq );	/* IRQ handler for the YM2610 */
 };
diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c
index 6beb69f1e40..cbbe18f73c8 100644
--- a/src/emu/sound/2612intf.c
+++ b/src/emu/sound/2612intf.c
@@ -23,7 +23,7 @@ struct ym2612_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct YM2612interface *intf;
+	const ym2612_interface *intf;
 };
 
 /*------------------------- TM2612 -------------------------------*/
@@ -89,7 +89,7 @@ static STATE_POSTLOAD( ym2612_postload )
 
 static void *ym2612_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM2612interface dummy = { 0 };
+	static const ym2612_interface dummy = { 0 };
 	struct ym2612_info *info;
 	int rate = clock/72;
 
diff --git a/src/emu/sound/2612intf.h b/src/emu/sound/2612intf.h
index c34e70b354f..c83a51b51fd 100644
--- a/src/emu/sound/2612intf.h
+++ b/src/emu/sound/2612intf.h
@@ -1,7 +1,8 @@
 #ifndef __2612INTF_H__
 #define __2612INTF_H__
 
-struct YM2612interface
+typedef struct _ym2612_interface ym2612_interface;
+struct _ym2612_interface
 {
 	void (*handler)(running_machine *machine, int irq);
 };
diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c
index 85f842c999a..409b91321e9 100644
--- a/src/emu/sound/262intf.c
+++ b/src/emu/sound/262intf.c
@@ -17,7 +17,7 @@ struct ymf262_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct YMF262interface *intf;
+	const ymf262_interface *intf;
 };
 
 
@@ -69,7 +69,7 @@ static void _stream_update(void *param, int interval)
 
 static void *ymf262_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YMF262interface dummy = { 0 };
+	static const ymf262_interface dummy = { 0 };
 	struct ymf262_info *info;
 	int rate = clock/288;
 
diff --git a/src/emu/sound/262intf.h b/src/emu/sound/262intf.h
index 5a13580aa84..7d42e0913a1 100644
--- a/src/emu/sound/262intf.h
+++ b/src/emu/sound/262intf.h
@@ -2,7 +2,8 @@
 #define YMF262INTF_H
 
 
-struct YMF262interface
+typedef struct _ymf262_interface ymf262_interface;
+struct _ymf262_interface
 {
 	void (*handler)(running_machine *machine, int irq);
 };
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index 1736c85e8d6..c1da34089b4 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -32,7 +32,7 @@ struct ym3812_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct YM3812interface *intf;
+	const ym3812_interface *intf;
 };
 
 static void IRQHandler_3812(void *param,int irq)
@@ -81,7 +81,7 @@ static void _stream_update_3812(void * param, int interval)
 
 static void *ym3812_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM3812interface dummy = { 0 };
+	static const ym3812_interface dummy = { 0 };
 	struct ym3812_info *info;
 	int rate = clock/72;
 
@@ -199,7 +199,7 @@ struct ym3526_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct YM3526interface *intf;
+	const ym3526_interface *intf;
 };
 
 
@@ -250,7 +250,7 @@ static void _stream_update_3526(void *param, int interval)
 
 static void *ym3526_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YM3526interface dummy = { 0 };
+	static const ym3526_interface dummy = { 0 };
 	struct ym3526_info *info;
 	int rate = clock/72;
 
@@ -367,7 +367,7 @@ struct y8950_info
 	sound_stream *	stream;
 	emu_timer *	timer[2];
 	void *			chip;
-	const struct Y8950interface *intf;
+	const y8950_interface *intf;
 	int				index;
 };
 
@@ -445,7 +445,7 @@ static void _stream_update_8950(void *param, int interval)
 
 static void *y8950_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct Y8950interface dummy = { 0 };
+	static const y8950_interface dummy = { 0 };
 	struct y8950_info *info;
 	int rate = clock/72;
 
diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h
index 2e0c381a96a..7f6f2e439ea 100644
--- a/src/emu/sound/3812intf.h
+++ b/src/emu/sound/3812intf.h
@@ -2,14 +2,16 @@
 #define YM3812INTF_H
 
 
-struct YM3812interface
+typedef struct _ym3812_interface ym3812_interface;
+struct _ym3812_interface
 {
 	void (*handler)(running_machine *machine, int linestate);
 };
 
-#define YM3526interface YM3812interface
+#define ym3526_interface ym3812_interface
 
-struct Y8950interface
+typedef struct _y8950_interface y8950_interface;
+struct _y8950_interface
 {
 	void (*handler)(running_machine *machine, int linestate);
 
diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c
index 88bd9a1b3b0..a20fd7bdacf 100644
--- a/src/emu/sound/5110intf.c
+++ b/src/emu/sound/5110intf.c
@@ -25,7 +25,7 @@
 /* the state of the streamed output */
 struct tms5110_info
 {
-	const struct TMS5110interface *intf;
+	const tms5110_interface *intf;
 	const char *tag;
 	sound_stream *stream;
 	void *chip;
@@ -68,7 +68,7 @@ static void speech_rom_set_addr(int addr)
 
 static void *tms5110_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct TMS5110interface dummy = { 0 };
+	static const tms5110_interface dummy = { 0 };
 	struct tms5110_info *info;
 
 	info = auto_malloc(sizeof(*info));
diff --git a/src/emu/sound/5110intf.h b/src/emu/sound/5110intf.h
index 59873b2d56e..0d1ab446e12 100644
--- a/src/emu/sound/5110intf.h
+++ b/src/emu/sound/5110intf.h
@@ -5,7 +5,8 @@
 /* usually 640000 for 8000 Hz sample rate or */
 /* usually 800000 for 10000 Hz sample rate.  */
 
-struct TMS5110interface
+typedef struct _tms5110_interface tms5110_interface;
+struct _tms5110_interface
 {
 	int (*M0_callback)(void);	/* function to be called when chip requests another bit */
 	void (*load_address)(int addr);	/* speech ROM load address callback */
diff --git a/src/emu/sound/5220intf.c b/src/emu/sound/5220intf.c
index f6695a48ea0..1d943f95edb 100644
--- a/src/emu/sound/5220intf.c
+++ b/src/emu/sound/5220intf.c
@@ -23,7 +23,7 @@
 /* the state of the streamed output */
 struct tms5220_info
 {
-	const struct TMS5220interface *intf;
+	const tms5220_interface *intf;
 	sound_stream *stream;
 	int clock;
 	void *chip;
@@ -43,7 +43,7 @@ static void tms5220_update(void *param, stream_sample_t **inputs, stream_sample_
 
 static void *tms5220_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct TMS5220interface dummy = { 0 };
+	static const tms5220_interface dummy = { 0 };
 	struct tms5220_info *info;
 
 	info = auto_malloc(sizeof(*info));
diff --git a/src/emu/sound/5220intf.h b/src/emu/sound/5220intf.h
index aab0e92fc32..1e7eb8a33d4 100644
--- a/src/emu/sound/5220intf.h
+++ b/src/emu/sound/5220intf.h
@@ -5,7 +5,8 @@
 /* usually 640000 for 8000 Hz sample rate or */
 /* usually 800000 for 10000 Hz sample rate.  */
 
-struct TMS5220interface
+typedef struct _tms5220_interface tms5220_interface;
+struct _tms5220_interface
 {
 	void (*irq)(running_machine *machine, int state);		/* IRQ callback function */
 
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 4c21650bcf1..4e6b3c06916 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -513,7 +513,7 @@ static void AICA_StopSlot(struct _SLOT *slot,int keyoff)
 
 #define log_base_2(n) (log((float) n)/log((float) 2))
 
-static void AICA_Init(const char *tag, struct _AICA *AICA, const struct AICAinterface *intf, int sndindex)
+static void AICA_Init(const char *tag, struct _AICA *AICA, const aica_interface *intf, int sndindex)
 {
 	int i;
 
@@ -1274,7 +1274,7 @@ static void AICA_Update(void *param, stream_sample_t **inputs, stream_sample_t *
 
 static void *aica_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	const struct AICAinterface *intf;
+	const aica_interface *intf;
 
 	struct _AICA *AICA;
 
diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h
index 752b83b8a59..f7af3567ce4 100644
--- a/src/emu/sound/aica.h
+++ b/src/emu/sound/aica.h
@@ -8,7 +8,8 @@
 
 #define MAX_AICA	(2)
 
-struct AICAinterface
+typedef struct _aica_interface aica_interface;
+struct _aica_interface
 {
 	int roffset;				/* offset in the region */
 	void (*irq_callback)(running_machine *machine, int state);	/* irq callback */
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index d5cf7b0209e..5883b17330d 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -786,7 +786,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	atarigen_ym2151_irq_gen
 };
@@ -811,7 +811,7 @@ MACHINE_DRIVER_START( jsa_i_stereo )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 MACHINE_DRIVER_END
@@ -825,7 +825,7 @@ MACHINE_DRIVER_START( jsa_i_stereo_swapped )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("ym", YM2151, JSA_MASTER_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "right", 0.60)
 	MDRV_SOUND_ROUTE(1, "left", 0.60)
 MACHINE_DRIVER_END
@@ -856,7 +856,7 @@ MACHINE_DRIVER_START( jsa_i_mono_speech )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
@@ -877,7 +877,7 @@ MACHINE_DRIVER_START( jsa_ii_mono )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
@@ -920,7 +920,7 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 9f4aabb0b0f..f48fa99da59 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -372,7 +372,7 @@ static WRITE8_HANDLER( ad2083_tms5110_ctrl_w )
 	timer_set(attotime_zero,NULL,0,ad2083_step);
 }
 
-static const struct TMS5110interface ad2083_tms5110_interface =
+static const tms5110_interface ad2083_tms5110_interface =
 {
 	ad2083_speech_rom_read_bit	/* M0 callback function. Called whenever chip requests a single bit of data */
 };
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 287ca104659..0d8e63e4846 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -467,7 +467,7 @@ WRITE16_HANDLER( seibu_main_mustb_w )
 
 /***************************************************************************/
 
-const struct YM3812interface seibu_ym3812_interface =
+const ym3812_interface seibu_ym3812_interface =
 {
 	seibu_ym3812_irqhandler
 };
@@ -478,12 +478,12 @@ const custom_sound_interface seibu_adpcm_interface =
 	seibu_adpcm_stop
 };
 
-const struct YM2151interface seibu_ym2151_interface =
+const ym2151_interface seibu_ym2151_interface =
 {
 	seibu_ym2151_irqhandler
 };
 
-const struct YM2203interface seibu_ym2203_interface =
+const ym2203_interface seibu_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index f78f6803423..56591bf6f40 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -62,10 +62,10 @@ WRITE8_HANDLER( seibu_adpcm_ctl_1_w );
 WRITE8_HANDLER( seibu_adpcm_adr_2_w );
 WRITE8_HANDLER( seibu_adpcm_ctl_2_w );
 
-extern const struct YM3812interface seibu_ym3812_interface;
+extern const ym3812_interface seibu_ym3812_interface;
 extern const custom_sound_interface seibu_adpcm_interface;
-extern const struct YM2151interface seibu_ym2151_interface;
-extern const struct YM2203interface seibu_ym2203_interface;
+extern const ym2151_interface seibu_ym2151_interface;
+extern const ym2203_interface seibu_ym2203_interface;
 
 /**************************************************************************/
 
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index f53f7d8a5af..b180fc8df01 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -233,7 +233,7 @@ static READ8_HANDLER(t5182_sharedram_semaphore_main_r)
 }
 
 
-const struct YM2151interface t5182_ym2151_interface =
+const ym2151_interface t5182_ym2151_interface =
 {
 	t5182_ym2151_irq_handler
 };
diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h
index f274da4f3fa..fb3cbb8d660 100644
--- a/src/mame/audio/t5182.h
+++ b/src/mame/audio/t5182.h
@@ -1,3 +1,7 @@
+#include "sound/262intf.h"
+#include "sound/2151intf.h"
+
+
 #define CPUTAG_T5182 "T5182"
 #define T5182COINPORT "T5182_COIN"
 
@@ -11,4 +15,4 @@ WRITE8_HANDLER(t5182_sharedram_semaphore_main_release_w);
 
 extern UINT8 *t5182_sharedram;
 
-extern const struct YM2151interface t5182_ym2151_interface;
+extern const ym2151_interface t5182_ym2151_interface;
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index dbc9791207f..10ce597cf64 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -171,14 +171,14 @@ static const pia6821_interface cvsd_pia_intf =
 ****************************************************************************/
 
 /* YM2151 structure (CVSD variant) */
-static const struct YM2151interface cvsd_ym2151_interface =
+static const ym2151_interface cvsd_ym2151_interface =
 {
 	cvsd_ym2151_irq
 };
 
 
 /* YM2151 structure (ADPCM variant) */
-static const struct YM2151interface adpcm_ym2151_interface =
+static const ym2151_interface adpcm_ym2151_interface =
 {
 	adpcm_ym2151_irq
 };
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 9c67ed26c75..a86ae31067d 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -184,7 +184,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 0,5,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -209,7 +209,7 @@ static MACHINE_DRIVER_START( drill )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 741aed84f35..b33c3d5bc40 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -281,7 +281,7 @@ static void sound_irq(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate); /* IRQ */
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	sound_irq
 };
@@ -323,7 +323,7 @@ static MACHINE_DRIVER_START( actfancr )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1024188)
@@ -366,7 +366,7 @@ static MACHINE_DRIVER_START( triothep )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) /* verified on pcb */
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index cbc9fef9894..fbb77f1315d 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1308,12 +1308,12 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler	/* IRQ Line */
 };
@@ -1351,7 +1351,7 @@ static MACHINE_DRIVER_START( pspikes )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1476,7 +1476,7 @@ static MACHINE_DRIVER_START( karatblz )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1514,7 +1514,7 @@ static MACHINE_DRIVER_START( spinlbrk )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1552,7 +1552,7 @@ static MACHINE_DRIVER_START( turbofrc )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1591,7 +1591,7 @@ static MACHINE_DRIVER_START( aerofgtb )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1630,7 +1630,7 @@ static MACHINE_DRIVER_START( aerofgt )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1727,7 +1727,7 @@ static MACHINE_DRIVER_START( wbbc97 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 38512227423..5a616c4f4d0 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -560,7 +560,7 @@ GFXDECODE_END
 
 /* Sound Interfaces */
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -642,7 +642,7 @@ static MACHINE_DRIVER_START( airbustr )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index fa19a10333a..c384706bcf8 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -226,7 +226,7 @@ static const struct K007232_interface k007232_interface =
 	volume_callback	/* external port callback */
 };
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	0,
 	aliens_snd_bankswitch_w
@@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( aliens )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index f8578e44c89..d8976af0114 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1865,7 +1865,7 @@ static const ay8910_interface ay8910_config =
 	soundlatch_r
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1879,7 +1879,7 @@ static void YM3812_irq(running_machine *machine, int param)
 	cpunum_set_input_line(machine, 1, 0, (param) ? HOLD_LINE : CLEAR_LINE);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	YM3812_irq
 };
@@ -2056,7 +2056,7 @@ static MACHINE_DRIVER_START( alpha68k_I )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 4000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -2091,7 +2091,7 @@ static MACHINE_DRIVER_START( alpha68k_II )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
 
 	MDRV_SOUND_ADD("ym2", YM2413, 8000000)
@@ -2139,7 +2139,7 @@ static MACHINE_DRIVER_START( alpha68k_II_gm )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
 
 	MDRV_SOUND_ADD("ym2", YM2413, 8000000)
@@ -2181,7 +2181,7 @@ static MACHINE_DRIVER_START( alpha68k_V )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
 
 	MDRV_SOUND_ADD("ym2", YM2413, 8000000)
@@ -2222,7 +2222,7 @@ static MACHINE_DRIVER_START( alpha68k_V_sb )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
 
 	MDRV_SOUND_ADD("ym2", YM2413, 8000000)
@@ -2262,7 +2262,7 @@ static MACHINE_DRIVER_START( tnexspce )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 4000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 44c32d816dc..7f1e299cd99 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -244,7 +244,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface amspdwy_ym2151_interface =
+static const ym2151_interface amspdwy_ym2151_interface =
 {
 	irq_handler
 };
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index bb8cc5bce30..87198ee8784 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -543,7 +543,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -626,7 +626,7 @@ static MACHINE_DRIVER_START( angelkds )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.65)
 	MDRV_SOUND_ROUTE(1, "mono", 0.65)
 	MDRV_SOUND_ROUTE(2, "mono", 0.65)
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index a0895cf072d..8b4fd7fcd08 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -339,7 +339,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler
 };
@@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( aquarium )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 56392e81319..f69bea52149 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -180,7 +180,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -730,7 +730,7 @@ static MACHINE_DRIVER_START( argus )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 6000000 / 4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -768,7 +768,7 @@ static MACHINE_DRIVER_START( valtric )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -812,7 +812,7 @@ static MACHINE_DRIVER_START( butasan )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.30)
 	MDRV_SOUND_ROUTE(1, "mono", 0.30)
 	MDRV_SOUND_ROUTE(2, "mono", 0.30)
@@ -856,7 +856,7 @@ static MACHINE_DRIVER_START( bombsa )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 12000000 / 8)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.30)
 	MDRV_SOUND_ROUTE(1, "mono", 0.30)
 	MDRV_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 3e03bc44c00..b6ca210876f 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -317,7 +317,7 @@ static const struct MSM5205interface msm5205_interface =
 	MSM5205_S48_4B		/* 4KHz 4-bit */
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -364,7 +364,7 @@ static MACHINE_DRIVER_START( ashnojoe )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 4000000)  /* 4 MHz (verified on pcb) */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("msm", MSM5205, 384000)
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 6761399e2d9..9a63125c778 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -751,13 +751,13 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irq_handler
 };
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler,
 	sound_bankswitch_w
@@ -812,7 +812,7 @@ static MACHINE_DRIVER_START( bonzeadv )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -850,7 +850,7 @@ static MACHINE_DRIVER_START( asuka )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
@@ -891,7 +891,7 @@ static MACHINE_DRIVER_START( cadash )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_8MHz/2)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 MACHINE_DRIVER_END
@@ -928,7 +928,7 @@ static MACHINE_DRIVER_START( mofflott )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
@@ -969,7 +969,7 @@ static MACHINE_DRIVER_START( galmedes )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 MACHINE_DRIVER_END
@@ -1006,7 +1006,7 @@ static MACHINE_DRIVER_START( eto )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 5de3ef8582a..120647f41f7 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -684,7 +684,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	atarigen_ym2151_irq_gen
 };
@@ -728,7 +728,7 @@ static MACHINE_DRIVER_START( atarisy1 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 35b17dc1d45..322c608e68f 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -449,7 +449,7 @@ static const ay8910_interface ay8910_interface_2 =
 	NULL
 };
 
-static const struct TMS5110interface tms5110_interface =
+static const tms5110_interface bagman_tms5110_interface =
 {
 	bagman_speech_rom_read_bit	/*M0 callback function. Called whenever chip requests a single bit of data*/
 };
@@ -486,7 +486,7 @@ static MACHINE_DRIVER_START( bagman )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("tms", TMS5110A, 640000)
-	MDRV_SOUND_CONFIG(tms5110_interface)
+	MDRV_SOUND_CONFIG(bagman_tms5110_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 28df648ebf1..d721bb8c534 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -246,7 +246,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( battlane )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 4ea24509ed7..a4c8638a39e 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -631,7 +631,7 @@ static void sound_irq( running_machine *machine, int irq )
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2608interface ym2608_interface =
+static const ym2608_interface ym2608_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -641,7 +641,7 @@ static const struct YM2608interface ym2608_interface =
 	sound_irq
 };
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	sound_irq
 };
@@ -716,7 +716,7 @@ static MACHINE_DRIVER_START( bbusters )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  3.0)
 	MDRV_SOUND_ROUTE(0, "right", 3.0)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -757,7 +757,7 @@ static MACHINE_DRIVER_START( mechatt )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2608, 8000000)
-	MDRV_SOUND_CONFIG(ym2608_interface)
+	MDRV_SOUND_CONFIG(ym2608_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.50)
 	MDRV_SOUND_ROUTE(0, "right", 0.50)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index d548f9776c9..c8d1eaa1f87 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( bigstrkb )
 	MDRV_VIDEO_UPDATE(bigstrkb)
 
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
-//  MDRV_SOUND_ADD("ym", YM2151, ym2151_interface)
+//  MDRV_SOUND_ADD("ym", YM2151, ym2151_config)
 
 	MDRV_SOUND_ADD("oki1", OKIM6295, 4000000)
 	MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index debe7186543..9c1131c9cf6 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -299,7 +299,7 @@ GFXDECODE_END
 
 ***************************************************************************/
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( bladestl )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("ym", YM2203, 3579545)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 2bd3da10520..ef56351b3bf 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -233,7 +233,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -283,7 +283,7 @@ static MACHINE_DRIVER_START( blktiger )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index b57fe4a3550..f4f9c42b614 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -174,7 +174,7 @@ static void blockout_irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line_and_vector(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE,0xff);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	blockout_irq_handler
 };
@@ -207,7 +207,7 @@ static MACHINE_DRIVER_START( blockout )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 467670d2a22..feda0940b87 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -287,7 +287,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 	OKIM6295_set_bank_base(0, (data & 1) * 0x40000);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq,
 	sound_bankswitch_w
@@ -323,7 +323,7 @@ static MACHINE_DRIVER_START( boogwing )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 95b299407da..39dac530b9c 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -330,7 +330,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,linestate);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -370,7 +370,7 @@ static MACHINE_DRIVER_START( brkthru )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -419,7 +419,7 @@ static MACHINE_DRIVER_START( darwin )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 90e8d1488f2..937ef228b1d 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -674,7 +674,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( tokio )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, MAIN_XTAL/8)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.08)
 	MDRV_SOUND_ROUTE(1, "mono", 0.08)
 	MDRV_SOUND_ROUTE(2, "mono", 0.08)
@@ -763,7 +763,7 @@ static MACHINE_DRIVER_START( bublbobl )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index a2ec54de748..5a3c9483b1a 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -477,7 +477,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface cabalbl_ym2151_interface =
+static const ym2151_interface cabalbl_ym2151_interface =
 {
 	irqhandler
 };
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 6ed720afa69..6eee151bc35 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -329,7 +329,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( capbowl )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.07)
 	MDRV_SOUND_ROUTE(1, "mono", 0.07)
 	MDRV_SOUND_ROUTE(2, "mono", 0.07)
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index c109a8c03db..b90af74d710 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1966,12 +1966,12 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -2256,7 +2256,7 @@ static MACHINE_DRIVER_START( hotdogst )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.20)
 	MDRV_SOUND_ROUTE(0, "right", 0.20)
 	MDRV_SOUND_ROUTE(1, "left",  0.20)
@@ -2351,7 +2351,7 @@ static MACHINE_DRIVER_START( mazinger )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.20)
 	MDRV_SOUND_ROUTE(0, "right", 0.20)
 	MDRV_SOUND_ROUTE(1, "left",  0.20)
@@ -2407,7 +2407,7 @@ static MACHINE_DRIVER_START( metmqstr )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.20)
 	MDRV_SOUND_ROUTE(1, "right", 1.20)
 
@@ -2462,7 +2462,7 @@ static MACHINE_DRIVER_START( pwrinst2 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, 16000000 / 4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.40)
 	MDRV_SOUND_ROUTE(0, "right", 0.40)
 	MDRV_SOUND_ROUTE(1, "left",  0.40)
@@ -2522,7 +2522,7 @@ static MACHINE_DRIVER_START( sailormn )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.30)
 	MDRV_SOUND_ROUTE(1, "right", 0.30)
 
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index f473967a201..9abe1a6cc8c 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -329,7 +329,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -367,7 +367,7 @@ static MACHINE_DRIVER_START( twocrude )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index ff4d7539597..97384be6ab1 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -462,7 +462,7 @@ static void chinagat_irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2, 0, irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	chinagat_irq_handler
 };
@@ -482,7 +482,7 @@ static INTERRUPT_GEN( chinagat_interrupt )
 }
 
 /* This is only on the second bootleg board */
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -527,7 +527,7 @@ static MACHINE_DRIVER_START( chinagat )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.80)
 	MDRV_SOUND_ROUTE(1, "mono", 0.80)
 
@@ -575,7 +575,7 @@ static MACHINE_DRIVER_START( saiyugb1 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.80)
 	MDRV_SOUND_ROUTE(1, "mono", 0.80)
 
@@ -619,7 +619,7 @@ static MACHINE_DRIVER_START( saiyugb2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3579545)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 	MDRV_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index 8d74c526fbf..c1ee1340699 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -94,7 +94,7 @@ static WRITE8_HANDLER( ym_port_w2 )
 }
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -486,7 +486,7 @@ static MACHINE_DRIVER_START( chinsan )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000) /* ? Mhz */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 52fed4eaa36..b9079a4c1dc 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -313,7 +313,7 @@ static void chqflag_ym2151_irq_w(running_machine *machine, int data)
 }
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	chqflag_ym2151_irq_w
 };
@@ -375,7 +375,7 @@ static MACHINE_DRIVER_START( chqflag )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 50d1b43feb7..bc76770723c 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -189,7 +189,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( citycon )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym", YM2203, 1250000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.40)
 	MDRV_SOUND_ROUTE(1, "mono", 0.40)
 	MDRV_SOUND_ROUTE(2, "mono", 0.40)
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 1b8e57a124b..0d092499920 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -763,13 +763,13 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 	OKIM6295_set_bank_base(1, (data & 1) * 0x40000);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq,
 	sound_bankswitch_w
 };
 
-static const struct YM2151interface ym2151_interface2 =
+static const ym2151_interface ym2151_interface2 =
 {
 	sound_irq2
 };
@@ -811,7 +811,7 @@ static MACHINE_DRIVER_START( cninja )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
@@ -904,7 +904,7 @@ static MACHINE_DRIVER_START( edrandy )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
@@ -953,7 +953,7 @@ static MACHINE_DRIVER_START( robocop2 )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
@@ -997,7 +997,7 @@ static MACHINE_DRIVER_START( mutantf )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index f82a45df125..0f430e31581 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -747,7 +747,7 @@ static MACHINE_DRIVER_START( cntsteer )
 
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
-//  MDRV_SOUND_ADD("ym", YM2203, ym2203_interface)
+//  MDRV_SOUND_ADD("ym", YM2203, ym2203_config)
 MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( zerotrgt )
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index e24a2c4d308..802a616e9ab 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -557,7 +557,7 @@ static GFXDECODE_START( combascb )
 	GFXDECODE_ENTRY( "gfx2", 0x40000, sprite_layout, 0, 8*16 )
 GFXDECODE_END
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -605,7 +605,7 @@ static MACHINE_DRIVER_START( combasc )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
 	MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
@@ -646,7 +646,7 @@ static MACHINE_DRIVER_START( combascb )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
 	MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index f62428d1a93..e3797e8110a 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -194,7 +194,7 @@ static void sound_irq(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 0,0,linestate);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -230,7 +230,7 @@ static MACHINE_DRIVER_START( compgolf )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 43b70c78112..37448ee7025 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( cowrace )
 	PORT_START("IN0")
 INPUT_PORTS_END
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index baf327f438c..f3c677f33ba 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -3572,7 +3572,7 @@ static void cps1_irq_handler_mus(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	cps1_irq_handler_mus
 };
@@ -3617,7 +3617,7 @@ static MACHINE_DRIVER_START( cps1_10MHz )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("2151", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.35)
 	MDRV_SOUND_ROUTE(1, "mono", 0.35)
 
@@ -3776,7 +3776,7 @@ static MACHINE_DRIVER_START( sf2mdt )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("2151", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.35)
 	MDRV_SOUND_ROUTE(1, "mono", 0.35)
 
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index f209ad32da6..ad9657b97ec 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -264,7 +264,7 @@ INPUT_PORTS_END
 
 ***************************************************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	0,
 	crimfght_snd_bankswitch_w
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( crimfght )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)	/* verified with PCB */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 75c0e6cd7ef..df019f7adb7 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -324,7 +324,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler	/* IRQ Line */
 };
@@ -358,7 +358,7 @@ static MACHINE_DRIVER_START( crospang )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 14318180/4)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
@@ -395,7 +395,7 @@ static MACHINE_DRIVER_START( bestri )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 14318180/4)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 6978efa42da..9a46ee062a3 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -447,7 +447,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( crshrace )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index b9b64848f53..3adf242ce6d 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -448,7 +448,7 @@ static int speech_rom_read_bit(void)
 }
 
 
-static const struct TMS5110interface tms5100_interface =
+static const tms5110_interface tms5100_interface =
 {
 	speech_rom_read_bit, /* M0 callback function. Called whenever chip requests a single bit of data */
 	NULL
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index 96b83edb07e..40d14243333 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -417,7 +417,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	atarigen_ym2151_irq_gen
 };
@@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( cyberbal )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 763b5ec6de9..84348898dd5 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -556,7 +556,7 @@ static INTERRUPT_GEN( slave_irq )
 	}
 }
 
-static const struct Y8950interface y8950_interface = {
+static const y8950_interface y8950_config = {
 	0 /* TODO */
 };
 
@@ -592,12 +592,12 @@ static MACHINE_DRIVER_START( cybertnk )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym1", Y8950, 3579500)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 3579500)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 144562b2294..d248e6087d4 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -803,7 +803,7 @@ static void irqhandler(running_machine *machine, int irq)	/* assumes Z80 sandwic
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -816,7 +816,7 @@ static const struct YM2203interface ym2203_interface_1 =
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface_2 =
+static const ym2203_interface ym2203_interface_2 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index b6422257d8b..f51a1b5a441 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -277,7 +277,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -315,7 +315,7 @@ static MACHINE_DRIVER_START( darkseal )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.55)
 	MDRV_SOUND_ROUTE(1, "mono", 0.55)
 
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 4683593b4ee..1f6f4c45ce2 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -542,7 +542,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 	OKIM6295_set_bank_base(1, (data & 1) * 0x40000);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq,
 	sound_bankswitch_w
@@ -590,7 +590,7 @@ static MACHINE_DRIVER_START( dassault )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index ba4675970a9..52a41495249 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -530,7 +530,7 @@ static void sound_irq(running_machine *machine, int irq)
 //  mame_printf_debug("sound irq\n");
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -564,7 +564,7 @@ static MACHINE_DRIVER_START( dblewing )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 32220000/32)
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 2baf61477c0..5a73d7ffd40 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -311,7 +311,7 @@ INPUT_PORTS_END
 
 /**********************************************************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	dbz_sound_irq
 };
@@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( dbz )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 7a4bf31d323..9b8b2aa5278 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -953,7 +953,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler
 };
@@ -1004,7 +1004,7 @@ static MACHINE_DRIVER_START( ddragon )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
@@ -1069,7 +1069,7 @@ static MACHINE_DRIVER_START( ddgn6809 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
@@ -1115,7 +1115,7 @@ static MACHINE_DRIVER_START( ddragon2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 1e33eff4e15..ec6a91bebf7 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -456,7 +456,7 @@ static void dd3_ymirq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	dd3_ymirq_handler
 };
@@ -509,7 +509,7 @@ static MACHINE_DRIVER_START( ddragon3 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym2151", YM2151, 3579545)	/* music */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.50)
 	MDRV_SOUND_ROUTE(1, "right", 0.50)
 
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 94bbabdbe02..4bcb7938495 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -318,7 +318,7 @@ static GFXDECODE_START( ddrible )
 	GFXDECODE_ENTRY( "gfx2", 0x40000, spritelayout,  64, 16 )	/* colors  0-15 but using lookup table */
 GFXDECODE_END
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( ddribble )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "filter1", 0.25)
 	MDRV_SOUND_ROUTE(1, "filter2", 0.25)
 	MDRV_SOUND_ROUTE(2, "filter3", 0.25)
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index cfb2d1e0d93..8f5edfb1ecc 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -912,12 +912,12 @@ static void sound_irq2(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,1,linestate); /* IRQ2 */
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	sound_irq
 };
 
-static const struct YM3812interface ym3812b_interface =
+static const ym3812_interface ym3812b_interface =
 {
 	sound_irq2
 };
@@ -958,7 +958,7 @@ static MACHINE_DRIVER_START( hbarrel )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
@@ -1000,7 +1000,7 @@ static MACHINE_DRIVER_START( baddudes )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
@@ -1042,7 +1042,7 @@ static MACHINE_DRIVER_START( birdtry )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
@@ -1089,7 +1089,7 @@ static MACHINE_DRIVER_START( robocop )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
@@ -1131,7 +1131,7 @@ static MACHINE_DRIVER_START( robocopb )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
@@ -1178,7 +1178,7 @@ static MACHINE_DRIVER_START( hippodrm )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 6070f542029..d4b8bacfb7a 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -2019,17 +2019,17 @@ static void oscar_irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 2,0,linestate); /* M6502_IRQ_LINE */
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
 
-static const struct YM3526interface oscar_ym3526_interface =
+static const ym3526_interface oscar_ym3526_interface =
 {
 	oscar_irqhandler
 };
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -2118,7 +2118,7 @@ static MACHINE_DRIVER_START( cobracom )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 MACHINE_DRIVER_END
 
@@ -2161,7 +2161,7 @@ static MACHINE_DRIVER_START( ghostb )
 	MDRV_SOUND_ROUTE(3, "mono", 0.20)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 MACHINE_DRIVER_END
 
@@ -2202,7 +2202,7 @@ static MACHINE_DRIVER_START( srdarwin )
 	MDRV_SOUND_ROUTE(3, "mono", 0.20)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 MACHINE_DRIVER_END
 
@@ -2244,7 +2244,7 @@ static MACHINE_DRIVER_START( gondo )
 	MDRV_SOUND_ROUTE(3, "mono", 0.20)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 MACHINE_DRIVER_END
 
@@ -2468,7 +2468,7 @@ static MACHINE_DRIVER_START( garyoret )
 	MDRV_SOUND_ROUTE(3, "mono", 0.20)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index b61312b0e6e..f24e84a10c3 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1796,13 +1796,13 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 	OKIM6295_set_bank_base(1, ((data >> 1)& 1) * 0x40000);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq,
 	sound_bankswitch_w
 };
 
-static const struct YM2151interface ym2151_interface_nslasher =
+static const ym2151_interface ym2151_interface_nslasher =
 {
 	sound_irq_nslasher,
 	sound_bankswitch_w
@@ -1901,7 +1901,7 @@ static MACHINE_DRIVER_START( captaven )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.42)
 	MDRV_SOUND_ROUTE(1, "right", 0.42)
 
@@ -1947,7 +1947,7 @@ static MACHINE_DRIVER_START( fghthist )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.42)
 	MDRV_SOUND_ROUTE(1, "right", 0.42)
 
@@ -1993,7 +1993,7 @@ static MACHINE_DRIVER_START( fghthsta )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.42)
 	MDRV_SOUND_ROUTE(1, "right", 0.42)
 
@@ -2041,7 +2041,7 @@ static MACHINE_DRIVER_START( dragngun )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.42)
 	MDRV_SOUND_ROUTE(1, "right", 0.42)
 
@@ -2094,7 +2094,7 @@ static MACHINE_DRIVER_START( lockload )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.42)
 	MDRV_SOUND_ROUTE(1, "right", 0.42)
 
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index fcc55de6b50..e79456f43e5 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -272,7 +272,7 @@ static void irqhandler(running_machine *machine, int linestate)
 		cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -310,7 +310,7 @@ static MACHINE_DRIVER_START( deniam16b )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 25000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
@@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( deniam16c )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 25000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 29985bde4b2..db42895f169 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -187,7 +187,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( dietgo )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32_22MHz/32) /* verified on pcb */
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 4cfe6669b75..d949088ba90 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -877,7 +877,7 @@ static READ8_HANDLER( unk_r )
 	return 0;
 }
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -887,7 +887,7 @@ static const struct YM2203interface ym2203_interface_1 =
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface_2 =
+static const ym2203_interface ym2203_interface_2 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -897,7 +897,7 @@ static const struct YM2203interface ym2203_interface_2 =
 	NULL
 };
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -925,7 +925,7 @@ static MACHINE_DRIVER_START( sound_2151 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
@@ -938,7 +938,7 @@ static MACHINE_DRIVER_START( sound_2151_m68k )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index eb74cd90e69..c70e9820f00 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -3602,7 +3602,7 @@ INPUT_PORTS_END
                                 Hana no Mai
 ***************************************************************************/
 
-static const struct YM2203interface hanamai_ym2203_interface =
+static const ym2203_interface hanamai_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -3725,7 +3725,7 @@ MACHINE_DRIVER_END
                                 Sports Match
 ***************************************************************************/
 
-static const struct YM2203interface sprtmtch_ym2203_interface =
+static const ym2203_interface sprtmtch_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -3902,7 +3902,7 @@ MACHINE_DRIVER_END
 
 // dual monitor, 2 CPU's, 2 blitters
 
-static const struct YM2203interface jantouki_ym2203_interface =
+static const ym2203_interface jantouki_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 48b5934a514..46261d1366e 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -278,7 +278,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line_and_vector(machine, 1,0,linestate,0xff);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -332,7 +332,7 @@ static MACHINE_DRIVER_START( exprraid )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3600000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index a237f19b898..56f5d5ec710 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -315,7 +315,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( exzisus )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 46beda24673..2609626fe4c 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -553,7 +553,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -594,7 +594,7 @@ static MACHINE_DRIVER_START( f1gp )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index cd4f4dc0bff..2f3a70bacb6 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -852,7 +852,7 @@ static void galaxygn_sound_irq(running_machine *machine, int line)
 	cpunum_set_input_line_and_vector(machine, 1, 0, line ? ASSERT_LINE : CLEAR_LINE, 0x80/4);
 }
 
-static const struct YM2151interface galaxygn_ym2151_interface =
+static const ym2151_interface galaxygn_ym2151_interface =
 {
 	galaxygn_sound_irq
 };
@@ -950,7 +950,7 @@ static void wheelrun_ym3526_irqhandler(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ0, state);
 }
 
-static const struct YM3526interface wheelrun_ym3526_interface =
+static const ym3526_interface wheelrun_ym3526_interface =
 {
 	wheelrun_ym3526_irqhandler
 };
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 7284abfd96c..dd0cddce390 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -737,7 +737,7 @@ static MACHINE_DRIVER_START( kodb )
 //  MDRV_SPEAKER_STANDARD_MONO("mono")
 
 //  MDRV_SOUND_ADD("2151", YM2151, 3579545)
-//  MDRV_SOUND_CONFIG(ym2151_interface)
+//  MDRV_SOUND_CONFIG(ym2151_config)
 //  MDRV_SOUND_ROUTE(0, "mono", 0.35)
 //  MDRV_SOUND_ROUTE(1, "mono", 0.35)
 
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 5fb5e08711a..0a64f02a523 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -687,7 +687,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( fromanc2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.75)
 	MDRV_SOUND_ROUTE(2, "mono", 0.75)
@@ -794,7 +794,7 @@ static MACHINE_DRIVER_START( fromancr )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.75)
 	MDRV_SOUND_ROUTE(2, "mono", 0.75)
@@ -842,7 +842,7 @@ static MACHINE_DRIVER_START( fromanc4 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.75)
 	MDRV_SOUND_ROUTE(2, "mono", 0.75)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index bddad41d4c3..5d7236fbd42 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -357,7 +357,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( funkyjet )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index d59784a3f9c..b6312a165b2 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -504,7 +504,7 @@ static void soundirq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, 0, state);
 }
 
-static const struct YM3812interface fuuki16_ym3812_intf =
+static const ym3812_interface fuuki16_ym3812_intf =
 {
 	soundirq	/* IRQ Line */
 };
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 1ac022756ea..8b172d5ca10 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -591,7 +591,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YMF262interface ymf262_interface =
+static const ymf262_interface fuuki32_ymf262_interface =
 {
 	irqhandler		/* irq */
 };
@@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( fuuki32 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf1", YMF262, FM_SOUND_CLOCK) /* 33.8688MHz OSC divided by 2 is 16.9344MHz */
-	MDRV_SOUND_CONFIG(ymf262_interface)
+	MDRV_SOUND_CONFIG(fuuki32_ymf262_interface)
 	MDRV_SOUND_ROUTE(0, "left", 0.50)
 	MDRV_SOUND_ROUTE(1, "right", 0.50)
 	MDRV_SOUND_ROUTE(2, "left", 0.50)
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 0d776ec87ce..52346be9e34 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -961,7 +961,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1002,7 +1002,7 @@ static MACHINE_DRIVER_START( shadoww )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 1d927a7c76c..0ce4ec7576a 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -268,7 +268,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -304,7 +304,7 @@ static MACHINE_DRIVER_START( galspnbl )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 9a62904ff2b..f63bf04ece5 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -653,7 +653,7 @@ static READ8_HANDLER(f1_r)
 	return mame_rand(machine);
 }
 
-static const struct YM2203interface ppking_ym2203_interface =
+static const ym2203_interface ppking_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -666,7 +666,7 @@ static const struct YM2203interface ppking_ym2203_interface =
 	NULL
 };
 
-static const struct YM2203interface gladiatr_ym2203_interface =
+static const ym2203_interface gladiatr_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 18067a1be78..6c405473e81 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -237,7 +237,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( goal92 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 2500000/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM2203, 2500000/2)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 91679ce496e..9683b58dbdc 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -264,7 +264,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( gotcha )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.80)
 	MDRV_SOUND_ROUTE(1, "mono", 0.80)
 
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 1afe2695969..5e27275bd22 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -273,7 +273,7 @@ static void gs_ym2610_irq(running_machine *machine, int irq)
 		cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	gs_ym2610_irq
 };
@@ -598,7 +598,7 @@ static MACHINE_DRIVER_START( gstriker )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -638,7 +638,7 @@ static MACHINE_DRIVER_START( vgoal )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 940682438c4..b23afa280eb 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -257,7 +257,7 @@ static const struct K007232_interface k007232_interface =
 	volume_callback	/* external port callback */
 };
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -298,7 +298,7 @@ static MACHINE_DRIVER_START( hcastle )
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
 
 	MDRV_SOUND_ADD("konami2", K051649, 3579545/2)
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index a0fd57a35dd..3314b816e2a 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -309,7 +309,7 @@ static MACHINE_DRIVER_START( hikaru )
 
 //  MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 //  MDRV_SOUND_ADD("aica", AICA, 0)
-//  MDRV_SOUND_CONFIG(aica_interface)
+//  MDRV_SOUND_CONFIG(aica_config)
 //  MDRV_SOUND_ROUTE(0, "left", 2.0)
 //  MDRV_SOUND_ROUTE(0, "right", 2.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 30a8f9a2024..1ad76574a84 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -563,7 +563,7 @@ popmessage("irq");
 }
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -614,7 +614,7 @@ static MACHINE_DRIVER_START( hnayayoi )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 20000000/8)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index ecccf41d995..d8f204d8150 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1264,7 +1264,7 @@ MACHINE_DRIVER_END
 /**************************************************************************/
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1322,7 +1322,7 @@ static MACHINE_DRIVER_START( reikaids )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 881124b8de0..1bb9ac24630 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x71, 0x71) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
 ADDRESS_MAP_END
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -213,7 +213,7 @@ static MACHINE_DRIVER_START( homerun )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 6000000/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index edbc07483b8..9394935d01c 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -707,7 +707,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, 1, HOLD_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -746,7 +746,7 @@ static MACHINE_DRIVER_START( hyprduel )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index b655b9cc6b1..47cbcb4a166 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -381,7 +381,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( inufuku )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 32000000/4)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.75)
 	MDRV_SOUND_ROUTE(2, "mono", 0.75)
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 3ac780490d7..94ed14a388b 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -425,7 +425,7 @@ static DISCRETE_SOUND_START( ironhors )
 
 DISCRETE_SOUND_END
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -469,7 +469,7 @@ static MACHINE_DRIVER_START( ironhors )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym2203", YM2203, 18432000/6)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 
 	MDRV_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
 	MDRV_SOUND_ROUTE_EX(1, "disc_ih", 1.0, 1)
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 540c99d7fb7..80db7f89bff 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1689,7 +1689,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1703,7 +1703,7 @@ static const struct YM2203interface ym2203_interface =
 };
 
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	generate_sound_irq
 };
@@ -1764,7 +1764,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2203 )
 
 	/* sound hardware */
 	MDRV_SOUND_ADD("ym", YM2203, CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.07)
 	MDRV_SOUND_ROUTE(1, "mono", 0.07)
 	MDRV_SOUND_ROUTE(2, "mono", 0.07)
@@ -1780,7 +1780,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812 )
 
 	/* sound hardware */
 	MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
 MACHINE_DRIVER_END
 
@@ -1793,7 +1793,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812_external )
 
 	/* sound hardware */
 	MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 0d74e897060..bdc58fb6b7d 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -672,7 +672,7 @@ static void sound_irq(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate); /* IRQ */
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	sound_irq
 };
@@ -720,7 +720,7 @@ static MACHINE_DRIVER_START( karnov )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -761,7 +761,7 @@ static MACHINE_DRIVER_START( wndrplnt )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 35211f96e58..33eaeba4db4 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -222,7 +222,7 @@ GFXDECODE_END
 
 ***************************************************************************/
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -235,7 +235,7 @@ static const struct YM2203interface ym2203_interface_1 =
 	NULL
 };
 
-static const struct YM2203interface ym2203_interface_2 =
+static const ym2203_interface ym2203_interface_2 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 7c397bdfeab..d0b8ad4aefd 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -237,7 +237,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( lastduel )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3579545)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2203, 3579545)
@@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( madgear )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 0622f4b1729..73d4a980b03 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -264,7 +264,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,0,state);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( lemmings )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 7fc805be3ab..a2585c9ccf3 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -295,7 +295,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( lkage )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( lkageb )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 702a1fcec94..fa2c3486c3e 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -455,7 +455,7 @@ static WRITE8_HANDLER( ym2203_out_b )
 	set_led_status(1, !(data & 0x10));
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -509,7 +509,7 @@ static MACHINE_DRIVER_START( lockon )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.40)
 	MDRV_SOUND_ROUTE(0, "right", 0.40)
 	MDRV_SOUND_ROUTE(1, "f2203.1l", 1.0)
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 5d3cd7587ca..11c17ac178c 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -557,7 +557,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct TMS5220interface tms5220_interface =
+static const tms5220_interface tms5220_config =
 {
 	looping_spcint
 };
@@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( looping )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
 	MDRV_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
-	MDRV_SOUND_CONFIG(tms5220_interface)
+	MDRV_SOUND_CONFIG(tms5220_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 87fca8ccaea..d79676af301 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -431,7 +431,7 @@ static void soundirq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, 0, state);
 }
 
-static const struct YM3812interface lordgun_ym3812_interface =
+static const ym3812_interface lordgun_ym3812_interface =
 {
 	soundirq
 };
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index cfb933a8eea..4dd8c0adf5f 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -542,7 +542,7 @@ static WRITE8_HANDLER( unk )
 }
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -594,7 +594,7 @@ static MACHINE_DRIVER_START( lsasquad )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.12)
 	MDRV_SOUND_ROUTE(1, "mono", 0.12)
 	MDRV_SOUND_ROUTE(2, "mono", 0.12)
@@ -639,7 +639,7 @@ static MACHINE_DRIVER_START( daikaiju )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.12)
 	MDRV_SOUND_ROUTE(1, "mono", 0.12)
 	MDRV_SOUND_ROUTE(2, "mono", 0.12)
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 51689746160..84bcebb5af8 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -463,7 +463,7 @@ static void sound_irq(running_machine *machine, int state)
 		timer_call_after_resynch(NULL, YM2151_CLEAR,setvector_callback);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -504,7 +504,7 @@ static MACHINE_DRIVER_START( firebarr )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.40)
 	MDRV_SOUND_ROUTE(1, "right", 0.40)
 
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 19cda5e90fa..fc984a064a8 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1628,7 +1628,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	m72_ym2151_irq_handler
 };
@@ -1665,7 +1665,7 @@ static MACHINE_DRIVER_START( rtype )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -1731,7 +1731,7 @@ static MACHINE_DRIVER_START( m72 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1781,7 +1781,7 @@ static MACHINE_DRIVER_START( dkgenm72 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1822,7 +1822,7 @@ static MACHINE_DRIVER_START( xmultipl )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1863,7 +1863,7 @@ static MACHINE_DRIVER_START( dbreed )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1903,7 +1903,7 @@ static MACHINE_DRIVER_START( dbreed72 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1944,7 +1944,7 @@ static MACHINE_DRIVER_START( rtype2 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -1984,7 +1984,7 @@ static MACHINE_DRIVER_START( majtitle )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -2024,7 +2024,7 @@ static MACHINE_DRIVER_START( hharry )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -2065,7 +2065,7 @@ static MACHINE_DRIVER_START( hharryu )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -2106,7 +2106,7 @@ static MACHINE_DRIVER_START( poundfor )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
@@ -2146,7 +2146,7 @@ static MACHINE_DRIVER_START( cosmccop )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index c0b2429885a..e09e1f49e14 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -731,7 +731,7 @@ GFXDECODE_END
 
 /*****************************************************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	m72_ym2151_irq_handler
 };
@@ -781,7 +781,7 @@ static MACHINE_DRIVER_START( m90 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.90)
 	MDRV_SOUND_ROUTE(1, "mono", 0.90)
 
@@ -862,7 +862,7 @@ static MACHINE_DRIVER_START( bombrman )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.90)
 	MDRV_SOUND_ROUTE(1, "mono", 0.90)
 
@@ -907,7 +907,7 @@ static MACHINE_DRIVER_START( bbmanw )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.90)
 	MDRV_SOUND_ROUTE(1, "mono", 0.90)
 
@@ -968,7 +968,7 @@ static MACHINE_DRIVER_START( dynablsb )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.90)
 	MDRV_SOUND_ROUTE(1, "mono", 0.90)
 
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 1ed92b960c7..23204796cb0 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -939,7 +939,7 @@ static void sound_irq(running_machine *machine, int state)
 		timer_call_after_resynch(NULL, YM2151_CLEAR, setvector_callback);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -984,7 +984,7 @@ static MACHINE_DRIVER_START( m92 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.40)
 	MDRV_SOUND_ROUTE(1, "mono", 0.40)
 
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 2c0c4d2ae8b..fd0f87b6b75 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -276,7 +276,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( madmotor )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 21470000/6)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index edbc214bebe..bb9314a8827 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -367,7 +367,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,1,linestate);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -407,7 +407,7 @@ static MACHINE_DRIVER_START( maniach )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3526, 3600000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 70d1feb5e94..1eb9c322c2b 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -266,7 +266,7 @@ static GFXDECODE_START( mayumi )
 	GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 32 )
 GFXDECODE_END
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( mayumi )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, MCLK/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 1becf010613..26e08bf0655 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -481,7 +481,7 @@ static void sound_irq( running_machine *machine, int irq )
 {
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
-static const struct YM2610interface mcatadv_ym2610_interface =
+static const ym2610_interface mcatadv_ym2610_interface =
 {
 	sound_irq	/* irq */
 };
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 2a787040f4b..83e4e5b2a04 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -608,7 +608,7 @@ GFXDECODE_END
 
 /* Provided by Jim Hernandez: 3.5MHz for FM, 30KHz (!) for ADPCM */
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	megasys1_sound_irq
 };
@@ -646,7 +646,7 @@ static MACHINE_DRIVER_START( system_A )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
@@ -774,7 +774,7 @@ static void irq_handler(running_machine *machine, int irq)
 }
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -813,7 +813,7 @@ static MACHINE_DRIVER_START( system_Z )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 33578aa560d..87c72ef8c50 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -292,7 +292,7 @@ static void metlclsh_irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,linestate);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	metlclsh_irqhandler
 };
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( metlclsh )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 54828115cb0..3f16fa75fea 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -519,7 +519,7 @@ static void metro_sound_irq_handler(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, UPD7810_INTF2, state ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	metro_sound_irq_handler	/* irq handler */
 };
@@ -1939,7 +1939,7 @@ static void blzntrnd_irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface blzntrnd_ym2610_interface =
+static const ym2610_interface blzntrnd_ym2610_interface =
 {
 	blzntrnd_irqhandler
 };
@@ -3885,7 +3885,7 @@ static MACHINE_DRIVER_START( daitorid )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
@@ -4384,7 +4384,7 @@ static MACHINE_DRIVER_START( pururun )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index f69d5cfa5f4..55f12be32b5 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -352,7 +352,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -406,7 +406,7 @@ static MACHINE_DRIVER_START( mexico86 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.30)
 	MDRV_SOUND_ROUTE(1, "mono", 0.30)
 	MDRV_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index cbf39f3db45..763b59d3b31 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -339,7 +339,7 @@ static void irqhandler(running_machine *machine, int irq)
 //  cpunum_set_input_line(machine, 2,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -388,7 +388,7 @@ static MACHINE_DRIVER_START( missb2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3526, MAIN_XTAL/8)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index bd01231b205..27cd8a36666 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -347,7 +347,7 @@ static const struct MSM5205interface msm5205_interface =
 	MSM5205_S48_4B		/* 8 kHz */
 };
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler,
 	sound_bankswitch_w
@@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( mlanding )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index a6dfa41a98b..1947355900f 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -243,7 +243,7 @@ GFXDECODE_END
 
 /****************************************************************************/
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( momoko )
 	MDRV_SOUND_ROUTE(3, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2203, 1250000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 0ac2655ad06..a0ce18d0b01 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -274,7 +274,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -313,7 +313,7 @@ static MACHINE_DRIVER_START( mosaic )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 2c68d01e9d0..d474d9edcd0 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -421,7 +421,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler
 };
@@ -452,7 +452,7 @@ static MACHINE_DRIVER_START( mugsmash )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.00)	/* music */
 	MDRV_SOUND_ROUTE(1, "right", 1.00)
 
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 8c9959a0c0c..b6bb9f9c450 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -952,7 +952,7 @@ static void namcos1_sound_interrupt( running_machine *machine, int irq )
 	cpunum_set_input_line(machine, 2, M6809_FIRQ_LINE, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	namcos1_sound_interrupt
 };
@@ -1016,7 +1016,7 @@ static MACHINE_DRIVER_START( ns1 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579580)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.50)
 	MDRV_SOUND_ROUTE(1, "right", 0.50)
 
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 00c16ba5a98..cd106b4beaa 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -819,7 +819,7 @@ static INPUT_PORTS_START( naomi )
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(dc_coin_slots_callback, &dc_coin_counts[1])
 INPUT_PORTS_END
 
-static const struct AICAinterface aica_interface =
+static const aica_interface aica_config =
 {
 	0,
 	aica_irq
@@ -862,7 +862,7 @@ static MACHINE_DRIVER_START( naomi )
 
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 	MDRV_SOUND_ADD("aica", AICA, 0)
-	MDRV_SOUND_CONFIG(aica_interface)
+	MDRV_SOUND_CONFIG(aica_config)
 	MDRV_SOUND_ROUTE(0, "left", 2.0)
 	MDRV_SOUND_ROUTE(0, "right", 2.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index a7d6a6f1cbd..9781c73f17d 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -2112,12 +2112,12 @@ static void sound_irq(running_machine *machine, int state)
 /*cpunum_set_input_line(machine, 1,0,HOLD_LINE);*/
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	sound_irq
 };
@@ -2266,7 +2266,7 @@ static MACHINE_DRIVER_START( salamand )
 	MDRV_SOUND_ROUTE(1, "right", 0.10)
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -2311,7 +2311,7 @@ static MACHINE_DRIVER_START( blkpnthr )
 	MDRV_SOUND_ROUTE(1, "right", 0.10)
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -2356,7 +2356,7 @@ static MACHINE_DRIVER_START( citybomb )
 	MDRV_SOUND_ROUTE(1, "right", 0.30)
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
 
@@ -2405,7 +2405,7 @@ static MACHINE_DRIVER_START( nyanpani )
 	MDRV_SOUND_ROUTE(1, "right", 0.30)
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
 
@@ -2547,7 +2547,7 @@ static MACHINE_DRIVER_START( hcrash )
 	MDRV_SOUND_ROUTE(1, "right", 0.10)
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index c79d0db4b45..34546520e08 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1109,7 +1109,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static struct YM2610interface ym2610_interface =
+static ym2610_interface ym2610_config =
 {
 	audio_cpu_irq
 };
@@ -1260,7 +1260,7 @@ static MACHINE_DRIVER_START( neogeo )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, NEOGEO_YM2610_CLOCK)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.60)
 	MDRV_SOUND_ROUTE(0, "right", 0.60)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 249d7b44c3d..bc4641ba8ec 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -902,7 +902,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -959,7 +959,7 @@ static MACHINE_DRIVER_START( ninjakd2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8)		/* verified */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.10)
 	MDRV_SOUND_ROUTE(1, "mono", 0.10)
 	MDRV_SOUND_ROUTE(2, "mono", 0.10)
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index a00669daa02..b6b39f6e640 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -573,7 +573,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -669,7 +669,7 @@ static MACHINE_DRIVER_START( ninjaw )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
@@ -742,7 +742,7 @@ static MACHINE_DRIVER_START( darius2 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 1d6bbdebcf6..e232cdad1c2 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -961,7 +961,7 @@ static void soundirq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, 0, state);
 }
 
-static const struct YM3812interface ym3812_intf =
+static const ym3812_interface ym3812_intf =
 {
 	soundirq	/* IRQ Line */
 };
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 36596525005..babfc45d474 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3481,7 +3481,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2203interface ym2203_nmk004_interface =
+static const ym2203_interface ym2203_nmk004_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -3496,7 +3496,7 @@ static void ym2203_irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -3547,7 +3547,7 @@ static MACHINE_DRIVER_START( tharrier )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 	MDRV_SOUND_ROUTE(2, "mono", 0.50)
@@ -3593,7 +3593,7 @@ static MACHINE_DRIVER_START( manybloc )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 	MDRV_SOUND_ROUTE(2, "mono", 0.50)
@@ -4232,7 +4232,7 @@ static MACHINE_DRIVER_START( macross2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
 	MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
@@ -4277,7 +4277,7 @@ static MACHINE_DRIVER_START( tdragon2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
@@ -4321,7 +4321,7 @@ static MACHINE_DRIVER_START( raphero )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
 	MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
@@ -4839,7 +4839,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface afega_ym2151_intf =
+static const ym2151_interface afega_ym2151_intf =
 {
 	irq_handler
 };
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 78f4036f82c..059db8e9561 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -361,7 +361,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irq_handler
 };
@@ -394,7 +394,7 @@ static MACHINE_DRIVER_START( oneshot )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3500000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index bc2e3dfc772..f53a744c81f 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -268,7 +268,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler	/* IRQ Line */
 };
@@ -302,7 +302,7 @@ static MACHINE_DRIVER_START( onetwo )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 4000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000*2)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index a28f2d987a3..32e5b7a32dc 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -549,7 +549,7 @@ static void irq_handler(running_machine *machine, int irq)
 }
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler,
 	sound_bankswitch_w
@@ -601,7 +601,7 @@ static MACHINE_DRIVER_START( opwolf )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK )	/* 4 MHz */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.75)
 	MDRV_SOUND_ROUTE(1, "right", 0.75)
 
@@ -653,7 +653,7 @@ static MACHINE_DRIVER_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK )
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.75)
 	MDRV_SOUND_ROUTE(1, "right", 0.75)
 
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index e8a9e7a3f65..9e26c3298c2 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -690,7 +690,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -734,7 +734,7 @@ static MACHINE_DRIVER_START( othunder )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "2610.0l", 0.25)
 	MDRV_SOUND_ROUTE(0, "2610.0r", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1l", 1.0)
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index c8427f747ea..c654a01ad73 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -530,7 +530,7 @@ static void irqhandler(running_machine *machine, int irq)
 }
 
 
-static const struct YM2608interface ym2608_interface =
+static const ym2608_interface ym2608_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -541,7 +541,7 @@ static const struct YM2608interface ym2608_interface =
 };
 
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -586,7 +586,7 @@ static MACHINE_DRIVER_START( pipedrm )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( hatris )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2608, 8000000)
-	MDRV_SOUND_CONFIG(ym2608_interface)
+	MDRV_SOUND_CONFIG(ym2608_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 7fb11cfa70d..28dfeeb32a1 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -334,7 +334,7 @@ static const ppi8255_interface ppi8255_intf[3] =
 	}
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -414,7 +414,7 @@ static MACHINE_DRIVER_START( pipeline )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 7372800/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 0b661592846..b877e6fe965 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -263,7 +263,7 @@ static void irqhandler(running_machine *machine, int irq)
 		cpunum_set_input_line(machine, 0,2,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -312,7 +312,7 @@ static MACHINE_DRIVER_START( pkscramble )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 12000000/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 8ea9b9633c8..cc9b50c2bc1 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -337,7 +337,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( powerins )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 04600a3f7a4..de0fa616fcf 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -219,7 +219,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( prehisle )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 5bcd91fd116..4de504f3b1b 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1552,7 +1552,7 @@ GFXDECODE_END
 ***************************************************************************/
 
 
-static const struct YM2610interface sngkace_ym2610_interface =
+static const ym2610_interface sngkace_ym2610_interface =
 {
 	sound_irq
 };
@@ -1603,7 +1603,7 @@ MACHINE_DRIVER_END
 ***************************************************************************/
 
 
-static const struct YM2610interface gunbird_ym2610_interface =
+static const ym2610_interface gunbird_ym2610_interface =
 {
 	sound_irq	/* irq */
 };
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index d9f68c952ec..7cbadb5d8c6 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -540,7 +540,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( psychic5 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 6000000/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 1ed7a9aad75..e63f6188cf1 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -437,7 +437,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -483,7 +483,7 @@ static MACHINE_DRIVER_START( pushman )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 2000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2203, 2000000)
@@ -523,7 +523,7 @@ static MACHINE_DRIVER_START( bballs )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 2000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM2203, 2000000)
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index cc1fac0b62c..c4fd3994c58 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -443,7 +443,7 @@ static GFXDECODE_START( quizdna )
 GFXDECODE_END
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -483,7 +483,7 @@ static MACHINE_DRIVER_START( quizdna )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, MCLK/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.10)
 	MDRV_SOUND_ROUTE(1, "mono", 0.10)
 	MDRV_SOUND_ROUTE(2, "mono", 0.10)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 72dcf76fc60..766447425b7 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -595,7 +595,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler,
 	bankswitch_w
@@ -636,7 +636,7 @@ static MACHINE_DRIVER_START( rainbow )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 4b5faf1d361..78b30a777bc 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -361,7 +361,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler,
 	rastan_bankswitch_w
@@ -405,7 +405,7 @@ static MACHINE_DRIVER_START( rastan )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 71ecdddf886..090255db493 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -770,7 +770,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, linestate);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -819,7 +819,7 @@ static MACHINE_DRIVER_START( renegade )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3526, 12000000/4)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("adpcm", CUSTOM, 8000)
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 71f792b4cd1..0fb724600c6 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -803,7 +803,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 	OKIM6295_set_bank_base(1, ((data & 2)>>1) * 0x40000);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq,
 	sound_bankswitch_w
@@ -841,7 +841,7 @@ static MACHINE_DRIVER_START( rohga )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.78)
 	MDRV_SOUND_ROUTE(1, "right", 0.78)
 
@@ -886,7 +886,7 @@ static MACHINE_DRIVER_START( wizdfire )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
@@ -931,7 +931,7 @@ static MACHINE_DRIVER_START( nitrobal )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
@@ -976,7 +976,7 @@ static MACHINE_DRIVER_START( schmeisr )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 4d11951d1ec..1f9a524356a 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -482,7 +482,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	ym2151_irq_gen
 };
@@ -523,7 +523,7 @@ static MACHINE_DRIVER_START( rpunch )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index ab587380481..1f40f34f309 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -416,7 +416,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_intf_sandscrp =
+static const ym2203_interface ym2203_intf_sandscrp =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 5c459d390ea..903620ba2f3 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -813,7 +813,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -824,7 +824,7 @@ static const struct YM2203interface ym2203_interface =
 };
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -925,7 +925,7 @@ static MACHINE_DRIVER_START( sound_board_2203 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.13)
 	MDRV_SOUND_ROUTE(0, "right", 0.13)
 	MDRV_SOUND_ROUTE(1, "left",  0.13)
@@ -953,7 +953,7 @@ static MACHINE_DRIVER_START( sound_board_2203x2 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.13)
 	MDRV_SOUND_ROUTE(0, "right", 0.13)
 	MDRV_SOUND_ROUTE(1, "left",  0.13)
@@ -991,7 +991,7 @@ static MACHINE_DRIVER_START( sound_board_2151 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK_8MHz/2)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.43)
 	MDRV_SOUND_ROUTE(1, "right", 0.43)
 
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index e240d7bc81c..8870cc511fb 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -1730,7 +1730,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	NULL,
 	n7751_control_w
@@ -1806,7 +1806,7 @@ static MACHINE_DRIVER_START( system16a )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("2151", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 911ee57d53f..aca027ea606 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1885,7 +1885,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_ym
 };
@@ -1927,7 +1927,7 @@ static MACHINE_DRIVER_START( system24 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.50)
 	MDRV_SOUND_ROUTE(1, "right", 0.50)
 
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 3f41a9ee432..f1c5d40bcbb 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -1075,7 +1075,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_cpu_irq
 };
@@ -1150,7 +1150,7 @@ static MACHINE_DRIVER_START( xboard )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("2151", YM2151, SOUND_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.43)
 	MDRV_SOUND_ROUTE(1, "right", 0.43)
 
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 68ebccf52c5..11cf2c4bd9e 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -938,7 +938,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_cpu_irq
 };
@@ -993,7 +993,7 @@ static MACHINE_DRIVER_START( yboard )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("2151", YM2151, SOUND_CLOCK/8)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.43)
 	MDRV_SOUND_ROUTE(1, "right", 0.43)
 
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index db3bea1fbf5..d5b8c275470 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6689,7 +6689,7 @@ static INTERRUPT_GEN( seta_sub_interrupt )
                                 Thundercade
 ***************************************************************************/
 
-static const struct YM2203interface tndrcade_ym2203_interface =
+static const ym2203_interface tndrcade_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 91d24dfefa3..e6997e57d9b 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -803,7 +803,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler
 };
@@ -848,7 +848,7 @@ static MACHINE_DRIVER_START( sf )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 8479468b37b..7fd23b7aa26 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -537,7 +537,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler
 };
@@ -578,7 +578,7 @@ static MACHINE_DRIVER_START( shadfrce )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.50)
 	MDRV_SOUND_ROUTE(1, "right", 0.50)
 
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 35a9d6a3854..099523b0edb 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -1086,7 +1086,7 @@ INPUT_PORTS_END
 
 
 
-static const struct YM2203interface sh_ym2203_interface =
+static const ym2203_interface sh_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1100,7 +1100,7 @@ static const struct YM2203interface sh_ym2203_interface =
 };
 
 
-const struct YM2203interface kothello_ym2203_interface =
+const ym2203_interface kothello_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index a66f5941815..1fec33e28d8 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -231,7 +231,7 @@ GFXDECODE_END
 
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	m72_ym2151_irq_handler
 };
@@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( shisen )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 50ab6377cd6..cedfb4c1ed9 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -272,7 +272,7 @@ static void shootout_snd2_irq(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 0,0,linestate);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -282,7 +282,7 @@ static const struct YM2203interface ym2203_interface =
 	shootout_snd_irq
 };
 
-static const struct YM2203interface ym2203_interface2 =
+static const ym2203_interface ym2203_interface2 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( shootout )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 1500000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index d15bd2a53e1..a4cb88fb91f 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -701,7 +701,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -711,7 +711,7 @@ static const struct YM2203interface ym2203_interface =
 	irqhandler
 };
 
-static const struct YM2151interface whizz_ym2151_interface =
+static const ym2151_interface whizz_ym2151_interface =
 {
 	irqhandler
 };
@@ -747,7 +747,7 @@ static MACHINE_DRIVER_START( sidearms )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -792,7 +792,7 @@ static MACHINE_DRIVER_START( turtship )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 567ec33542c..0586e2822d2 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -282,7 +282,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3526interface ym3526_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( sidepckt )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( sidepctj )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM3526, 3000000)
-	MDRV_SOUND_CONFIG(ym3526_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 8af1edc0c4c..1cee6bf9ed1 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -541,7 +541,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( slapshot )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( opwolf3 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 80c1aa36906..5124045f3f2 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -369,19 +369,19 @@ static void snk_sound_callback1_w( running_machine *machine, int state ){ /* ? *
 	if( state ) snk_sound_register |= 0x02;
 }
 
-static const struct YM3526interface ym3526_interface_0 = {
+static const ym3526_interface ym3526_interface_0 = {
 	snk_sound_callback0_w /* ? */
 };
 
-static const struct YM3526interface ym3526_interface_1 = {
+static const ym3526_interface ym3526_interface_1 = {
 	snk_sound_callback1_w /* ? */
 };
 
-static const struct Y8950interface y8950_interface = {
+static const y8950_interface y8950_config = {
 	snk_sound_callback1_w /* ? */
 };
 
-static const struct YM3812interface ym3812_interface = {
+static const ym3812_interface ym3812_config = {
 	snk_sound_callback0_w /* ? */
 };
 
@@ -1000,7 +1000,7 @@ static MACHINE_DRIVER_START( victroad )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1045,7 +1045,7 @@ static MACHINE_DRIVER_START( gwar )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1091,7 +1091,7 @@ static MACHINE_DRIVER_START( bermudat )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 4000000)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1136,7 +1136,7 @@ static MACHINE_DRIVER_START( psychos )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 4000000)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1177,11 +1177,11 @@ static MACHINE_DRIVER_START( chopper1 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM3812, 4000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 4000000)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1228,7 +1228,7 @@ static MACHINE_DRIVER_START( tdfever )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 4000000)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1275,7 +1275,7 @@ static MACHINE_DRIVER_START( tdfever2 )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ym2", Y8950, 4000000)
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1318,7 +1318,7 @@ static MACHINE_DRIVER_START( fsoccer )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", Y8950, XTAL_8MHz/2) /* verified on pcb */
-	MDRV_SOUND_CONFIG(y8950_interface)
+	MDRV_SOUND_CONFIG(y8950_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 02cbee74482..bf9bea85971 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -584,7 +584,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -620,7 +620,7 @@ static MACHINE_DRIVER_START( pow )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, XTAL_8MHz/2) /* verified on pcb  */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index d7d2d4fc405..c22a0c713e4 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1519,14 +1519,14 @@ static void irqhandler(running_machine *machine, int irq)
 
 /* SnowBros Sound */
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
 
 /* SemiCom Sound */
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -1580,7 +1580,7 @@ static MACHINE_DRIVER_START( snowbros )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("3812", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1612,7 +1612,7 @@ static MACHINE_DRIVER_START( semicom )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("3812", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.10)
 	MDRV_SOUND_ROUTE(1, "mono", 0.10)
 
@@ -1676,7 +1676,7 @@ static MACHINE_DRIVER_START( honeydol )
 	/* sound hardware */
 
 	MDRV_SOUND_ADD("3812", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 
@@ -1749,7 +1749,7 @@ static MACHINE_DRIVER_START( finalttr )
 	MDRV_MACHINE_RESET ( finalttr )
 
 	MDRV_SOUND_REPLACE("3812", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.08)
 	MDRV_SOUND_ROUTE(1, "mono", 0.08)
 
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 3fa06b047fa..7aad6e4b460 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -346,7 +346,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( spbactn )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index ff7b4fc7470..866ac2093f6 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -417,7 +417,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine,1,M6809_FIRQ_LINE,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irq_handler
 };
@@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( spdodgeb )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
 
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index a1576ef635e..bdedbafa7ec 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -471,7 +471,7 @@ static void ym_irq(running_machine *machine, int state)
 	logerror("2203 IRQ: %d\n", state);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -511,7 +511,7 @@ static MACHINE_DRIVER_START( roldfrog )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 	MDRV_SOUND_ROUTE(2, "mono", 0.60)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index bed4a2b7dba..59dbd6e79db 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -524,7 +524,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -561,7 +561,7 @@ static MACHINE_DRIVER_START( spy )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 3579545)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("konami1", K007232, 3579545)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index ecae1a698b1..8b46877f5e8 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -331,7 +331,7 @@ static void irqhandler(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,0,state);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( sshangha )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2203, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
 
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 3273ec85491..3e263c8e283 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -235,7 +235,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( stadhero )
 	MDRV_SOUND_ROUTE(3, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 3000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 7644b53ebcb..62bd1e1d22e 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -1015,7 +1015,7 @@ static void bestbest_ym3526_irqhandler(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ0, state);
 }
 
-static const struct YM3526interface bestbest_ym3526_interface =
+static const ym3526_interface bestbest_ym3526_interface =
 {
 	bestbest_ym3526_irqhandler
 };
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 079d98d9a94..5dce0a019a8 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1649,7 +1649,7 @@ MACHINE_DRIVER_END
 
 /* 1 x 24 MHz crystal */
 
-static const struct YM3812interface brickzn_ym3812_interface =
+static const ym3812_interface brickzn_ym3812_interface =
 {
 	soundirq	/* IRQ Line */
 };
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index afff5149f90..b6e11fd55a6 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -365,7 +365,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -400,7 +400,7 @@ static MACHINE_DRIVER_START( supbtime )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
@@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( chinatwn )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 76673da5b6a..95e3eafad88 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -261,7 +261,7 @@ static void irqhandler(running_machine *machine, int irq)
 //  cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -316,7 +316,7 @@ static MACHINE_DRIVER_START( suprgolf )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 9622c67f9c0..2d42fe57b99 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -316,7 +316,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( suprslam )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index d10b0aba6bb..14a153bde2c 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -227,7 +227,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 0,KONAMI_FIRQ_LINE,linestate);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -262,7 +262,7 @@ static MACHINE_DRIVER_START( surpratk )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 532bb79f031..838f1d7f22d 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -221,7 +221,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2608interface ym2608_interface =
+static const ym2608_interface ym2608_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( tail2nos )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2608, XTAL_8MHz)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2608_interface)
+	MDRV_SOUND_CONFIG(ym2608_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index b4b7189ccde..3e0c4a98c47 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2384,12 +2384,12 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -2475,7 +2475,7 @@ static MACHINE_DRIVER_START( rastsag2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2513,7 +2513,7 @@ static MACHINE_DRIVER_START( ashura )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2551,7 +2551,7 @@ static MACHINE_DRIVER_START( crimec )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2589,7 +2589,7 @@ static MACHINE_DRIVER_START( tetrist )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2626,7 +2626,7 @@ static MACHINE_DRIVER_START( tetrista )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
@@ -2665,7 +2665,7 @@ static MACHINE_DRIVER_START( hitice )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
@@ -2708,7 +2708,7 @@ static MACHINE_DRIVER_START( rambo3 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2746,7 +2746,7 @@ static MACHINE_DRIVER_START( rambo3a )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2787,7 +2787,7 @@ static MACHINE_DRIVER_START( pbobble )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610B, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2828,7 +2828,7 @@ static MACHINE_DRIVER_START( spacedx )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2866,7 +2866,7 @@ static MACHINE_DRIVER_START( spacedxo )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2907,7 +2907,7 @@ static MACHINE_DRIVER_START( qzshowby )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610B, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -2945,7 +2945,7 @@ static MACHINE_DRIVER_START( viofight )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
@@ -2987,7 +2987,7 @@ static MACHINE_DRIVER_START( masterw )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.25)
 	MDRV_SOUND_ROUTE(2, "mono", 0.25)
@@ -3026,7 +3026,7 @@ static MACHINE_DRIVER_START( silentd )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -3064,7 +3064,7 @@ static MACHINE_DRIVER_START( selfeena )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -3111,7 +3111,7 @@ static MACHINE_DRIVER_START( ryujin )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -3156,7 +3156,7 @@ static MACHINE_DRIVER_START( sbm )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610B, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 605caa7817c..f91a4f77779 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -3684,7 +3684,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irq_handler
 };
@@ -3695,7 +3695,7 @@ static WRITE8_HANDLER( camltrya_porta_w )
 	// Implement //
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -3761,7 +3761,7 @@ static MACHINE_DRIVER_START( taito_f2 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -4212,7 +4212,7 @@ static MACHINE_DRIVER_START( camltrya )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 24000000/8) /* verified on pcb  */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.20)
 	MDRV_SOUND_ROUTE(1, "mono", 0.20)
 	MDRV_SOUND_ROUTE(2, "mono", 0.20)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index dd745997c91..781d2d33923 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -163,7 +163,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -603,7 +603,7 @@ static MACHINE_DRIVER_START( syvalion )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -642,7 +642,7 @@ static MACHINE_DRIVER_START( recordbr )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
@@ -681,7 +681,7 @@ static MACHINE_DRIVER_START( dleague )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 6b30cba27db..a66de5bb182 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2119,7 +2119,7 @@ static WRITE8_HANDLER( portA_w )
 	}
 }
 
-static const struct YM2203interface ym2203_interface_triple =
+static const ym2203_interface ym2203_interface_triple =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -2132,7 +2132,7 @@ static const struct YM2203interface ym2203_interface_triple =
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface_champwr =
+static const ym2203_interface ym2203_interface_champwr =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -2152,12 +2152,12 @@ static const struct MSM5205interface msm5205_interface =
 	MSM5205_S48_4B		/* 8 kHz */
 };
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
 
-static const struct YM2203interface ym2203_interface_single =
+static const ym2203_interface ym2203_interface_single =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -2263,7 +2263,7 @@ static MACHINE_DRIVER_START( raimais )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("ym", YM2610, 8000000) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index d1ee23e8279..18513ed0f5b 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -969,12 +969,12 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -1025,7 +1025,7 @@ static MACHINE_DRIVER_START( superman )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1064,7 +1064,7 @@ static MACHINE_DRIVER_START( daisenpu )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4)	/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 MACHINE_DRIVER_END
@@ -1101,7 +1101,7 @@ static MACHINE_DRIVER_START( gigandes )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
@@ -1140,7 +1140,7 @@ static MACHINE_DRIVER_START( ballbros )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 77722028855..3e4f3d49e4d 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3048,12 +3048,12 @@ static void irqhandlerb(running_machine *machine, int irq)
 //  cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
 
-static const struct YM2610interface ym2610_interfaceb =
+static const ym2610_interface ym2610_interfaceb =
 {
 	irqhandlerb
 };
@@ -3157,7 +3157,7 @@ static MACHINE_DRIVER_START( contcirc )
 	MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
 	MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
@@ -3213,7 +3213,7 @@ static MACHINE_DRIVER_START( chasehq )
 	MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
 	MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
@@ -3267,7 +3267,7 @@ static MACHINE_DRIVER_START( enforce )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 20.0)
@@ -3376,7 +3376,7 @@ static MACHINE_DRIVER_START( sci )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3433,7 +3433,7 @@ static MACHINE_DRIVER_START( nightstr )
 	MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
 	MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
@@ -3487,7 +3487,7 @@ static MACHINE_DRIVER_START( aquajack )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3594,7 +3594,7 @@ static MACHINE_DRIVER_START( dblaxle )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0)
@@ -3648,7 +3648,7 @@ static MACHINE_DRIVER_START( racingb )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index c53c5e311ca..2dc38e5edc1 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -585,7 +585,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface airsys_ym2610_interface =
+static const ym2610_interface airsys_ym2610_interface =
 {
 	irqhandler
 };
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 160305a6840..3c7ab95deac 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -323,7 +323,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -357,7 +357,7 @@ static MACHINE_DRIVER_START( taotaido )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 475c7fdfe97..519218effd0 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -820,7 +820,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 2, INPUT_LINE_IRQ0, state);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -866,7 +866,7 @@ static MACHINE_DRIVER_START( apache3 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
@@ -909,7 +909,7 @@ static MACHINE_DRIVER_START( roundup5 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
@@ -953,7 +953,7 @@ static MACHINE_DRIVER_START( cyclwarr )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
@@ -997,7 +997,7 @@ static MACHINE_DRIVER_START( bigfight )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index b8a00ff1654..1081652970c 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -560,7 +560,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 2,0,linestate);
 }
 
-static const struct YM3526interface ym3812_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -627,7 +627,7 @@ static MACHINE_DRIVER_START( tbowl )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM3812, 4000000)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 
 	MDRV_SOUND_ADD("ym2", YM3812, 4000000)
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index bda719d20bf..fcac9e6ea6c 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -549,7 +549,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3526interface ym3812_interface =
+static const ym3526_interface ym3526_config =
 {
 	irqhandler
 };
@@ -590,7 +590,7 @@ static MACHINE_DRIVER_START( rygar )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3526_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index e061b7dc612..809bc84eacb 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -430,7 +430,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irqhandler
 };
@@ -467,7 +467,7 @@ static MACHINE_DRIVER_START( fstarfrc )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 8000000/2)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
@@ -507,7 +507,7 @@ static MACHINE_DRIVER_START( ginkun )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 8000000/2)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index ff66d71006e..6ea4578ed31 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -904,7 +904,7 @@ static void sound_irq(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YMF262interface ymf262_interface =
+static const ymf262_interface tecmosys_ymf262_interface =
 {
 	sound_irq		/* irq */
 };
@@ -943,7 +943,7 @@ static MACHINE_DRIVER_START( deroon )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF262, 14318180)
-	MDRV_SOUND_CONFIG(ymf262_interface)
+	MDRV_SOUND_CONFIG(tecmosys_ymf262_interface)
 	MDRV_SOUND_ROUTE(0, "left", 1.00)
 	MDRV_SOUND_ROUTE(1, "right", 1.00)
 	MDRV_SOUND_ROUTE(2, "left", 1.00)
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 46684901992..33b063621d0 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -328,7 +328,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface thedeep_ym2203_intf =
+static const ym2203_interface thedeep_ym2203_intf =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 6c931b1144a..509e770be7e 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -531,7 +531,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 			AY8910_LEGACY_OUTPUT,
@@ -581,7 +581,7 @@ static MACHINE_DRIVER_START( tigeroad )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 932805cf7f8..7fb9648e7c3 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2305,7 +2305,7 @@ static void cuebrick_irq_handler(running_machine *machine, int state)
 	cuebrick_snd_irqlatch = state;
 }
 
-static const struct YM2151interface ym2151_interface_cbj =
+static const ym2151_interface ym2151_interface_cbj =
 {
 	cuebrick_irq_handler
 };
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index b4a76748e1a..3878610797a 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1315,7 +1315,7 @@ static GFXDECODE_START( insectx )
 GFXDECODE_END
 
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1335,7 +1335,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface kageki_ym2203_interface =
+static const ym2203_interface kageki_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1347,7 +1347,7 @@ static const struct YM2203interface kageki_ym2203_interface =
 	},
 };
 
-static const struct YM2203interface ym2203b_interface =
+static const ym2203_interface ym2203b_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1357,7 +1357,7 @@ static const struct YM2203interface ym2203b_interface =
 	irqhandler
 };
 
-static const struct YM2203interface kabukiz_ym2203_interface =
+static const ym2203_interface kabukiz_ym2203_interface =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -1411,7 +1411,7 @@ static MACHINE_DRIVER_START( arknoid2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
@@ -1450,7 +1450,7 @@ static MACHINE_DRIVER_START( drtoppel )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
@@ -1496,7 +1496,7 @@ static MACHINE_DRIVER_START( tnzs )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
@@ -1534,7 +1534,7 @@ static MACHINE_DRIVER_START( insectx )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index a2b2e875d86..aac2c994b97 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1227,7 +1227,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -1269,7 +1269,7 @@ static MACHINE_DRIVER_START( rallybik )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1309,7 +1309,7 @@ static MACHINE_DRIVER_START( truxton )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1349,7 +1349,7 @@ static MACHINE_DRIVER_START( hellfire )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1389,7 +1389,7 @@ static MACHINE_DRIVER_START( zerowing )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1433,7 +1433,7 @@ static MACHINE_DRIVER_START( demonwld )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1467,7 +1467,7 @@ static MACHINE_DRIVER_START( samesame )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1507,7 +1507,7 @@ static MACHINE_DRIVER_START( outzone )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -1541,7 +1541,7 @@ static MACHINE_DRIVER_START( vimana )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, XTAL_28MHz/8) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 59374d8b9f4..310ec755847 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3413,7 +3413,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -3460,7 +3460,7 @@ static MACHINE_DRIVER_START( tekipaki )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -3698,7 +3698,7 @@ static MACHINE_DRIVER_START( pipibibs )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8)			/* verified on pcb */
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -3738,7 +3738,7 @@ static MACHINE_DRIVER_START( whoopee )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -3777,7 +3777,7 @@ static MACHINE_DRIVER_START( pipibibi )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -3910,7 +3910,7 @@ static void batsugun_ym2151_irqhandler(running_machine *machine, int linestate)
 //  update_irq_lines(machine, linestate ? assert : clear);
 }
 
-static const struct YM2151interface batsugun_ym2151_interface =
+static const ym2151_interface batsugun_ym2151_interface =
 {
 	batsugun_ym2151_irqhandler
 };
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index a1f94988d68..9a12b6f6d9d 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -661,7 +661,7 @@ static void irq_handler(running_machine *machine, int irq)	/* assumes Z80 sandwi
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	irq_handler,
 	sound_bankswitch_w
@@ -726,7 +726,7 @@ static MACHINE_DRIVER_START( topspeed )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 4000000)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.30)
 	MDRV_SOUND_ROUTE(1, "mono", 0.30)
 
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 9fe436fff1a..bf8ecf2d34a 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -2274,7 +2274,7 @@ static void semicom_irqhandler(running_machine *machine, int irq)
 }
 
 
-static const struct YM2151interface semicom_ym2151_interface =
+static const ym2151_interface semicom_ym2151_interface =
 {
 	semicom_irqhandler
 };
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 2df8962c7ca..f6b75040382 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -293,7 +293,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( tumblep )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 7ce009ecdf4..ecbbb883259 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -671,7 +671,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( twincobr )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 4d4db406c8f..89a152c62bb 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -235,7 +235,7 @@ static void sound_irq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1,1,state); /* IRQ 2 */
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	sound_irq
 };
@@ -274,7 +274,7 @@ static MACHINE_DRIVER_START( vaportra )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.60)
 	MDRV_SOUND_ROUTE(1, "mono", 0.60)
 
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index c8b541d6d58..d2427bc53f9 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -396,7 +396,7 @@ static void vball_irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	vball_irq_handler
 };
@@ -429,7 +429,7 @@ static MACHINE_DRIVER_START( vball )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
@@ -467,7 +467,7 @@ static MACHINE_DRIVER_START( vball2pj )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.60)
 	MDRV_SOUND_ROUTE(1, "right", 0.60)
 
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index d583d8cb0b3..6fbf45732ec 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -510,12 +510,12 @@ GFXDECODE_END
 
 
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	m72_ym2151_irq_handler
 };
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( vigilant )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579645)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.55)
 	MDRV_SOUND_ROUTE(1, "right", 0.55)
 
@@ -603,7 +603,7 @@ static MACHINE_DRIVER_START( buccanrs )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 18432000/6)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.35)
 	MDRV_SOUND_ROUTE(0, "right", 0.35)
 	MDRV_SOUND_ROUTE(1, "left",  0.35)
@@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( kikcubic )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579645)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.55)
 	MDRV_SOUND_ROUTE(1, "right", 0.55)
 
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index d95bb4d675e..341b8e587a2 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -213,7 +213,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( volfied )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 4000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.15)
 	MDRV_SOUND_ROUTE(1, "mono", 0.15)
 	MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index d6103aca5d2..67adf9a05e7 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -461,7 +461,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1,0,linestate);
 }
 
-static const struct YM3812interface ym3812_interface =
+static const ym3812_interface ym3812_config =
 {
 	irqhandler
 };
@@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( wardner )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3812, 24000000/7)
-	MDRV_SOUND_CONFIG(ym3812_interface)
+	MDRV_SOUND_CONFIG(ym3812_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 6e3851ffc07..c624fef3dd0 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -405,7 +405,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( darius2d )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
@@ -537,7 +537,7 @@ static MACHINE_DRIVER_START( warriorb )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 25e00b9470d..a2cde993e50 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -306,7 +306,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2608interface ym2608_interface =
+static const ym2608_interface ym2608_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( wc90 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2608, 8000000)
-	MDRV_SOUND_CONFIG(ym2608_interface)
+	MDRV_SOUND_CONFIG(ym2608_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 	MDRV_SOUND_ROUTE(2, "mono", 1.0)
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index fb901ed36f9..1d597d1929e 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -352,7 +352,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -414,7 +414,7 @@ static MACHINE_DRIVER_START( wc90b )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2203, 2510000/2)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
 	MDRV_SOUND_ADD("msm", MSM5205, 384000)
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 70646c667ed..375515414f6 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -692,7 +692,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0, irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -745,7 +745,7 @@ static MACHINE_DRIVER_START( welltris )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2610, 8000000)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.25)
 	MDRV_SOUND_ROUTE(1, "mono", 0.75)
 	MDRV_SOUND_ROUTE(2, "mono", 0.75)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 98020bed6db..3382fdc7853 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -918,7 +918,7 @@ static void irqhandler(running_machine *machine, int irq)	// assumes Z80 sandwic
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irqhandler
 };
@@ -981,7 +981,7 @@ static MACHINE_DRIVER_START( wgp )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 3a39ef66c67..e3ccb4872f1 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -413,7 +413,7 @@ static WRITE8_HANDLER(yscroll_w)
 static READ8_HANDLER(portA_r) {	return input_port_read(machine, "YM_PortA"); }
 static READ8_HANDLER(portB_r) {	return input_port_read(machine, "YM_PortB");}
 
-static const struct YM2203interface ym2203_interface_0 =
+static const ym2203_interface ym2203_interface_0 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -426,7 +426,7 @@ static const struct YM2203interface ym2203_interface_0 =
 	NULL
 };
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 414e925ea13..6ddd4600349 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -421,7 +421,7 @@ static void wwfsstar_ymirq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	wwfsstar_ymirq_handler
 };
@@ -458,7 +458,7 @@ static MACHINE_DRIVER_START( wwfsstar )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.45)
 	MDRV_SOUND_ROUTE(1, "right", 0.45)
 
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 3d3e387bb20..7a45e9b0747 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -369,7 +369,7 @@ static void dd3_ymirq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1, 0 , irq ? ASSERT_LINE : CLEAR_LINE );
 }
 
-static const struct YM2151interface ym2151_interface =
+static const ym2151_interface ym2151_config =
 {
 	dd3_ymirq_handler
 };
@@ -414,7 +414,7 @@ static MACHINE_DRIVER_START( wwfwfest )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM2151, 3579545)
-	MDRV_SOUND_CONFIG(ym2151_interface)
+	MDRV_SOUND_CONFIG(ym2151_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.45)
 	MDRV_SOUND_ROUTE(1, "mono", 0.45)
 
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index a9735d43af1..afa31252a94 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -437,7 +437,7 @@ static void irqhandler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 2,M6809_FIRQ_LINE,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2203interface ym2203_interface =
+static const ym2203_interface ym2203_config =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -494,7 +494,7 @@ static MACHINE_DRIVER_START( xsleena )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym1", YM2203, 3000000)
-	MDRV_SOUND_CONFIG(ym2203_interface)
+	MDRV_SOUND_CONFIG(ym2203_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.50)
 	MDRV_SOUND_ROUTE(1, "mono", 0.50)
 	MDRV_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index eb59dfd097b..945a3949556 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -273,7 +273,7 @@ GFXDECODE_END
 
 /****************************************************************************/
 
-static const struct YM2203interface ym2203_interface_1 =
+static const ym2203_interface ym2203_interface_1 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
@@ -286,7 +286,7 @@ static const struct YM2203interface ym2203_interface_1 =
 	NULL
 };
 
-static const struct YM2203interface ym2203_interface_2 =
+static const ym2203_interface ym2203_interface_2 =
 {
 	{
 		AY8910_LEGACY_OUTPUT,
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 61caeab9337..a62b5330d1f 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -575,7 +575,7 @@ static void soundirq(running_machine *machine, int state)
 	cpunum_set_input_line(machine, 1, 0, state);
 }
 
-static const struct YM3812interface magicbub_ym3812_intf =
+static const ym3812_interface magicbub_ym3812_intf =
 {
 	soundirq	/* IRQ Line */
 };
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index f9eefd710a5..4943601247b 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -552,7 +552,7 @@ static const ay8910_interface ay8910_config =
 	NULL
 };
 
-static const struct TMS5220interface tms5220_interface =
+static const tms5220_interface tms5220_config =
 {
 	tms5220_irq_handler	/* IRQ handler */
 };
@@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( zaccaria )
 	/* There is no xtal, the clock is obtained from a RC oscillator as shown in the TMS5220 datasheet (R=100kOhm C=22pF) */
 	/* 162kHz measured on pin 3 20 minutesa fter power on. Clock would then be 162*4=648kHz. */
 	MDRV_SOUND_ADD("tms", TMS5200, 640000)
-	MDRV_SOUND_CONFIG(tms5220_interface)
+	MDRV_SOUND_CONFIG(tms5220_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 8c72867bfab..3b87020925e 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1265,7 +1265,7 @@ static void irq_handler(running_machine *machine, int irq)
 	cpunum_set_input_line(machine, 1,0,irq ? ASSERT_LINE : CLEAR_LINE);
 }
 
-static const struct YM2610interface ym2610_interface =
+static const ym2610_interface ym2610_config =
 {
 	irq_handler
 };
@@ -1282,7 +1282,7 @@ static MACHINE_DRIVER_START( coh1000ta )
 	MDRV_NVRAM_HANDLER( coh1000ta )
 
 	MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
-	MDRV_SOUND_CONFIG(ym2610_interface)
+	MDRV_SOUND_CONFIG(ym2610_config)
 	MDRV_SOUND_ROUTE(0, "left",  0.25)
 	MDRV_SOUND_ROUTE(0, "right", 0.25)
 	MDRV_SOUND_ROUTE(1, "left",  1.0)